(svn r8924) -Release: 0.5.0

- [OSX] Reading from an unitialized variable (r8907)
 - [Win9x] FindFile with C:\\* doesn't work, don't append a slash doubly (r8919)
 - Do not require to press 'Apply changes' in the newgrf GUI if the changes in there are not activated (this happens in the title screen) (r8920)
 - Possible crashes, problems with aircraft and airport removal (r8921)

COPYING

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

Makefile

@@ -268,14 +268,7 @@ ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"
 
-ifdef RELEASE
-REV:=$(RELEASE)
-else
-ifeq ($(shell if test -d .svn; then echo 1; fi), 1)
-REV_MODIFIED := $(shell svnversion . | sed -n 's/.*\(M\).*/\1/p' )
-REV := $(shell LC_ALL=C svn info | awk '/^URL:.*branch/ { BRANCH="-"a[split($$2, a, "/")] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
-endif
-endif
+REV := 0.5.0
 
 # define flag to use for -lrt (some OSes overwrites this later for compatibility)
 ifndef LRT
@@ -513,6 +506,14 @@ ifdef WITH_FREETYPE
 CDEFS += -DWITH_FREETYPE
 CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags)
 LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs)
+
+ifdef STATIC
+ifdef OSX
+# OSX needs a special lib setting when linking statically
+LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --prefix)/lib/libfreetype.a
+endif
+endif
+
 CFLAGS += $(CCFLAGS_FREETYPE)
 LIBS += $(LDFLAGS_FREETYPE)
 endif

aircraft_cmd.c

@@ -1212,14 +1212,39 @@ static void ProcessAircraftOrder(Vehicle *v)
 
 	order = GetVehicleOrder(v, v->cur_order_index);
 
-	if (order == NULL) {
-		v->current_order.type = OT_NOTHING;
-		v->current_order.flags = 0;
+	if (order == NULL|| (order->type == OT_DUMMY && !CheckForValidOrders(v))) {
+		/*
+		 * We do not have an order. This can be divided into two cases:
+		 * 1) we are heading to an invalid station. In this case we must
+		 *    find another airport to go to. If there is nowhere to go,
+		 *    we will destroy the aircraft as it otherwise will enter
+		 *    the holding pattern for the first airport, which can cause
+		 *    the plane to go into an undefined state when building an
+		 *    airport with the same StationID.
+		 * 2) we are (still) heading to a (still) valid airport, then we
+		 *    can continue going there. This can happen when you are
+		 *    changing the aircraft's orders while in-flight or in for
+		 *    example a depot. However, when we have a current order to
+		 *    go to a depot, we have to keep that order so the aircraft
+		 *    actually stops.
+		 */
+		const Station *st = GetStation(v->u.air.targetairport);
+		if (!IsValidStation(st) || st->airport_tile == 0) {
+			int32 ret;
+			PlayerID old_player = _current_player;
+
+			_current_player = v->owner;
+			ret = DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_SEND_AIRCRAFT_TO_HANGAR);
+			_current_player = old_player;
+
+			if (CmdFailed(ret)) CrashAirplane(v);
+		} else if (v->current_order.type != OT_GOTO_DEPOT) {
+			v->current_order.type = OT_NOTHING;
+			v->current_order.flags = 0;
+		}
 		return;
 	}
 
-	if (order->type == OT_DUMMY && !CheckForValidOrders(v)) CrashAirplane(v);
-
 	if (order->type  == v->current_order.type  &&
 			order->flags == v->current_order.flags &&
 			order->dest  == v->current_order.dest)

bridge.h

@@ -27,5 +27,6 @@ extern const Bridge orig_bridge[MAX_BRIDGES];
 extern Bridge _bridge[MAX_BRIDGES];
 
 uint GetBridgeFoundation(Slope tileh, Axis axis);
+uint GetBridgeHeightRamp(TileIndex t);
 
 #endif /* BRIDGE_H */

changelog.txt

@@ -1,33 +1,34 @@
+0.5.0 (2007-02-27)
+------------------------------------------------------------------------
+- Feature: Add the ability to load newer TTDP games (the tile information for coasts has changed) (r8738)
+- Feature: Selecting "end of orders" and deleting will delete all the vehicle's orders (shared mode unchanged) (r8685)
+- Codechange: Call GetFirstVehicleInChain only for trains thus increasing performance in large games (r8744)
+- Fix: Possible crashes, problems with aircraft and airport removal (r8921)
+- Fix: Do not show the 'edit sign' window for spectators (r8808)
+- Fix: Adhere order types for ship order insertion to determine destination type (r8802)
+- Fix: It was possible to take over buoys by building a station next to them (r8794)
+- Fix: Cloning unaware of articulated locomotives that could refit without refitting the front unit (r8777)
+- Fix: Loading times for overhanging trains are miscomputed (r8709)
+
+
 0.5.0-RC5 (2007-02-08)
 ------------------------------------------------------------------------
-- Feature: requery gameservers that did not respond to their first query (r8520, r8542)
-- Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console (r8459, r8461)
-- Feature: logging of the IP address and port of invalid/illegal UDP packets (r8490)
+- Feature: Requery gameservers that did not respond to their first query (r8520, r8542)
+- Feature: Logging of the IP address and port of invalid/illegal UDP packets (r8490)
+- Codechange: Replace missing sprites with a red question mark (r8634)
 - Codechange: Add Korean, Simplified Chinese and Traditional Chinese languages as an official translation (r8286, r8324, r8616)
 - Codechange: Increase the size of the sound/video/music-drivers to 32 bytes (instead of 16) so their actual parameters can be passed. Sound has for example bufsize' and 'hz' (r8497)
 - Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's (r8253)
-- Codechange: Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock. (r8420, r8421)
-- Codechange: replace missing sprites with a red question mark (8634)
-- Regression: Help window was empty for UNICODE builds (r8239)
-- Regression: When the latest news was deleted, the news queue wrapped back to the oldest item, showing all news again (r8409)
-- Regression: ShowLastNewsMessage could show an out-of-bounds news item because it did not checked if a previous item actually existed the first time it is called (forced news is INVALID_NEWS) [FS#573] (r8409)
-- Fix: deleting a vehicle with shared orders, but no orders would fail to reset prev_shared and next_shared (r8294)
-- Fix: GenerateVehicleSortList()/CmdMassStartStopVehicle() tried to put a TileIndex into an uint16 (r8296)
-- Fix: [YAPF] Assert when buoy is placed on NE or NW map edge (r8540)
-- Fix: a road vehicle that is very close after another (slower) road vehicle gets its speed reset to 0 when entering a tunnel, which causes a traffic jam outside of the tunnel (r8609)
-- Fix: Road Vehicles now can obtain a slot even if the station is very spread out [FS#577] (r8536)
-- Fix: bridges do not get destroyed when the bridge head gets flooded and there is a vehicle on the bridge [FS#564] (r8593)
-- Fix: you were unable to build roads in the scenario editor when there is no town 0, even though there are other towns (r8608)
-- Fix: store the ownership of a water tile in the buoy tile and set the ownership of the water tile when the buoy is removed. This solves the issue of removing ownership from canal tiles thus making is possible for other players to remove the canal tile (r8619)
-- Fix: buoys on canal tiles do not flood anymore (r8620)
-- Fix: Put the output of -h to stdout and not to stderr (through ShowInfo) (r8240)
-- Fix: use ShowInfo over fprintf(stderr, as Windows doesn't always have a stderr visible/available (r8315)
-- Fix: return value from clamp was ignored (r8273)
+- Fix: Draw canal edges under buoys that are in a canal (r8635)
+- Fix: Buoys on canal tiles do not flood anymore (r8620)
+- Fix: Store the ownership of a water tile in the buoy tile and set the ownership of the water tile when the buoy is removed. Prevents certain abuses (r8619)
 - Fix: When the currently selected player in the performance details window is no longer active, choose the first active player instead of the first player as that may also be inactive  [FS#582] (r8612)
-- Fix: segmentation fault when the toolbar gets removed and you have selected one of the items in a submenu of the toolbar (r8533)
-- Fix: [OSX] freetype and fontconfig detection (r8500)
-- Fix: draw canal edges under buoys that are in a canal (8635)
-- Fix: CTRL-clicking on a hangar in the order list segfaulted as hangars are part of a station instead of real depots (8637)
+- Fix: Road vehicle very close after another (slower) road vehicle gets its speed reset to 0 when entering a tunnel, which causes a traffic jam outside of the tunnel (r8609)
+- Fix: Bridges do not get destroyed when the bridge head gets flooded and there is a vehicle on the bridge [FS#564] (r8593)
+- Fix: Road Vehicles now can obtain a slot even if the station is very spread out [FS#577] (r8536)
+- Fix: Segmentation fault when the toolbar gets removed and you have selected one of the items in a submenu of the toolbar (r8533)
+- Fix: Deleting a vehicle with shared orders, but no orders would fail to reset prev_shared and next_shared (r8294)
+
 
 0.5.0-RC4 (2007-01-18)
 ------------------------------------------------------------------------

docs/openttd.6

@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd February 8, 2007
+.Dd February 27, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -11,14 +11,14 @@
 .Op Fl G Ar seed
 .Op Fl d Ar [level | cat=lvl[, ...]]
 .Op Fl g Ar [savegame]
-.Op Fl n Ar [host[#player][:port]]
+.Op Fl n Ar host[:port][#player]
 .Op Fl r Ar widthxheight
 .Op Fl t Ar date
 .Op Fl m Ar driver
 .Op Fl s Ar driver
 .Op Fl v Ar driver
 .Sh OPTIONS
-.Bl -tag -width ".Fl n Ar host[#player][:port]"
+.Bl -tag -width ".Fl n Ar host[:port][#player]"
 .It Fl D
 Start a dedicated server
 .It Fl G Ar seed
@@ -45,9 +45,7 @@ Force to use the DOS palette (use this if you see a lot of magenta)
 .It Fl m Ar driver
 Set the music driver, see
 .Fl h
-.It Fl n
-Start a network server
-.It Fl n Ar host[#player][:port]
+.It Fl n Ar host[:port][#player]
 Join a network game, optionally specify player to play as and port to connect to
 .It Fl r Ar widthxheight
 Set the resolution

fios.c

@@ -20,7 +20,6 @@
 # include <io.h>
 #else
 # include <unistd.h>
-# include <dirent.h>
 #endif /* WIN32 */
 
 /* Variables to display file lists */
@@ -201,6 +200,7 @@ static FiosItem *FiosGetFileList(int mode, fios_getlist_callback_proc *callback_
 	DIR *dir;
 	FiosItem *fios;
 	int sort_start;
+	char d_name[sizeof(fios->name)];
 
 	/* A parent directory link exists if we are not in the root directory */
 	if (!FiosIsRoot(_fios_path) && mode != SLD_NEW_GAME) {
@@ -212,9 +212,9 @@ static FiosItem *FiosGetFileList(int mode, fios_getlist_callback_proc *callback_
 	}
 
 	/* Show subdirectories */
-	if (mode != SLD_NEW_GAME && (dir = opendir(_fios_path)) != NULL) {
+	if (mode != SLD_NEW_GAME && (dir = ttd_opendir(_fios_path)) != NULL) {
 		while ((dirent = readdir(dir)) != NULL) {
-			const char *d_name = FS2OTTD(dirent->d_name);
+			ttd_strlcpy(d_name, FS2OTTD(dirent->d_name), sizeof(d_name));
 
 			/* found file must be directory, but not '.' or '..' */
 			if (FiosIsValidFile(_fios_path, dirent, &sb) && (sb.st_mode & S_IFDIR) &&
@@ -242,13 +242,13 @@ static FiosItem *FiosGetFileList(int mode, fios_getlist_callback_proc *callback_
 	sort_start = _fios_count;
 
 	/* Show files */
-	dir = opendir(_fios_path);
+	dir = ttd_opendir(_fios_path);
 	if (dir != NULL) {
 		while ((dirent = readdir(dir)) != NULL) {
 			char fios_title[64];
 			char *t;
-			char *d_name = (char*)FS2OTTD(dirent->d_name);
 			byte type;
+			ttd_strlcpy(d_name, FS2OTTD(dirent->d_name), sizeof(d_name));
 
 			if (!FiosIsValidFile(_fios_path, dirent, &sb) || !(sb.st_mode & S_IFREG)) continue;
 

fios.h

@@ -77,10 +77,25 @@ struct DIR {
 	bool at_first_entry;
 };
 
-DIR *opendir(const char *path);
+DIR *opendir(const wchar_t *path);
 struct dirent *readdir(DIR *d);
 int closedir(DIR *d);
-
+#else
+/* Use system-supplied opendir/readdir/closedir functions */
+# include <sys/types.h>
+# include <dirent.h>
 #endif /* defined(WIN32) */
 
+/**
+ * A wrapper around opendir() which will convert the string from
+ * OPENTTD encoding to that of the filesystem. For all purposes this
+ * function behaves the same as the original opendir function
+ * @param path string to open directory of
+ * @return DIR pointer
+ */
+static inline DIR *ttd_opendir(const char *path)
+{
+	return opendir(OTTD2FS(path));
+}
+
 #endif /* FIOS_H */

known-bugs.txt

@@ -21,31 +21,25 @@ URL: http://bugs.openttd.org
 
 -601	airports can't get flooded when they have planes in them
 -599	reloaded game lost company passwords
--596	Cloning Maglev in UKRS forgets Mail refit
 -595	Sort by max cargo rating does not sort correctly
 -594	terraforming wipes out canals
 -591	Autorenew fails under certain conditions
--585	Huge losses with transfer
 -583	Fatal fault or crash during startup
 -578	No loading at my industrial centre
 -574	Open TTD overiding Power Warnings
 -571	Problems with vehicle purchase lists with NewGRFs
--569	'Game Load Failed' when trying to open scenarios
 -559	Front-/Rear-facing engines don't line up with each other
 -553	Autorenew doesn't warn when replacement isn't available
 -546	[0.5.0 RC3] Inflation overflow
--542	Assertion with Vehicle list
 -540	Planes vanished when offered exclusive
 -539	Trains can cash the same cargo multiple times
 -529	newairport's sprite issue
 -524	OSX sometimes (not always) fails to find free disk space
 -522	overflow on vehicle costs
--519	Bridge building results in 'missing' pieces
 -508	Destroying trees and replanting => raised rating
 -502	OSX can incorrectly print "dbg: [sl] Cannot open savegame 'data/opntitle.dat' for saving/loading."
 -501	Mouse pointer gets hidden, when draging out of window and back again. Only affects Wacom etc.
 -494	Get free money abusing a stock bug
--489	[0.5.0rc1] Sound choppy on Vista
 -474	Overtaking car doesn't hit the against-riding car.
 -459	Merging is buggy
 -458	Crash when changing Resolution on Mac OS X (x86)
@@ -53,7 +47,6 @@ URL: http://bugs.openttd.org
 -442	Alt-tab behaviour flawed whilst full screen (win32)
 -441	Transparent stuff
 -435	Assertion window doesn't show when in fullscreen on Mac OS X
--431	failure to autorenew (core/GUI desync)
 -423	Improved loading causes high CPU use with long trains
 -410	Openttd in dedicated mode don't run without data files
 -404	Cargo never delivered to station after bribe and before first pickup
@@ -65,7 +58,7 @@ URL: http://bugs.openttd.org
 -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
--282	layers do not clear loans as soon as they could
+-282	AI Players do not clear loans as soon as they could
 -274	Autoclean ignores any share holdings
 -265	Subsidy awarded detection bug
 -259	AIs start unnamed companies that do nothing
@@ -73,7 +66,6 @@ URL: http://bugs.openttd.org
 -202	2 Locomotives in 1 Train - Selling one results in Age of the other one Being 0
 -193	Inconsistent directory usage on Mac OS X
 -165	vehicle length not taken into account
--163	Cargo: Station destroyed / High payment
 -153	Language crash with app renaming OSX
 -119	Clipping problems with vehicles on slopes
 -115	inactive logins do not get auto kicked
@@ -106,7 +98,6 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -1382782	Loan interest calculated 'wrong'
 -1201284	permanent hilight in a depot
 -1185852	Scrollbars get arbitrarily small
--1184634	Replace vehicles window bug
 -1160732	little bug with transparency
 -1117731	Editor-StartingDate
 -1108046	game freezes
@@ -114,7 +105,6 @@ 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
-- 993516	Canal + bouy -> wrong graphics.
 - 987891	Large UFO destruction bug
 - 987883	Aircraft landing/taking off
 - 987880	company league table updating

lang/american.txt

@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Create Scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario Editor
 STR_0223_LAND_GENERATION                                        :{WHITE}Land Generation
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Random Land
+STR_0227_RESET_LAND                                             :{BLACK}Reset Land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Increase area of land to lower/raise
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Decrease area of land to lower/raise
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generate random land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reset landscape
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Reset Landscape
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Use Heightmap
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Use Heightmap
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Are you sure you want to reset the landscape?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landscape generation
 STR_022F_TOWN_GENERATION                                        :{BLACK}Town generation
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industry generation

lang/brazilian_portuguese.txt

@@ -36,7 +36,7 @@ STR_001A_COPPER_ORE                                             :{G=m}Minério d
 STR_001B_MAIZE                                                  :{G=m}Milho
 STR_001C_FRUIT                                                  :{G=f}Fruta
 STR_001D_DIAMONDS                                               :{G=m}Diamante
-STR_001E_FOOD                                                   :{G=m}Alimento
+STR_001E_FOOD                                                   :{G=f}Comida
 STR_001F_PAPER                                                  :{G=m}Papel
 STR_0020_GOLD                                                   :{G=m}Ouro
 STR_0021_WATER                                                  :{G=f}Água
@@ -53,37 +53,37 @@ STR_002B_BATTERIES                                              :{G=f}Pilhas
 STR_002C_PLASTIC                                                :{G=m}Plástico
 STR_002D_FIZZY_DRINKS                                           :{G=m}Refrigerantes
 STR_002E                                                        :
-STR_002F_PASSENGER                                              :{G=m}passageiros
-STR_0030_COAL                                                   :{G=m}carvão
-STR_0031_MAIL                                                   :{G=f}cartas
-STR_0032_OIL                                                    :{G=m}petróleo
-STR_0033_LIVESTOCK                                              :{G=m}gado
-STR_0034_GOODS                                                  :{G=m}bens
-STR_0035_GRAIN                                                  :{G=m}grãos
-STR_0036_WOOD                                                   :{G=f}madeira
-STR_0037_IRON_ORE                                               :{G=m}minério de ferro
-STR_0038_STEEL                                                  :{G=m}aço
-STR_0039_VALUABLES                                              :{G=m}dinheiro
-STR_003A_COPPER_ORE                                             :{G=m}minério de cobre
-STR_003B_MAIZE                                                  :{G=m}milho
-STR_003C_FRUIT                                                  :{G=f}fruta
-STR_003D_DIAMOND                                                :{G=m}diamante
-STR_003E_FOOD                                                   :{G=m}alimento
-STR_003F_PAPER                                                  :{G=m}papel
-STR_0040_GOLD                                                   :{G=m}ouro
-STR_0041_WATER                                                  :{G=f}água
-STR_0042_WHEAT                                                  :{G=m}trigo
-STR_0043_RUBBER                                                 :{G=f}borracha
-STR_0044_SUGAR                                                  :{G=m}açúcar
-STR_0045_TOY                                                    :{G=m}brinquedos
-STR_0046_CANDY                                                  :{G=m}doces
-STR_0047_COLA                                                   :{G=f}cola
-STR_0048_COTTON_CANDY                                           :{G=m}algodão doce
-STR_0049_BUBBLE                                                 :{G=f}bolhas
-STR_004A_TOFFEE                                                 :{G=m}caramelo
-STR_004B_BATTERY                                                :{G=f}pilhas
-STR_004C_PLASTIC                                                :{G=m}plástico
-STR_004D_FIZZY_DRINK                                            :{G=m}refrigerantes
+STR_002F_PASSENGER                                              :{G=m}Passageiros
+STR_0030_COAL                                                   :{G=m}Carvão
+STR_0031_MAIL                                                   :{G=f}Cartas
+STR_0032_OIL                                                    :{G=m}Petróleo
+STR_0033_LIVESTOCK                                              :{G=m}Gado
+STR_0034_GOODS                                                  :{G=m}Bens
+STR_0035_GRAIN                                                  :{G=m}Grãos
+STR_0036_WOOD                                                   :{G=f}Madeira
+STR_0037_IRON_ORE                                               :{G=m}Minério de ferro
+STR_0038_STEEL                                                  :{G=m}Aço
+STR_0039_VALUABLES                                              :{G=m}Dinheiro
+STR_003A_COPPER_ORE                                             :{G=m}Minério de cobre
+STR_003B_MAIZE                                                  :{G=m}Milho
+STR_003C_FRUIT                                                  :{G=f}Fruta
+STR_003D_DIAMOND                                                :{G=m}Diamante
+STR_003E_FOOD                                                   :{G=f}Comida
+STR_003F_PAPER                                                  :{G=m}Papel
+STR_0040_GOLD                                                   :{G=m}Ouro
+STR_0041_WATER                                                  :{G=f}Água
+STR_0042_WHEAT                                                  :{G=m}Trigo
+STR_0043_RUBBER                                                 :{G=f}Borracha
+STR_0044_SUGAR                                                  :{G=m}Açúcar
+STR_0045_TOY                                                    :{G=m}Brinquedos
+STR_0046_CANDY                                                  :{G=m}Doces
+STR_0047_COLA                                                   :{G=f}Cola
+STR_0048_COTTON_CANDY                                           :{G=m}Algodão doce
+STR_0049_BUBBLE                                                 :{G=f}Bolhas
+STR_004A_TOFFEE                                                 :{G=m}Caramelo
+STR_004B_BATTERY                                                :{G=f}Pilhas
+STR_004C_PLASTIC                                                :{G=m}Plástico
+STR_004D_FIZZY_DRINK                                            :{G=m}Refrigerantes
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} passageiro{P "" s}
 STR_QUANTITY_COAL                                               :{WEIGHT} de carvão
@@ -186,7 +186,7 @@ STR_00D7_GREEN                                                  :Verde
 STR_00D8_DARK_GREEN                                             :Verde Escuro
 STR_00D9_BLUE                                                   :Azul
 STR_00DA_CREAM                                                  :Creme
-STR_00DB_MAUVE                                                  :Preto
+STR_00DB_MAUVE                                                  :Malva
 STR_00DC_PURPLE                                                 :Roxo
 STR_00DD_ORANGE                                                 :Laranja
 STR_00DE_BROWN                                                  :Marrom
@@ -214,7 +214,7 @@ STR_00F3_400M                                                   :{BLACK}{TINYFON
 STR_00F4_500M                                                   :{BLACK}{TINYFONT}500m
 STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}Trens
 STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Automóveis
-STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Embarcações
+STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Navios
 STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Aeronaves
 STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Rotas de Transporte
 STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Mina de Carvão
@@ -234,10 +234,10 @@ STR_0107_GOLD_MINE                                              :{BLACK}{TINYFON
 STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Indústria Alimentícia
 STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Mina de Diamante
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Mina de Cobre
-STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Pomar
+STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Plantação de Frutas
 STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Plantação de Seringueiras
-STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Poço Artesiano
-STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Reservatório de Água
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Poço de Água
+STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Reservatório
 STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Serraria
 STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Floresta de Algodão Doce
 STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Fábrica de Doces
@@ -316,7 +316,7 @@ STR_0153_SUBSIDIES                                              :Subsídios
 
 STR_UNITS_IMPERIAL                                              :Imperial
 STR_UNITS_METRIC                                                :Métrico
-STR_UNITS_SI                                                    :SI
+STR_UNITS_SI                                                    :Sistema Internacional
 
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/h
@@ -616,16 +616,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} conquista o status de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista o status de '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Criar Cenário
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Cenário
 STR_0223_LAND_GENERATION                                        :{WHITE}Gerar Terreno
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Terreno Aleatório
+STR_0227_RESET_LAND                                             :{BLACK}Limpar Terreno
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumentar área de terreno a baixar/levantar
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Diminuir área de terreno a baixar/levantar
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Gerar terreno aleatório
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Limpar terreno
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Limpar Terreno
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Usar mapa de altitudes
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Usar mapa de altitudes
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Tem a certeza que deseja limpar o terreno?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Gerar terreno
 STR_022F_TOWN_GENERATION                                        :{BLACK}Gerar cidades
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Gerar indústrias
@@ -1155,7 +1161,7 @@ STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar c
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Aeronaves a jato não irão acidentar (frequentemente) em aeroportos pequenos: {ORANGE} {STRING}
+STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Aeronaves a jato não irão se acidentar (frequentemente) em aeroportos pequenos: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Mudar de clima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Alterar data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING}
@@ -1267,7 +1273,7 @@ STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Os inte
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Bem-vindo à nova IA, ainda em desenvolvimento. Se você encontrar problemas tire um printscreen e poste no fórum.
-TEMP_AI_ACTIVATED                                               :{WHITE}Atenção: esta nova IA está ainda em versão alpha! Atualmente, só funcionam caminhões e ônibus!
+TEMP_AI_ACTIVATED                                               :{WHITE}Atenção: esta nova IA está ainda em versão alfa! Atualmente, só funcionam caminhões e ônibus!
 TEMP_AI_MULTIPLAYER                                             :{WHITE}Atenção: esta função ainda é experimental (usando a nova IA). Por favor reporte quaisquer problemas para truelight@openttd.org.
 
 ############ network gui strings
@@ -1525,7 +1531,7 @@ STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Precisa
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Construir ferrovias
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Construir ferrovias (elétricas)
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Construir ferrovias (monotrilho)
-STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Construir ferrovias (trem-bala)
+STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Construir ferrovias MagLev
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Selecionar Ponte Ferroviária
 STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Impossível construir depósito aqui...
 STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Impossível construir estação ferroviária aqui...
@@ -1537,7 +1543,7 @@ STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Orienta
 STR_1015_RAILROAD_CONSTRUCTION                                  :Construir ferrovias
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Construir ferrovias (elétricas)
 STR_1016_MONORAIL_CONSTRUCTION                                  :Construir ferrovias (monotrilho)
-STR_1017_MAGLEV_CONSTRUCTION                                    :Construir ferrovias (trem-bala)
+STR_1017_MAGLEV_CONSTRUCTION                                    :Construir ferrovias MagLev
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Construir ferrovias
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Construir depósito (para construção e manutenção de trens)
 STR_101A_BUILD_RAILROAD_STATION                                 :{BLACK}Construir estação ferroviária
@@ -1567,7 +1573,7 @@ STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Impossí
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientação da Garagem
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Impossível construir garagem aqui...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Impossível construir estação de ônibus...
-STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossível construir carga de caminhões...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossível construir estação de caminhão
 STR_180A_ROAD_CONSTRUCTION                                      :Construir rodovias
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construir trecho rodoviário
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construir garagem (para construção e manutenção de automóveis)
@@ -1716,7 +1722,7 @@ STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Muito pe
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Muito perto de uma estação/local de carga já existente
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Muitas estações/áreas de carga nesta cidade
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Muitas estações/áreas de carga
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Muitos pontos de ônibus
+STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Muitas estações de ônibus
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Muitos locais de carga
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Muito perto de outra estação/local de carga
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
@@ -1746,10 +1752,10 @@ STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} não aceita mais {STRING} ou {STRING}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} agora aceita {STRING}
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} agora aceita {STRING} e {STRING}
-STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientação do ponto de ônibus
-STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientação do local de carga
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa demolir o ponto de ônibus primeiro
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa demolir a área de carga primeiro
+STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientação do estação de ônibus
+STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientação da estação de caminhão
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa demolir a estação de ônibus primeiro
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa demolir a estação de caminhão
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estações
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
@@ -1759,7 +1765,7 @@ STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Precisa
 STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Selecionar a orientação da estação ferroviária
 STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Selecionar o número de linhas da estação ferroviária
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Selecionar o tamanho da estação ferroviária
-STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Selecionar orientação do ponto de ônibus
+STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Selecionar orientação do estação de ônibus
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Selecionar orientação da área de carga
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centralizar visualização no local estação
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Exibir avaliações da estação
@@ -1773,7 +1779,7 @@ STR_305E_RAILROAD_STATION                                       :Estação ferro
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Aeroporto
 STR_3061_TRUCK_LOADING_AREA                                     :Área de carga de caminhões
-STR_3062_BUS_STATION                                            :Ponto de ônibus
+STR_3062_BUS_STATION                                            :Estação de ônibus
 STR_3063_SHIP_DOCK                                              :Doca
 STR_3064_HIGHLIGHT_COVERAGE_AREA                                :{BLACK}Destacar área de cobertura da construção proposta
 STR_3065_DON_T_HIGHLIGHT_COVERAGE                               :{BLACK}Não destacar área de cobertura da construção proposto
@@ -1885,7 +1891,7 @@ STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Infestação de insetos causa destruição em {INDUSTRY}!{}Produção diminui em 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...só pode ser colocado perto das bordas do mapa
 STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}A produção de {STRING} em {INDUSTRY} aumentou em {COMMA}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {INDUSTRY} diminuiu em {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} na {INDUSTRY} diminuiu em {COMMA}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Há um trem no túnel
@@ -2876,7 +2882,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Emprést
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Número de veículos: Incluindo automóveis, trens, embarcações e aeronaves.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Número de segmentos de estação. Cada parte de uma estação (ex. estação ferroviária, ponto de ônibus, aeroporto) é contado, mesmo se eles estiverem ligados a uma estação.
+STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Número de segmentos de estação. Cada parte de uma estação (ex. estação ferroviária, estação de ônibus, aeroporto) é contado, mesmo se eles estiverem ligados a uma estação.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}O lucro do veículo com o rendimento menor (de todos os veículos com mais de 2 anos)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Dinheiro conseguido no mês com os lucros mais altos dos últimos 12 trimestres

lang/bulgarian.txt

@@ -297,6 +297,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Нова
 STR_0141_LOAD_GAME                                              :{BLACK}Отвори игра
 STR_SINGLE_PLAYER                                               :{BLACK}Сам играч
 STR_MULTIPLAYER                                                 :{BLACK}Много играчи
+STR_SCENARIO_EDITOR                                             :{BLACK}Редактор сценарии
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -615,16 +616,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} достигна статус '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} от {COMPANY} достигна статус '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Създай сценарий
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Редактор на сценарии
 STR_0223_LAND_GENERATION                                        :{WHITE}Генератор на терен
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Случаен терен
+STR_0227_RESET_LAND                                             :{BLACK}Изчисти терена
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Увеличи площа на терена, за да го понижиш/повишиш
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Намали площа на терена, за да го понижиш/повишиш
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Генерирай случаен терен
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Изчисти терена
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Изчисти терена
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Ползвай топо-карта
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Ползвай топо-карта
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Желаете ли да изчистите терена?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Създаване на терен
 STR_022F_TOWN_GENERATION                                        :{BLACK}Създаване на град
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Създаване на индустрия
@@ -1415,6 +1422,8 @@ STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Не с
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Не може да открия мрежови игри
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Сървърът не отговори на заявката
 STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Не може да се свърже поради различие в NewGRF
+STR_NETWORK_ERR_DESYNC                                          :{WHITE} Синхронизацията на мрежовата игра се провали
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Връзката с мрежовата игра се загуби
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Не може да зареди играта
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Сървъра не може да бъде стартиран
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Не може да се свърже

lang/catalan.txt

@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} asoleix l'estat '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} asoleix l'estat '{STRING}' !
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Crea un Escenari
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor d'Escenaris
 STR_0223_LAND_GENERATION                                        :{WHITE}Generador de Terreny
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Terreny Aleatori
+STR_0227_RESET_LAND                                             :{BLACK}Restableix Terreny
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Augmenta la mida de l'àrea de terreny a rebaixar/elevar
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Disminueix la mida de l'àrea de terreny a rebaixar/elevar
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genera un terreny aleatori
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Restableix paisatge
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Restablir Paisatge
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Utilitza un mapa d'alçades
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Utilitza un mapa d'alçades
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Estàs segur 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
@@ -1230,7 +1236,7 @@ STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Desactiv
 STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activa tots
 
 STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Construeix Mina de Carbó
-STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Planta Bosc
+STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Planta un Bosc
 STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Construeix una Plataforma Petrolífera
 STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Funda Granja
 STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Construeix una Mina de Coure
@@ -1241,7 +1247,7 @@ STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Construe
 STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Funda Plantació de Fruita
 STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Funda Plantació de Cautxú
 STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Funda Surtidor d'Aigua
-STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Planta Bosc de Cotó de Sucre
+STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Planta un Bosc de Cotó de Sucre
 STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Funda Granja de Piles
 STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Perfora per buscar Cola
 STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Funda Fonts de Plàstic
@@ -1465,7 +1471,7 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Espectadors
 
-STR_NETWORK_CLIENTLIST_NONE                                     :
+STR_NETWORK_CLIENTLIST_NONE                                     :(cap)
 STR_NETWORK_CLIENTLIST_KICK                                     :Breu
 STR_NETWORK_CLIENTLIST_GIVE_MONEY                               :Entrega diners
 STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL                             :Parla a tothom

lang/czech.txt

@@ -2,7 +2,7 @@
 ##ownname Česky
 ##isocode cs_CS
 ##plural 6
-##case nom gen acc dat voc loc ins big news subs
+##case nom gen dat acc voc loc ins big
 ##gender m f n
 
 ##id 0x0000
@@ -24,146 +24,90 @@ 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_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_0012_OIL                                                    :ropa
 STR_0012_OIL.big                                                :Ropa
 STR_0012_OIL.gen                                                :ropy
-STR_0012_OIL.news                                               :ropy
-STR_0012_OIL.subs                                               :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_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_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_0018_STEEL                                                  :ocel
 STR_0018_STEEL.big                                              :Ocel
 STR_0018_STEEL.gen                                              :oceli
-STR_0018_STEEL.news                                             :oceli
-STR_0018_STEEL.subs                                             :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_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_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_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_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_0020_GOLD                                                   :zlato
 STR_0020_GOLD.big                                               :Zlato
 STR_0020_GOLD.gen                                               :zlata
-STR_0020_GOLD.news                                              :zlata
-STR_0020_GOLD.subs                                              :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_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_0024_SUGAR                                                  :cukr
 STR_0024_SUGAR.big                                              :Cukr
 STR_0024_SUGAR.gen                                              :cukru
-STR_0024_SUGAR.news                                             :cukru
-STR_0024_SUGAR.subs                                             :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_0026_CANDY                                                  :bonbony
 STR_0026_CANDY.big                                              :Bonbony
 STR_0026_CANDY.gen                                              :bonbonů
-STR_0026_CANDY.news                                             :bonbonu
-STR_0026_CANDY.subs                                             :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_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_0029_BUBBLES                                                :bubliny
 STR_0029_BUBBLES.big                                            :Bubliny
 STR_0029_BUBBLES.gen                                            :bublin
-STR_0029_BUBBLES.news                                           :bublin
-STR_0029_BUBBLES.subs                                           :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_002B_BATTERIES                                              :baterie
 STR_002B_BATTERIES.big                                          :Baterie
 STR_002B_BATTERIES.gen                                          :baterií
-STR_002B_BATTERIES.news                                         :baterií
-STR_002B_BATTERIES.subs                                         :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_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_002E                                                        :
 STR_002F_PASSENGER                                              :cestujících
 STR_0030_COAL                                                   :uhlí
@@ -728,16 +672,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} získal titul '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} získal titul '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Vytvořit mapu
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor mapy
 STR_0223_LAND_GENERATION                                        :{WHITE}Generovat zemi
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Náhodná země
+STR_0227_RESET_LAND                                             :{BLACK}Vymaž zemi
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zvětšit oblast země pro snížení/zvýšení
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zmenšit oblast země pro snížení/zvýšení
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generovat náhodnou zemi
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Smazat krajinu
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Smazat krajinu
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Použít výškovou mapu
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Použít výškovou mapu
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Urcite chceš smazat krajinu?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generování krajiny
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generování měst
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generování průmyslu
@@ -1857,7 +1807,7 @@ STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} nyní přijímá {STRING}
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} nyní přijímá {STRING} a {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientace autobusové zastávky.
-STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientace nákladové rampy.
+STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientace nákladové rampy
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Musíš nejprve zničit autobusovou zastávku
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Musíš nejprve zničit nákladovou rampu
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} stanic{P e e ""}
@@ -2586,15 +2536,18 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Vrtulník Trica
 STR_80FE_GURU_X2_HELICOPTER                                     :Vrtulník Guru X2
 STR_80FF_POWERNAUT_HELICOPTER                                   :Vrtulník Powernaut
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Zpráva od výrobce dopravních prostředků
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Právě jsme vyvinuli nov{G ý ou é} {STRING.dat}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Právě jsme vyvinuli nov{G ý ou é} {STRING.acc}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :{G=f}lokomotiva
+STR_8102_RAILROAD_LOCOMOTIVE.acc                                :{G=f}lokomotivu
 STR_8102_RAILROAD_LOCOMOTIVE.dat                                :{G=f}lokomotivu
 STR_8103_ROAD_VEHICLE                                           :{G=n}silniční vozidlo
 STR_8104_AIRCRAFT                                               :{G=n}letadlo
 STR_8105_SHIP                                                   :{G=f}loď
 STR_8106_MONORAIL_LOCOMOTIVE                                    :{G=f}lokomotiva pro monorail
+STR_8106_MONORAIL_LOCOMOTIVE.acc                                :{G=f}lokomotivu pro monorail
 STR_8106_MONORAIL_LOCOMOTIVE.dat                                :{G=f}lokomotivu pro monorail
 STR_8107_MAGLEV_LOCOMOTIVE                                      :{G=f}lokomotiva Maglev
+STR_8107_MAGLEV_LOCOMOTIVE.acc                                  :{G=f}lokomotivu Maglev
 STR_8107_MAGLEV_LOCOMOTIVE.dat                                  :{G=f}lokomotivu Maglev
 
 ##id 0x8800

lang/danish.txt

@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} får '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} fra {COMPANY} får '{STRING}' status!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Lav et scenarie
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarieeditor
 STR_0223_LAND_GENERATION                                        :{WHITE}Land generering
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Tilfældigt land
+STR_0227_RESET_LAND                                             :{BLACK}Nulstil land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Forstør landområdet der skal sænkes/hæves
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Formindsk landområdet der skal sænkes/hæves
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generer tilfældigt land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Nulstil landskab
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Nulstil landskab
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Brug højdekort
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Brug højdekort
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Er du sikker på, at du vil nulstille landskabet?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landskabsgenerering
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bygenerering
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrigenerering
@@ -2872,7 +2878,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Lån:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Antal af køretøjer; dette inkludere vejkøretøjer, tog, skibe og fly
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antallet af stationer. Alle dele af en station (f.eks. tog station, bus station, lufthavn) tæller med, også selvom de er sat sammen til en station
+STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antallet af stationer. Alle dele af en station (f.eks. banegård, rutebilstation, lufthavn) tæller med, selvom de er sammensat som én station
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Afkast for køretøjet med laveste indkomst (af alle køretøjer ældre end 2 år)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Indtægt i måneden med den laveste indtægt i de sidste 12 kvartaler
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Indkomst i måneden med det højeste afkast i de sidste 12 kvartaler

lang/dutch.txt

@@ -382,9 +382,9 @@ STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Capaciteit per
 STR_SORT_BY_MAX_SPEED                                           :Maximale snelheid
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Waarde
-STR_SORT_BY_FACILITY                                            :
-STR_SORT_BY_WAITING                                             :
-STR_SORT_BY_RATING_MAX                                          :
+STR_SORT_BY_FACILITY                                            :Station type
+STR_SORT_BY_WAITING                                             :Waarde van wachtende vracht
+STR_SORT_BY_RATING_MAX                                          :Vracht waardering
 STR_ENGINE_SORT_ENGINE_ID                                       :Motor ID (klassieke soort)
 STR_ENGINE_SORT_COST                                            :Kosten
 STR_ENGINE_SORT_POWER                                           :Kracht
@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} bereikt '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} van {COMPANY} bereikt '{STRING}' status!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Maak scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario editor
 STR_0223_LAND_GENERATION                                        :{WHITE}Landontwikkeling
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Willekeurig land
+STR_0227_RESET_LAND                                             :{BLACK}Verwijder land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Vergroot het stuk land om te verhogen/verlagen
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Verklein het stuk land om te verhogen/verlagen
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genereer willekeurig land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Verwijder landschap
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Verwijder landschap
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Gebruik hoogtekaart
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Gebruik hoogtekaart
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Weet je zeker dat je het land wilt verwijderen?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landschapproductie
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stadproductie
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrieproductie

lang/esperanto.txt

@@ -615,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} atingis staton de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atingis staton de '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Kreu Scenaron
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarkreilon
 STR_0223_LAND_GENERATION                                        :{WHITE}Landa Generado
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Hazarda Lando
+STR_0227_RESET_LAND                                             :{BLACK}Reigu Landon
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Grandigu landparton por (mal)altigi
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Malgrandigu landparton por (mal)altigi
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Kreu landon hazarde
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reigu landaspekton
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Reigu Landaspekton
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Uzu Altecmapon
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Uzu Altecmapon
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Ĉu vi certas ke vi volas reigi la landaspekton?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landaspekta generado
 STR_022F_TOWN_GENERATION                                        :{BLACK}Urba generado
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industria generado
@@ -2953,6 +2959,8 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Montru
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}Vendu
+
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Vi intencas vendi ĉiujn veturilojn en la deponejo.
 STR_ARE_YOU_SURE                                                :{BLACK}Ĉu vi certas?
 

lang/estonian.txt

@@ -395,6 +395,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Alusta m
 STR_0141_LOAD_GAME                                              :{BLACK}Laadi mängu
 STR_SINGLE_PLAYER                                               :{BLACK}Üksikmängija
 STR_MULTIPLAYER                                                 :{BLACK}Võrgumäng
+STR_SCENARIO_EDITOR                                             :{BLACK}Stsenaariumi Muutmine
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -713,16 +714,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} saavutas '{STRING}' staatuse!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} {COMPANY}'st saavutas '{STRING}' staatuse!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Loo stsenaarium
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Kaardiredaktor
 STR_0223_LAND_GENERATION                                        :{WHITE}Maastiku loomine
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Juhuslik kaart
+STR_0227_RESET_LAND                                             :{BLACK}Nulli kaart
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Suurenda kõrgendatava/madaldatava maa-ala pindala
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Vähenda kõrgendatava/madaldatava maa-ala pindala
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Juhusliku kaardi loomine
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Nulli maastik
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Nulli maastik
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Kasuta Kõrguskaarti
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Kasuta Kõrguskaarti
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Oled sa kindel, et sa tahad maastikku nullida?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Maastiku loomine
 STR_022F_TOWN_GENERATION                                        :{BLACK}Linnade loomine
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Tööstuste loomine

lang/finnish.txt

@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} saavuttaa arvon '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Luo skenaario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Skenaariomuokkain
 STR_0223_LAND_GENERATION                                        :{WHITE}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_022B_RESET_LANDSCAPE                                        :{BLACK}Nollaa maasto
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Nollaa maasto
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Käytä korkeuskarttaa
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Käytä korkeuskarttaa
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Nollataanko maasto?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Luo maasto
 STR_022F_TOWN_GENERATION                                        :{BLACK}Luo kaupunkeja
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Luo teollisuutta
@@ -1413,6 +1419,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Asiakasl
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Verkkolaitteita ei löytynyt tai käännetty ilman ENABLE_NETWORK-valintaa.
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Verkkopelejä ei löytynyt.
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Palvelin ei vastannut pyyntöön.
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Yhteyden muodostaminen epäonnistui NewGRF-virheen vuoksi
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Verkkopelin tahdistus epäonnistui.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Verkkopeliyhteys katkesi.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Palvelimen pelitallennetta ei voi ladata.
@@ -1434,6 +1441,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :tahdistusvirhe
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :karttaa ei voitu ladata
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :yhteys katkesi
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollavirhe
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-virhe
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ei valtuutettu
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :vastaanotettiin omituinen paketti
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :väärä revisio
@@ -2183,7 +2191,6 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Yhtiön {COMPANY} on ottanut haltuun {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
 
-STR_LIVERY_DEFAULT                                              :
 STR_LIVERY_STEAM                                                :Höyryveturi
 STR_LIVERY_DIESEL                                               :Dieselveturi
 STR_LIVERY_ELECTRIC                                             :Sähköveturi

lang/french.txt

@@ -25,8 +25,8 @@ STR_0010_COAL                                                   :Charbon
 STR_0011_MAIL                                                   :Courrier
 STR_0012_OIL                                                    :Pétrole
 STR_0013_LIVESTOCK                                              :Bétail
-STR_0014_GOODS                                                  :Biens
-STR_0015_GRAIN                                                  :Grain
+STR_0014_GOODS                                                  :Marchandise
+STR_0015_GRAIN                                                  :Céréales
 STR_0016_WOOD                                                   :Bois
 STR_0017_IRON_ORE                                               :Fer
 STR_0018_STEEL                                                  :Acier
@@ -43,7 +43,7 @@ STR_0022_WHEAT                                                  :Blé
 STR_0023_RUBBER                                                 :Caoutchouc
 STR_0024_SUGAR                                                  :Sucre
 STR_0025_TOYS                                                   :Jouets
-STR_0026_CANDY                                                  :Sucreries
+STR_0026_CANDY                                                  :Bonbons
 STR_0027_COLA                                                   :Cola
 STR_0028_COTTON_CANDY                                           :Barbe à Papa
 STR_0029_BUBBLES                                                :Bulles
@@ -57,8 +57,8 @@ STR_0030_COAL                                                   :Charbon
 STR_0031_MAIL                                                   :Courrier
 STR_0032_OIL                                                    :Pétrole
 STR_0033_LIVESTOCK                                              :Bétail
-STR_0034_GOODS                                                  :Biens
-STR_0035_GRAIN                                                  :Grain
+STR_0034_GOODS                                                  :Marchandise
+STR_0035_GRAIN                                                  :Céréales
 STR_0036_WOOD                                                   :Bois
 STR_0037_IRON_ORE                                               :Fer
 STR_0038_STEEL                                                  :Acier
@@ -75,7 +75,7 @@ STR_0042_WHEAT                                                  :Blé
 STR_0043_RUBBER                                                 :Caoutchouc
 STR_0044_SUGAR                                                  :Sucre
 STR_0045_TOY                                                    :Jouet
-STR_0046_CANDY                                                  :Sucrerie
+STR_0046_CANDY                                                  :Bonbon
 STR_0047_COLA                                                   :Cola
 STR_0048_COTTON_CANDY                                           :Barbe à Papa
 STR_0049_BUBBLE                                                 :Bulle
@@ -157,7 +157,7 @@ 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_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Impossible de démolir....
 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-2007 L'équipe OpenTTD
@@ -188,7 +188,7 @@ STR_00DA_CREAM                                                  :Beige
 STR_00DB_MAUVE                                                  :Mauve
 STR_00DC_PURPLE                                                 :Violet
 STR_00DD_ORANGE                                                 :Orange
-STR_00DE_BROWN                                                  :Brun
+STR_00DE_BROWN                                                  :Marron
 STR_00DF_GREY                                                   :Gris
 STR_00E0_WHITE                                                  :Blanc
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Trop de véhicules en jeu
@@ -203,8 +203,8 @@ STR_00E9_VEGETATION                                             :Végétation
 STR_00EA_OWNERS                                                 :Propriétaires
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Routes
 STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Voies ferrées
-STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Gares/Aéroports/Ports
-STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Édifices/Industries
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Gares/Aéroports/Ports maritimes
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Bâtiments/Industries
 STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Véhicules
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200m
@@ -239,7 +239,7 @@ STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFON
 STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Château d'eau
 STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Scierie
 STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Forêt de Barbe à Papa
-STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Usine de Sucreries
+STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Usine de Bonbons
 STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Ferme de Batteries
 STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}Puits de Cola
 STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Boutique de Jouets
@@ -253,13 +253,13 @@ STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFON
 STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Zone de Chargement
 STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Arrêt d'autobus
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Aéroport/Héliport
-STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Port
+STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Port maritime
 STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Terre en friche
 STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Herbe
 STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Terre nue
 STR_0123_FIELDS                                                 :{BLACK}{TINYFONT}Champs
 STR_0124_TREES                                                  :{BLACK}{TINYFONT}Arbres
-STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Roches
+STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Rochers
 STR_0126_WATER                                                  :{BLACK}{TINYFONT}Eau
 STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Sans Propriétaire
 STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Villes
@@ -295,7 +295,7 @@ STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARG
 STR_0140_NEW_GAME                                               :{BLACK}Nouvelle Partie
 STR_0141_LOAD_GAME                                              :{BLACK}Charger une Partie
 STR_SINGLE_PLAYER                                               :{BLACK}Un joueur
-STR_MULTIPLAYER                                                 :{BLACK}Multijoueurs
+STR_MULTIPLAYER                                                 :{BLACK}Mode Multijoueur
 STR_SCENARIO_EDITOR                                             :{BLACK}Éditeur de Scénario
 
 STR_64                                                          :64
@@ -356,13 +356,13 @@ STR_015A_COMPANY_LEAGUE_TABLE                                   :Classement des
 STR_PERFORMANCE_DETAIL_MENU                                     :Détail des performances
 ############ range for menu ends
 
-STR_015B_OPENTTD                                                :{WHITE}OpenTTD
+STR_015B_OPENTTD                                                :{WHITE}A propos de OpenTTD
 STR_015C_SAVE_GAME                                              :Sauvegarder la partie
 STR_015D_LOAD_GAME                                              :Charger une partie
 STR_015E_QUIT_GAME                                              :Abandonner la partie
 STR_015F_QUIT                                                   :Quitter le jeu
 STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Êtes vous sur de vouloir abandonner cette partie?
-STR_0161_QUIT_GAME                                              :{WHITE}Abandonner
+STR_0161_QUIT_GAME                                              :{WHITE}Abandonner la partie
 STR_SORT_ORDER_TIP                                              :{BLACK}Choisir l'ordre de tri croissant/décroissant
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Choisir le critère de tri
 STR_SORT_BY                                                     :{BLACK}Trier par
@@ -428,7 +428,7 @@ STR_016D_DEC                                                    :Déc
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
-STR_0171_PAUSE_GAME                                             :{BLACK}Suspendre la partie
+STR_0171_PAUSE_GAME                                             :{BLACK}Mettre le jeu en pause
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Sauvegarder, abandonner, quitter
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afficher la liste des stations de la compagnie
 STR_0174_DISPLAY_MAP                                            :{BLACK}Afficher la carte
@@ -597,7 +597,7 @@ STR_020C_NEW_VEHICLES                                           :{YELLOW}Nouveau
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Changements d'acceptation de marchandises
 STR_020E_SUBSIDIES                                              :{YELLOW}Subventions
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Information génerale
-STR_MESSAGES_ALL                                                :{YELLOW}Pour tout types de messages (aucun/sommaire/complet)
+STR_MESSAGES_ALL                                                :{YELLOW}Paramétrer tous les types de messages: Aucun / Sommaire / Complet
 STR_MESSAGE_SOUND                                               :{YELLOW}Émettre son pour les bulletins sommaires
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...trop loin de la destination précédente
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Meilleures compagnies, qui ont atteint {NUM}{}(Niveau {STRING})
@@ -615,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} atteint le niveau de '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atteint le niveau de '{STRING}' !
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Créer Scénario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Éditeur de Scénario
-STR_0223_LAND_GENERATION                                        :{WHITE}Génération de terrain
+STR_0223_LAND_GENERATION                                        :{WHITE}Création du terrain
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Générer un terrain
+STR_0227_RESET_LAND                                             :{BLACK}RAZ du terrain
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Augmenter la quantité de terre à modifier
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Diminuer la quantité de terre à modifier
-STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Générer une terre aléatoire
+STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Créer un monde aléatoire
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Réinitialiser le terrain
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Réinitialiser le terrain
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Carte d'altitude
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Utiliser une carte d'altitude
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Voulez-vous vraiment réinitialiser le terrain?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Créer le terrain
 STR_022F_TOWN_GENERATION                                        :{BLACK}Créer les villes
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Créer les industries
@@ -641,7 +647,7 @@ STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ne peut
 STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...Il n'y a plus d'emplacement sur la carte
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Augmenter la taille de la ville
 STR_023C_EXPAND                                                 :{BLACK}Agrandir
-STR_023D_RANDOM_TOWN                                            :{BLACK}Générer une ville
+STR_023D_RANDOM_TOWN                                            :{BLACK}Créer une ville
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Construire une ville à un emplacement aléatoire
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Créer les industries
 STR_0240_COAL_MINE                                              :{BLACK}Mine de Charbon
@@ -668,7 +674,7 @@ STR_0254_WATER_TOWER                                            :{BLACK}Château
 STR_0255_DIAMOND_MINE                                           :{BLACK}Mine de Diamant
 STR_0256_COPPER_ORE_MINE                                        :{BLACK}Mine de Cuivre
 STR_0257_COTTON_CANDY_FOREST                                    :{BLACK}Forêt de Barbe à Papa
-STR_0258_CANDY_FACTORY                                          :{BLACK}Usine de Sucreries
+STR_0258_CANDY_FACTORY                                          :{BLACK}Usine de Bonbons
 STR_0259_BATTERY_FARM                                           :{BLACK}Ferme de Batteries
 STR_025A_COLA_WELLS                                             :{BLACK}Puits de Cola
 STR_025B_TOY_SHOP                                               :{BLACK}Boutique de Jouets
@@ -718,7 +724,7 @@ STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...doit
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...Droit à un par ville seulement
 STR_0288_PLANT_TREES                                            :{BLACK}Semer des arbres
 STR_0289_PLACE_SIGN                                             :{BLACK}Placer un panneau
-STR_028A_RANDOM_TREES                                           :{BLACK}Générer des arbres
+STR_028A_RANDOM_TREES                                           :{BLACK}Ajouter des arbres aléatoires
 STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Semer des arbres sur l'ensemble du terrain de façon aléatoire
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Placer des endroits rocheux sur le terrain
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Placer un Phare
@@ -735,7 +741,7 @@ STR_0296_QUIT                                                   :Quitter
 STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Sauvegarder scénario, charger scénario, abandonner éditeur de scénario, quitter
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Charger Scénario
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Sauvegarder Scénario
-STR_029A_PLAY_SCENARIO                                          :{BLACK}Jouer Scénario
+STR_029A_PLAY_SCENARIO                                          :{BLACK}Jouer un Scénario
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Jouer une carte d'altitude
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Démarrer une nouvelle partie, utilisant une carte d'altitude comme paysage
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Voulez-vous vraiment quitter ce scénario ?
@@ -785,14 +791,14 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Nom de
 ############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Outil d'Inspection
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Inverser Console
+STR_CONSOLE_SETTING                                             :Afficher la console
 STR_02D7_SCREENSHOT_CTRL_S                                      :Copie d'écran (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Copie géante d'écran (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :À Propos de 'OpenTTD'
 ############ range ends here
 
-STR_02DB_OFF                                                    :{BLACK}Inactif
-STR_02DA_ON                                                     :{BLACK}Actif
+STR_02DB_OFF                                                    :{BLACK}Désactivé
+STR_02DA_ON                                                     :{BLACK}Activé
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Afficher les subventions
 STR_02DD_SUBSIDIES                                              :Subventions
 STR_02DE_MAP_OF_WORLD                                           :Carte du monde
@@ -806,7 +812,7 @@ STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copie l'
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Coller depuis la vue
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Colle l'emplacement de cette vue vers la vue globale
 
-STR_02E0_CURRENCY_UNITS                                         :{BLACK}Unité monétaire
+STR_02E0_CURRENCY_UNITS                                         :{BLACK}Devise monétaire
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
 STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Sélectionner l'unité monétaire
 STR_MEASURING_UNITS                                             :{BLACK}Unité de mesure
@@ -824,7 +830,7 @@ STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Sélecti
 STR_02F4_AUTOSAVE                                               :{BLACK}Sauvegarde automatique
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Sélectionner l'intervalle de temps entre les sauvegardes automatiques
-STR_02F7_OFF                                                    :Inactif
+STR_02F7_OFF                                                    :Désactivé
 STR_02F8_EVERY_3_MONTHS                                         :Tous les 3 mois
 STR_02F9_EVERY_6_MONTHS                                         :Tous les 6 mois
 STR_02FA_EVERY_12_MONTHS                                        :Tous les 12 mois
@@ -843,7 +849,7 @@ STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...peut
 STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Sélectionner l'environnement 'Tempéré'
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Sélectionner l'environnement 'Arctique'
 STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Sélectionner l'environnement 'Tropical'
-STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Sélectionner l'environnement 'Jouets'
+STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Sélectionner l'environnement 'Monde des jouets'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Financer la construction de nouvelles industries
 
 ############ range for menu starts
@@ -1002,15 +1008,15 @@ STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aéronef
 STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Le renouvellement automatique a échoué sur Train {COMMA} (limite d'argent)
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Le renouvellement automatique a échoué sur Véhicule {COMMA} (limite d'argent)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Le renouvellement automatique a échoué sur Navire {COMMA} (limite d'argent)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Le renouvellement automatique a échoué sur Aéronef {COMMA} (limite d'argent)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Le renouvellement automatique d'Aéronef {COMMA} a échoué (limite d'argent)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Train {COMMA} est trop long après remplacement
 
 STR_CONFIG_PATCHES                                              :{BLACK}Options Avancées
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurer les options avancées
 STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Options Avancées
 
-STR_CONFIG_PATCHES_OFF                                          :Inactif
-STR_CONFIG_PATCHES_ON                                           :Actif
+STR_CONFIG_PATCHES_OFF                                          :Désactivé
+STR_CONFIG_PATCHES_ON                                           :Activé
 STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afficher vitesse du véhicule dans la barre d'état: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Construction côtière et sur pentes: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Autoriser des zones de désserte plus réalistes : {ORANGE}{STRING}
@@ -1023,7 +1029,7 @@ STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Pleine
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Utiliser l'algorithme amélioré de chargement : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Charger les véhicules graduellement: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livrer cargaison seulement sur demande: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livrer la cargaison seulement sur demande: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permettre la construction de longs ponts: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permettre l'ordre d'aller au dépôt: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permettre la construction de ressources primaires: {ORANGE}{STRING}
@@ -1038,7 +1044,7 @@ STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Défile
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permettre la corruption de la municipalité: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Gares non uniformes: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nouvelle recherche de chemin globale (NPF, écrase NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Multiplieur de poids pour le fret (simule les trains lourds): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Multiplier le poid pour les trains fret (simule des trains lourds): {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Toujours permettre les petits aéroports: {ORANGE}{STRING}
 
@@ -1169,8 +1175,8 @@ STR_WAYPOINTNAME_CITY                                           :Point de contr
 STR_WAYPOINTNAME_CITY_SERIAL                                    :Point de contrôle {TOWN} #{COMMA}
 STR_LANDINFO_WAYPOINT                                           :Point de contrôle
 
-STR_WAYPOINT                                                    :{WHITE}Point de passage
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Choisir le type de point de passage
+STR_WAYPOINT                                                    :{WHITE}Point de contrôle
+STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Choisir le type de point de contrôle
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
@@ -1227,8 +1233,8 @@ STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Choisir
 STR_FAST_FORWARD                                                :{BLACK}Avance rapide du jeu
 STR_MESSAGE_HISTORY                                             :{WHITE}Historique des Messages
 STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Liste des messages récents
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Tous en sommaire
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Tous en complet
+STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Tous sommaires
+STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Tous complets
 
 STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Construire une mine de charbon
 STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Planter une forêt
@@ -1265,9 +1271,9 @@ STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Impossib
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Les intervalles de service sont en pourcentage: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Changer la production
 
-TEMP_AI_IN_PROGRESS                                             :{WHITE}Bienvenue dans la nouvelle IA, en élaboration. Copiez l'écran des problèmes et postez-le sur le forum. Bonne partie!
+TEMP_AI_IN_PROGRESS                                             :{WHITE}Bienvenue dans la nouvelle IA en élaboration. Si vous rencontrez des problèmes, postez-les sur le forum. Bonne partie!
 TEMP_AI_ACTIVATED                                               :{WHITE}Attention: cette nouvelle IA est en version alpha ! Pour le moment seuls les camions et les bus fonctionnent !
-TEMP_AI_MULTIPLAYER                                             :{WHITE}Attention: cette fonction est encore expérimentale. Veuillez en rapporter les problèmes à truelight@openttd.org.
+TEMP_AI_MULTIPLAYER                                             :{WHITE}Attention: cette fonction est encore expérimentale. Veuillez reporter tout problème à truelight@openttd.org.
 
 ############ network gui strings
 
@@ -1275,7 +1281,7 @@ STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multijou
 
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nom du joueur:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ceci est le nom avec lequel les autres joueurs pourront vous identifier
-STR_NETWORK_CONNECTION                                          :{BLACK}Connection :
+STR_NETWORK_CONNECTION                                          :{BLACK}Connexion :
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choisir entre un jeu Internet ou sur réseau local
 
 STR_NETWORK_START_SERVER                                        :{BLACK}Démarrer le serveur
@@ -1295,7 +1301,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}Saisir l
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO DE LA PARTIE
+STR_NETWORK_GAME_INFO                                           :{SILVER}INFOS SUR LE SERVEUR
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Langue:  {WHITE}{STRING}
@@ -1309,7 +1315,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Protég
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEUR HORS-LIGNE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEUR PLEIN
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSION NON CORRESPONDANTE
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF DIFFERENTS
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF REQUIS
 
 STR_NETWORK_JOIN_GAME                                           :{BLACK}Rejoindre la partie
 
@@ -1347,7 +1353,7 @@ STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{S
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max spectateurs:
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limiter le serveur à un certain nombre de spectateurs
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Langue parlée :
+STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Langue utilisée :
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Les autres joueurs sauront quelle langue est parlée sur ce serveur.
 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}Démarrer la partie
@@ -1356,13 +1362,13 @@ STR_NETWORK_LOAD_GAME                                           :{BLACK}Charger
 STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Continuer une partie multijoueur sauvée précédemment (attention à reprendre le même joueur)
 
 ############ Leave those lines in this order!!
-STR_NETWORK_LANG_ANY                                            :Peu importe
+STR_NETWORK_LANG_ANY                                            :Aucune
 STR_NETWORK_LANG_ENGLISH                                        :Anglais
 STR_NETWORK_LANG_GERMAN                                         :Allemand
 STR_NETWORK_LANG_FRENCH                                         :Français
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Chat d'avant jeu
+STR_NETWORK_GAME_LOBBY                                          :{WHITE}Préparation de la partie
 
 STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Se prépare à rejoindre :   {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Liste des compagnies présentes dans le jeu.  Vous pouvez soit en rejoindre une, soit en créer une.
@@ -1372,10 +1378,10 @@ STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Observer
 STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Permet d'observer une partie en tant que spectateur
 STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Rejoindre la compagnie
 STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Aider à gérer cette compagnie
-STR_NETWORK_REFRESH                                             :{BLACK}Rafraîchir
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Rafraîchir les infos à propos du serveur
+STR_NETWORK_REFRESH                                             :{BLACK}Actualiser
+STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualiser les infos sur le serveur
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO DE LA COMPAGNIE
+STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFOS SUR LA COMPAGNIE
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom de la compagnie :  {WHITE}{STRING}
 STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration :  {WHITE}{NUM}
@@ -1388,10 +1394,10 @@ STR_NETWORK_VEHICLES                                            :{SILVER}Véhicu
 STR_NETWORK_STATIONS                                            :{SILVER}Stations :  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Joueurs :  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Connection en cours...
+STR_NETWORK_CONNECTING                                          :{WHITE}Connexion en cours...
 
 ############ Leave those lines in this order!!
-STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connection en cours..
+STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connexion en cours..
 STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Autorisation en cours..
 STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Attente..
 STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Téléchargement de la carte..
@@ -1419,7 +1425,7 @@ STR_NETWORK_ERR_DESYNC                                          :{WHITE} La sync
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} La connection de la partie réseau a été perdue.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} La sauvegarde serveur n'a pas pu être chargée.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Le serveur n'a pas pu être démarré.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Connection échouée.
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Connexion échouée.
 STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connection #{NUM} a dépassé le temps d'attente.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Il y a eu une erreur de protocole et la connection est donc fermée.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La révision de ce client ne correspond pas à celle du serveur.
@@ -1620,7 +1626,7 @@ STR_201F_OLD_HOUSES                                             :Vieilles maison
 STR_2020_LOCAL_AUTHORITY                                        :{BLACK}Municipalité
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Afficher des informations sur la municipalité
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Municipalité de {TOWN}
-STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Notation de la compagnie de transport:
+STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Qualité de service des compagnies:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventions
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Offres de subvention pour le transport de:
@@ -1723,9 +1729,9 @@ STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Vous dev
 
 STR_3030_RENAME_STATION_LOADING                                 :Renommer la gare
 STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Impossible de renommer la gare...
-STR_3032_RATINGS                                                :{BLACK}Notations
+STR_3032_RATINGS                                                :{BLACK}Qualité
 STR_3033_ACCEPTS                                                :{BLACK}Accepte
-STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Notation du service de transport:
+STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Qualité du service de transport:
 
 ############ range for rating starts
 STR_3035_APPALLING                                              :Épouvantable
@@ -1802,7 +1808,7 @@ STR_4001_LOAD_GAME                                              :{WHITE}Charger
 STR_4002_SAVE                                                   :{BLACK}Sauvegarder
 STR_4003_DELETE                                                 :{BLACK}Supprimer
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Mo libres
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Mo libre{P "" s}
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Impossible d'accéder au disque
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}La sauvegarde à échoué
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Impossible de supprimer le fichier
@@ -1813,7 +1819,7 @@ STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Supprime
 STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Sauvegarde la partie avec le nom choisi
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Choix du type de partie
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Choisir un scénario (vert), une partie préparée (bleu), ou une partie aléatoire
-STR_4010_GENERATE_RANDOM_NEW_GAME                               :Générer une partie aléatoirement
+STR_4010_GENERATE_RANDOM_NEW_GAME                               :Créer une partie aléatoirement
 STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Charger une carte d'altitude
 
 ##id 0x4800
@@ -1846,7 +1852,7 @@ STR_4819_FACTORY                                                :{G=f}Usine
 STR_481A_FARM                                                   :{G=f}Ferme
 STR_481B_LUMBER_MILL                                            :{G=f}Scierie
 STR_481C_COTTON_CANDY_FOREST                                    :{G=f}Forêt de Barbe à Papa
-STR_481D_CANDY_FACTORY                                          :{G=f}Usine de Sucreries
+STR_481D_CANDY_FACTORY                                          :{G=f}Usine de Bonbons
 STR_481E_BATTERY_FARM                                           :{G=f}Ferme de Batteries
 STR_481F_COLA_WELLS                                             :{G=m}Puits de Cola
 STR_4820_TOY_SHOP                                               :{G=f}Boutique de Jouets
@@ -1992,15 +1998,15 @@ STR_6804_CUSTOM                                                 :{BLACK}Personna
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nombre maximum de compétiteurs: {ORANGE}{COMMA}
-STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Arrivée des compétiteurs: {ORANGE}{STRING}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nombre maximal de concurents: {ORANGE}{COMMA}
+STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Arrivée des concurents: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Nombre de villes: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Nombre d'industries: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Prêt initial maximum: {ORANGE}{CURRENCY}
 STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taux d'interêt initial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Coûts d'entretien: {ORANGE}{STRING}
-STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Vitesse de développement des compétiteurs: {ORANGE}{STRING}
-STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligence des compétiteurs: {ORANGE}{STRING}
+STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Vitesse de développement des concurents: {ORANGE}{STRING}
+STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Intelligence des concurents: {ORANGE}{STRING}
 STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Pannes des véhicules: {ORANGE}{STRING}
 STR_680F_SUBSIDY_MULTIPLIER                                     :{LTBLUE}Multiplicateur de subvention: {ORANGE}{STRING}
 STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Coût des constructions: {ORANGE}{STRING}
@@ -2009,7 +2015,7 @@ STR_6812_QUANTITY_OF_SEA_LAKES                                  :{LTBLUE}Quantit
 STR_6813_ECONOMY                                                :{LTBLUE}Economie: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Demi-tour des trains: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Désastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Attitude de l'hotel de ville face au repaysagement : {ORANGE}{STRING}
+STR_16816_CITY_APPROVAL                                         :{LTBLUE}Attitude de la municipalité face au repaysagement : {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
 STR_26816_NONE                                                  :Aucune
@@ -2046,8 +2052,8 @@ STR_6832_6_MONTHS_AFTER_PLAYER                                  :6 mois après l
 STR_6833_9_MONTHS_AFTER_PLAYER                                  :9 mois après le joueur
 STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :À la fin de la ligne et aux gares
 STR_6835_AT_END_OF_LINE_ONLY                                    :A la fin de la ligne seulement
-STR_6836_OFF                                                    :Inactif
-STR_6837_ON                                                     :Actif
+STR_6836_OFF                                                    :Désactivé
+STR_6837_ON                                                     :Activé
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Afficher le tableau des scores
 STR_6839_PERMISSIVE                                             :Laxiste
 STR_683A_TOLERANT                                               :Tolérant
@@ -2145,7 +2151,7 @@ STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT
 STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Nous sommes à la recherche d'un acheteur pour notre compagnie{}{}Voulez vous acheter {COMPANY} pour {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Banqueroute!
 STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} à été fermée par ses créanciers et tous ses actifs vendus!
-STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Fondation d'une nouvelle compagnie de transport!
+STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nouvelle compagnie de transport!
 STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} commence à construire près de {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Impossible d'acheter la compagnie...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Valeur des marchandises
@@ -2483,7 +2489,7 @@ STR_8107_MAGLEV_LOCOMOTIVE                                      :{G=f}locomotive
 
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Dépôt ferroviaire
-STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Arrivée du premier train à {STATION}!
+STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent{}l'arrivée du premier train à {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Détails)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train présent
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2615,7 +2621,7 @@ STR_8863_CRASHED                                                :{RED}Crashé!
 STR_8865_NAME_TRAIN                                             :{WHITE}Renommer le train
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Impossible de renommer le train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renommer le train
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tragédie ferroviaire!{}{COMMA} mort{P "" s} brûlé{P "" s} vif{P "" s} dans la collision
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident ferroviaire!{}{COMMA} mort{P "" s} brûlé{P "" s} vif{P "" s} dans la collision
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossible de faire faire demi-tour...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renommer le type de train
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossible de renommer le type de train...
@@ -2677,8 +2683,8 @@ STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Impossib
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Renommer le véhicule
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier bus arrive à {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier camion arrive à {STATION}!
-STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Tragédie routière!{}Un automobiliste meurt brûlé vif lors d'une collision avec un train
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Tragédie routière!{}{COMMA} morts, brûlés vifs lors d'une collision avec un train
+STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident routier!{}Un automobiliste meurt brûlé vif lors d'une collision avec un train
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident routier!{}{COMMA} mort{P "" s} lors d'une collision avec un train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossible de faire faire demi-tour au véhicule...
 STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Impossible de faire faire demi-tour aux unités multiples
 STR_9034_RENAME                                                 :{BLACK}Renommer
@@ -2748,7 +2754,7 @@ STR_982F_NAME_SHIP                                              :{BLACK}Nommer n
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nommer navire
 STR_9832_CAN_T_NAME_SHIP                                        :{WHITE}Impossible de nommer le navire...
-STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Arrivée du premier navire à {STATION}!
+STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent {}l'arrivée du premier navire à {STATION}!
 STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Placer une bouée, peut servir de guide aux navires
 STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Impossible de placer une bouée ici...
 STR_9836_RENAME                                                 :{BLACK}Renommer
@@ -2785,7 +2791,7 @@ STR_A00C_DETAILS                                                :{WHITE}{VEHICLE
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 STR_A00E_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profits cette année: {LTBLUE}{CURRENCY} (l'an dernier: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%   {BLACK}Cafouillages depuis le dernier service: {LTBLUE}{COMMA}
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%   {BLACK}Pannes depuis le dernier service: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Impossible d'envoyer l'aéronef au hangar...
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}En route pour le hangar de {STATION}
@@ -2822,9 +2828,9 @@ STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prix: {C
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nommer l'aéronef
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Impossible de nommer l'aéronef...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nommer l'aéronef
-STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Arrivée du premier aéronef à {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tragédie aérienne!{}{COMMA} morts brûlés vifs à {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Tragédie aérienne !{}L'aéronef n'avait plus de carburant, {COMMA} passagers meurent dans l'incendie!
+STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent{}l'arrivée du premier aéronef à {STATION}!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident d'avion!{}{COMMA} mort{P "" s} dans un crash à {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident d'avion!{}L'aéronef n'avait plus de carburant, {COMMA} passager{P "" s} meurent dans le crash!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renommer
 STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Renommer type d'aéronef
@@ -2848,7 +2854,7 @@ STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Usine détruite dans des circonstances suspectes près de {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un 'OVNI' attérit près de {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Affaissement d'une veine de charbon entraîne la desctruction de la mine de {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inondations!{}Au moins {COMMA} présumés manquants ou morts après des inondations meurtrières!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inondations!{}Au moins {COMMA} présumé{P "" s} manquant{P "" s} ou mort{P "" s} après des inondations meurtrières!
 
 STR_BRIBE_FAILED                                                :{WHITE}Votre tentative de corruption à été
 STR_BRIBE_FAILED_2                                              :{WHITE}révélée à la presse par un journaliste régional.
@@ -2907,10 +2913,10 @@ STR_NEWGRF_PARAMETER                                            :{BLACK}Paramèt
 STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Entrer les paramètres NewGRF
 STR_NEWGRF_NO_INFO                                              :{BLACK}Pas d'informations disponibles
 
-STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Fichier NewGRF disponibles
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Fichiers NewGRF disponibles
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Ajouter à la sélection
 STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Ajouter le fichier NewGRF sélectionné à votre configuration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Re-scanner les fichiers
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Actualiser la liste
 STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Mettre à jour la liste des fichiers NewGRF disponibles
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ajout impossible: GRF ID en double
 
@@ -3054,22 +3060,22 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Tous sauf {GOLD
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Générer
+STR_GENERATE                                                    :{WHITE}Créer
 STR_RANDOM                                                      :{BLACK}Nouvelle Amorce
-STR_RANDOM_HELP                                                 :{BLACK}Modifer l'amorce utilisée pour la Génération du Terrain
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Génération du terrain
+STR_RANDOM_HELP                                                 :{BLACK}Modifier l'amorce utilisée pour la Création du Terrain
+STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Création du monde
 STR_RANDOM_SEED                                                 :{BLACK}Amorce :
 STR_RANDOM_SEED_HELP                                            :{BLACK}Cliquer pour saisir une amorce
 STR_LAND_GENERATOR                                              :{BLACK}Générateur :
-STR_TREE_PLACER                                                 :{BLACK}Placement arbres :
+STR_TREE_PLACER                                                 :{BLACK}Ajout des arbres :
 STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotation de la carte d'altitude :
 STR_TERRAIN_TYPE                                                :{BLACK}Type de terrain :
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Niveau de la mer :
 STR_SMOOTHNESS                                                  :{BLACK}Lissage :
 STR_SNOW_LINE_HEIGHT                                            :{BLACK}Alt. d'enneigement :
 STR_DATE                                                        :{BLACK}Date:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}No. de villes :
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. d'industries :
+STR_NUMBER_OF_TOWNS                                             :{BLACK}Nb. de villes :
+STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Nb. d'industries :
 STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
 STR_SNOW_LINE_UP                                                :{BLACK}Augmenter l'altitude d'enneigement
 STR_SNOW_LINE_DOWN                                              :{BLACK}Baisser l'altitude d'enneigement
@@ -3080,22 +3086,22 @@ STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Trop re
 STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
 STR_HEIGHTMAP_NAME                                              :{BLACK}Nom de la carte d'altitude :
 STR_HEIGHTMAP_SIZE                                              :{BLACK}Taille: {ORANGE}{NUM} x {NUM}
-STR_GENERATION_WORLD                                            :{WHITE}Génération du terrain...
+STR_GENERATION_WORLD                                            :{WHITE}Création du monde...
 STR_GENERATION_ABORT                                            :{BLACK}Annuler
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Annuler la génération du terrain
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Voulez-vous vraiment annuler la génération ?
 STR_PROGRESS                                                    :{WHITE}{NUM}% terminé
 STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Génération du terrain
-STR_TREE_GENERATION                                             :{BLACK}Génération des arbres
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Génération des non-déplacables
-STR_CLEARING_TILES                                              :{BLACK}Génération des zones rugueuses et pierreuses
+STR_WORLD_GENERATION                                            :{BLACK}Création du monde
+STR_TREE_GENERATION                                             :{BLACK}Création des arbres
+STR_UNMOVABLE_GENERATION                                        :{BLACK}Création des non-déplacables
+STR_CLEARING_TILES                                              :{BLACK}Création des zones rugueuses et rocheuses
 STR_SETTINGUP_GAME                                              :{BLACK}Configuration du jeu
 STR_PREPARING_TILELOOP                                          :{BLACK}Rafraîchissement du terrain
 STR_PREPARING_GAME                                              :{BLACK}Préparation du jeu
 STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Cette action a modifié le niveau de difficulté en personnalisé
 STR_SE_FLAT_WORLD                                               :{WHITE}Terrain plat
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Générer un terrain plat
+STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Créer un monde plat
 STR_SE_RANDOM_LAND                                              :{WHITE}Terrain aléatoire
 STR_SE_NEW_WORLD                                                :{BLACK}Nouveau scénario
 STR_SE_CAPTION                                                  :{WHITE}Type de scénario
@@ -3120,7 +3126,7 @@ STR_HELISTATION                                                 :{BLACK}Hélista
 
 STR_SMALL_AIRPORTS                                              :{BLACK}Petits aéroports
 STR_LARGE_AIRPORTS                                              :{BLACK}Grands aéroports
-STR_HUB_AIRPORTS                                                :{BLACK}Aéroports Internodaux
+STR_HUB_AIRPORTS                                                :{BLACK}Aéroports Internationaux
 STR_HELIPORTS                                                   :{BLACK}Héliports
 
 ############ Tooltip measurment

lang/galician.txt

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

lang/german.txt

@@ -615,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} erreicht '{STRING}' Status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} von {COMPANY} erreicht '{STRING}' Status!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Szenario erstellen
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Szenario bearbeiten
 STR_0223_LAND_GENERATION                                        :{WHITE}Land erstellen
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Zufälliges Land
+STR_0227_RESET_LAND                                             :{BLACK}Land wiederherstellen
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Landfläche zum Anheben / Absenken vergrößern
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Landfläche zum Anheben / Absenken verkleinern
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Erzeuge Land durch Zufall
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Landfläche wiederherstellen
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Landfläche wiederherstellen
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Reliefkarte nutzen
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Reliefkarte nutzen
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Bist du sicher, dass die Landschaft zurückgesetzt werden soll?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landfläche erzeugen
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stadt errichten
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrie errichten
@@ -2953,6 +2959,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Zeige al
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}Verkaufen
+STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Du bist dabei alle Fahrzeuge im Depot zu verkaufen
+STR_ARE_YOU_SURE                                                :{BLACK}Bist du sicher?
+
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Bestätige bitte dass du alle Züge im Depot verkaufen möchtest
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Bestätige bitte dass du alle Fahrzeuge im Depot verkaufen möchtest
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Bestätige bitte dass du alle Schiffe in der Werft verkaufen möchtest
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Bestätige bitte dass du alle Flugzeuge im Hangar verkaufen möchtest
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Verkaufe nicht alle Züge im Depot
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Verkaufe nicht alle Fahrzeuge im Depot
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Verkaufe nicht alle Schiffe in der Werft
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Verkaufe nicht alle Flugzeuge im Hangar
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Verkaufe alle Züge im Depot
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Verkaufe alle Fahrzeuge im Depot
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Verkaufe alle Schiffe in der Werft

lang/hungarian.txt

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

lang/icelandic.txt

@@ -155,6 +155,7 @@ STR_00B0_MAP                                                    :{WHITE}Kort - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Stillingar
 STR_00B2_MESSAGE                                                :{YELLOW}Skilaboð
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Skilaboð frá {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varúð!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Get ekki gert þetta....
 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
@@ -287,12 +288,15 @@ STR_013D_INFORMATION                                            :{BLACK}Upplýsi
 STR_013E_CAPACITIES                                             :{BLACK}Burðargeta
 STR_013E_TOTAL_CARGO                                            :{BLACK}Heildarfarmur
 STR_013F_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Burðargeta: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Farmur alls (burðargeta) þessarar lestar:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nýr leikur
 STR_0141_LOAD_GAME                                              :{BLACK}Opna leik
 STR_SINGLE_PLAYER                                               :{BLACK}Einspilun
 STR_MULTIPLAYER                                                 :{BLACK}Fjölspilun
+STR_SCENARIO_EDITOR                                             :{BLACK}Landslagsgerð
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -317,8 +321,8 @@ STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mílur/
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/klst
 STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s
 
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hestöfl
-STR_UNITS_POWER_METRIC                                          :{COMMA}hestöfl
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hö.
+STR_UNITS_POWER_METRIC                                          :{COMMA}hö.
 STR_UNITS_POWER_SI                                              :{COMMA}kW
 
 STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}tonn
@@ -382,10 +386,29 @@ STR_SORT_BY_VALUE                                               :Virði
 STR_SORT_BY_FACILITY                                            :Tegund stöðvar
 STR_SORT_BY_WAITING                                             :Verðgildi farms á stöð
 STR_SORT_BY_RATING_MAX                                          :Flutningur farms
+STR_ENGINE_SORT_ENGINE_ID                                       :Einkenni (hefðbundin röðun)
+STR_ENGINE_SORT_COST                                            :Kostnaður
+STR_ENGINE_SORT_POWER                                           :Afl
+STR_ENGINE_SORT_INTRO_DATE                                      :Árgerð
+STR_ENGINE_SORT_RUNNING_COST                                    :Rekstrarkostnaður
+STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Afl/Rekstrarkostnaður
+STR_ENGINE_SORT_CARGO_CAPACITY                                  :Burðargeta
 STR_NO_WAITING_CARGO                                            :{BLACK}Enginn farmur bíður
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Velja allar gerðir
 STR_SELECT_ALL_TYPES                                            :{BLACK}Velja allar tegundir farms (einnig þær sem ekki bíða)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Lestaúrval
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Bifreiðaúrval
+STR_AVAILABLE_SHIPS                                             :{BLACK}Skipaúrval
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Flugvélaúrval
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Skoða lista yfir tegundir í boði af þessari gerð farartækja
+STR_MANAGE_LIST                                                 :{BLACK}Stýra lista
+STR_MANAGE_LIST_TIP                                             :{BLACK}Senda boð til allra farartækja á listanum
 STR_REPLACE_VEHICLES                                            :Skipta út vögnum
+STR_SEND_TRAIN_TO_DEPOT                                         :Senda í skýli
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Senda í skýli
+STR_SEND_SHIP_TO_DEPOT                                          :Senda í slipp
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Senda í skýli
+STR_SEND_FOR_SERVICING                                          :Senda í skoðun
 
 ############ range for months starts
 STR_0162_JAN                                                    :Jan
@@ -592,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} öðlast '{STRING}' titil!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} úr {COMPANY} öðlast '{STRING}' titil!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Búa til kort
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Kortagerð
 STR_0223_LAND_GENERATION                                        :{WHITE}Landslagsgerð
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Handahófskennt land
+STR_0227_RESET_LAND                                             :{BLACK}Eyða landi
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Stækka svæði til að lækka/hækka
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Minnka svæði til að lækka/hækka
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Mynda til land af handahófi
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Eyða landi
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Eyða landi
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Nota hæðarkort
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Nota hæðarkort
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Ertu viss um að þú viljir eyða landinu?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landslagsgerð
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bæjargerð
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Iðnaðargerð
@@ -713,6 +742,8 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Vista ko
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Opna kort
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Vista kort
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Spila kort
+STR_PLAY_HEIGHTMAP                                              :{BLACK}Spila á hæðarkorti
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Hefja nýjan leik byggðan á hæðarkorti
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Ertu viss um að þú viljir hætta í þessu korti ?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Hætta í kortagerð
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...aðeins hægt að byggja í bæjum með fleiri en 1200 íbúum
@@ -745,7 +776,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 STR_02C3_GAME_OPTIONS                                           :Stillingar
 STR_02C5_DIFFICULTY_SETTINGS                                    :Erfiðleikastig
 STR_02C7_CONFIG_PATCHES                                         :Viðbætur
-STR_NEWGRF_SETTINGS                                             :Nýgrf stillingar
+STR_NEWGRF_SETTINGS                                             :NewGRF stillingar
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Bæjarnöfn sýnd
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Stöðvarnöfn sýnd
@@ -817,7 +848,7 @@ STR_0307_OPENTTD                                                :{WHITE}OpenTTD
 STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...aðeins hægt að byggja í bæjum
 STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Temprað landslag
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Heimskautalandslag
-STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Velja eyðimerkurlandslag
+STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Eyðimerkurlandslag
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Leikfangalandslag
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fjármagna byggingu nýs iðnaðars
 
@@ -866,6 +897,7 @@ STR_TOWNNAME_SWISS                                              :Svissnesk
 STR_TOWNNAME_DANISH                                             :Dönsk
 STR_TOWNNAME_TURKISH                                            :Tyrknesk
 STR_TOWNNAME_ITALIAN                                            :Ítölsk
+STR_TOWNNAME_CATALAN                                            :Katalónsk
 ############ end of townname region
 
 STR_CURR_GBP                                                    :Pund (£)
@@ -890,7 +922,11 @@ STR_CURR_NOK                                                    :Norsk króna (N
 STR_CURR_PLN                                                    :Pólsk zloty (PLN)
 STR_CURR_ROL                                                    :Rúmensk leu (ROL)
 STR_CURR_RUR                                                    :Rússnesk rúbla (RUR)
+STR_CURR_SIT                                                    :Slóvensk tolar (SIT)
 STR_CURR_SEK                                                    :Sænsk króna (SEK)
+STR_CURR_YTL                                                    :Tyrknesk líra (YTL)
+STR_CURR_SKK                                                    :Slóvakísk kórúna (SKK)
+STR_CURR_BRR                                                    :Brasilísk ríla (BRL)
 
 STR_CURR_CUSTOM                                                 :Sérvalið...
 
@@ -981,16 +1017,17 @@ STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Viðbæt
 
 STR_CONFIG_PATCHES_OFF                                          :Nei
 STR_CONFIG_PATCHES_ON                                           :Já
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Sýna hraða farartækis í upplýsingaslá: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Sýna hraða farartækis á upplýsingaslá: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Leyfilegt að byggja í halla og á strönd: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Raunverulegri stærð svæðis sem stöðvar ná yfir: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Leyfa meiri eyðingu vega, brúa, gangna o.s.frv. í eigu bæjar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leyfa byggingu mjög langra lesta: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leyfa mjög langar lestir: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Raunveruleg hröðun lesta: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Banna lestum og skipum að taka 90°  beygjur: {ORANGE}{STRING} {LTBLUE} (þarfnast NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Sameina lestarstöðvar sem byggðar eru samsíða: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Yfirgefa stöð þegar einn farmur er fullfermdur, ef valið er 'fullferma': {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}'Fullferma' á við um frysta farm sem fullfermist: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Nota endurbættan algóriþma við hleðslu: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Ferma farartæki smám saman: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Verðbólga: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aðeins afhlaða farmi á stöðvum þar sem er eftirspurn: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Leyfa byggingu mjög langra brúa: {ORANGE}{STRING}
@@ -998,27 +1035,29 @@ STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Skýli
 STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Leyfa byggingu hráefnaframleiðsluiðnaðar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Leyfa marga svipaða iðnaði í sama bæ: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Má byggja iðnaði af sömu gerð nálægt hvor öðrum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Sýna alltaf fulla dagsetningu í upplýsingaslá: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Sýna alltaf fulla dagsetningu á upplýsingaslá: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sýna umferðarljós akstursmegin: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Sýna fjármálaglugga í lok árs: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch samhæfð meðhöndlun stansleysu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Bifreiðir fara í biðraðir (með stórvægilegum aukaverkunum): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Bifreiðir bíða í röð (með skömmtunaráhrifum): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Færa sjónarhorn þegar músin nálgast brún gluggans: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Leyfilegt að múta bæjaryfirvöldum: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Órétthyrndar lestarstöðvar leyfðar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nýtt heildar-leiðarkerfi (NPF, yfirtekur NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nýtt alhliða leiðsögukerfi (NPF, yfirtekur NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Margfalda þyngd farms til að líkja eftir þyngri lestum: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltaf leyfa litla flugvelli: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Endurskoða skipanir farartækis: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Gera viðvart ef lest týnist: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Fara yfir áætlanir farartækja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nei
-STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :já, en útiloka kyrrstæð farartæki
+STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :allra nema kyrrstæðra farartækja
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :allra farartækja
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Gera viðvart ef lest skilar tapi: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Gera viðvart ef lest skilar ekki hagnaði: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Farartæki úreldast aldrei: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Uppfæra faratæki sjálfvirkt þegar það eldist
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Uppfæra farartæki sjálfkrafa {ORANGE}{STRING}{LTBLUE} mánuðum fyrir/eftir hámarksaldur þess
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Lægsta upphæð peninga sem þörf er á fyrir sjálfvirka uppfæringu: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Uppfæra faratæki sjálfvirkt þegar þau eldast
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Sjálfvirk uppfæring {ORANGE}{STRING}{LTBLUE} {P mánuði mánuðum} fyrir/eftir hámarksaldur
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Lágmarks bankainnistæða fyrir sjálfvirka uppfæringu: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Birtingartími villuskilaboða: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Sýna íbúafjölda í bæjarmerki: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Ósýnileg tré (með gagnsæjum byggingum): {ORANGE}{STRING}
@@ -1026,15 +1065,32 @@ STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Ósýni
 STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Landslagsmótun: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Upphafleg
 STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Hámarfjarlægð olíuborpalla frá brún korts {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Hæð snjólínu: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Hrjúfleiki landslags (TerraGenesis stilling) : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Mjög slétt
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Slétt
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH                   :Hrjúft
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Mjög hrjúft
+STR_CONFIG_PATCHES_TREE_PLACER                                  :{LTBLUE}Staðsetning trjáa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TREE_PLACER_NONE                             :Hvergi
+STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL                         :Venjulega
+STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED                         :Nýstárlega
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION                           :{LTBLUE}Snúningur hæðakorts: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Rangsælis
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :Réttsælis
+STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Hæð jafnslétts lands yfir sjávarmáli: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Dreyfing stöðva mest: {ORANGE}{STRING} {RED}Ath.: Há stilling hægir á leiknum
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Skoða þyrlur sjálfvirkt á þyrlupalli: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Opna landmótunarglugga samhliða lestar-, vegar-, hafnar- og flugvallarframkvæmdarglugga: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Opna landmótunarglugga samhliða öðrum framkvæmdum: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Færa sjónarhorn í öfuga átt miðað við mús: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Sýna mælstiku við byggingu: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Sýna auka litastillingar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES_NONE                                :Aldrei
+STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Eigin fyrirtækis
+STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Allra fyrirtækja
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Nota liðsspjall með <ENTER>: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Lestir á leikmann mest: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Bifreiðir á leikmann mest: {ORANGE}{STRING}
@@ -1049,18 +1105,19 @@ STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Útilok
 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Virkja nýja gervigreind (alfa): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Leyfa gervigreind í fjölspilunarleik (á tilraunastigi): {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Bið milli skoðana á lestum: {ORANGE}{STRING} dagar/%
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Bið milli skoðana á lestum: {ORANGE}óvirkt
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Bið milli skoðana á bílum: {ORANGE}{STRING} dagar/%
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Bið milli skoðana á bílum: {ORANGE}óvrikt
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Bið milli skoðana á flugvélum: {ORANGE}{STRING} dagar/%
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Bið milli skoðana á flugvélum: {ORANGE}óvrikt
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Bið milli skoðana á skipum: {ORANGE}{STRING} dagar/%
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Bið milli skoðana á skipum: {ORANGE}óvirkt
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Hætta skoðunum þegar bilanir eru afvirktar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Tími milli viðhalds lesta: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Tími milli viðhalds lesta: {ORANGE}óvirkt
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Tími milli viðhalds bifreiða: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Tími milli viðhalds bifreiða: {ORANGE}óvrikt
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Tími milli viðhalds flugvéla: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Tími milli viðhalds flugvéla: {ORANGE}óvrikt
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Tími milli viðhalds skipa: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Tími milli viðhalds skipa: {ORANGE}óvirkt
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Leggja niður viðhald þegar bilanir eru stilltar af: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Leyfa hraðatakmarkanir vagna: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Ekki nota rafknúnar lestir: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Fréttir birtast í lit: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Fréttir byrja að birtast í lit árið: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Upphafsár: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Enda leik árið: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Virkja jafnan efnahag (fleiri og minni breytingar)
@@ -1068,7 +1125,7 @@ STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Leyfa h
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Þegar dregið er, setja skilti á: {ORANGE}{STRING} hvern reit
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Staðsetning tækjasláar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Vinstri
-STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Miðjað
+STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Miðja
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Hægri
 STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Gluggar smella saman við: {ORANGE}{STRING} punkta radíus
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Gluggar smella: {ORANGE}ekki saman
@@ -1164,7 +1221,7 @@ STR_LANDINFO_COORDS                                             :{BLACK}Hnit: {L
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Get ekki fjarlægt hluta af stöð...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Get ekki breytt lestarteini...
-STR_CONVERT_RAIL_TIP                                            :{BLACK}Breyta/Uppfæra gerð af lestarteini
+STR_CONVERT_RAIL_TIP                                            :{BLACK}Breyta/uppfæra gerð lestarteins
 
 STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Dragðu eimreið hingað til að selja alla lestina
 
@@ -1211,7 +1268,7 @@ STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Breyta l
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu hvernig farm lestin á að flytja
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Breyta lest svo hún flytji valinn farm
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Get ekki breytt lest...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Bil milli skoðana er í hundraðshlutum: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Tími milli viðhalds farartækja sýndur í hundraðshlutum: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Breyta framleiðslu
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Velkomin/n í nýju gervigreindina, verk í vinnslu. Þú mátt búast við vandamálum, og þegar þau koma upp skaltu taktu skjámynd þegar og senda á spjallborðið. Njóttu!
@@ -1258,6 +1315,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Varið
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}ÞJÓNN AFTENGDUR
 STR_NETWORK_SERVER_FULL                                         :{SILVER}ÞJÓNN FULLUR
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ÚTGÁFA STEMMIR EKKI
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MISRÆMI
 
 STR_NETWORK_JOIN_GAME                                           :{BLACK}Tengjast leik
 
@@ -1362,6 +1420,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Listi yf
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Enginn netbúnaður fannst eða vistþýtt án ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Fann enga netleiki
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Þjóninn svaraði ekki fyrirspurninni
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Gat ekki tengst vegna NewGRF misræmis
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Samstilling netleiks mistókst.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Tenging við netleik glataðist.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Gat ekki hlaðið vistuðum leik af þjóni.
@@ -1383,6 +1442,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :samstillingarvi
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :gat ekki opnað kort
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :tenging rofnaði
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :samskiptavilla
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF misræmi
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Ekki leyfilegt
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :tók á móti undarlegum pakka
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :röng útgáfa
@@ -1410,6 +1470,7 @@ STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Verið
 
 STR_NETWORK_SERVER                                              :Þjónn
 STR_NETWORK_CLIENT                                              :Notandi
+STR_NETWORK_SPECTATORS                                          :Áhorfendur
 
 STR_NETWORK_CLIENTLIST_NONE                                     :(ekkert)
 STR_NETWORK_CLIENTLIST_KICK                                     :Sparka
@@ -1430,6 +1491,10 @@ STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Breidd
 
 ##### PNG-MAP-Loader
 
+STR_PNGMAP_ERROR                                                :{WHITE}Get ekki hlaðið landslagi úr PNG skrá...
+STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...skrá ekki til staðar.
+STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...gat ekki meðhöndlað myndsniðið. 8 eða 24 bita PNG myndir nauðsynlegar.
+STR_PNGMAP_ERR_MISC                                             :{WHITE}...eitthvað fór úrskeiðis (mögulega gölluð skrá).
 
 STR_BMPMAP_ERROR                                                :{WHITE}Get ekki hlaðið landslagi úr BMP skrá...
 STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... gat ekki breytt myndsniði.
@@ -1728,13 +1793,13 @@ STR_STAT_CLASS_DFLT                                             :Sjálfgefin st
 STR_STAT_CLASS_WAYP                                             :Millistöð
 
 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Staða skipaslipps
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Staða slipps
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...verður að byggjast á vatni
-STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Get ekki byggt skipaslipp hér...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Velja stöðu skipaslipps
+STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Get ekki reist slipp hér...
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Velja stöðu slipps
 STR_3804_WATER                                                  :Vatn
 STR_3805_COAST_OR_RIVERBANK                                     :Strönd
-STR_3806_SHIP_DEPOT                                             :Skipaslippur
+STR_3806_SHIP_DEPOT                                             :Slippur
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Get ekki byggt á vatni
 
 ##id 0x4000
@@ -1954,9 +2019,9 @@ STR_16816_CITY_APPROVAL                                         :{LTBLUE}Afstað
 ############ range for difficulty settings ends
 
 STR_26816_NONE                                                  :Engin
-STR_6816_LOW                                                    :Lág
-STR_6817_NORMAL                                                 :Venjuleg
-STR_6818_HIGH                                                   :Há
+STR_6816_LOW                                                    :Fáir
+STR_6817_NORMAL                                                 :Miðlungs
+STR_6818_HIGH                                                   :Margir
 STR_6819                                                        :{BLACK}{SMALLLEFTARROW}
 STR_681A                                                        :{BLACK}{SMALLRIGHTARROW}
 STR_681B_VERY_SLOW                                              :Mjög hægt
@@ -1964,10 +2029,10 @@ STR_681C_SLOW                                                   :Hægt
 STR_681D_MEDIUM                                                 :Miðlungs
 STR_681E_FAST                                                   :Hratt
 STR_681F_VERY_FAST                                              :Mjög hratt
-STR_VERY_LOW                                                    :Mjög lágt
-STR_6820_LOW                                                    :Lágt
+STR_VERY_LOW                                                    :Mjög lítið
+STR_6820_LOW                                                    :Lítið
 STR_6821_MEDIUM                                                 :Miðlungs
-STR_6822_HIGH                                                   :Hátt
+STR_6822_HIGH                                                   :Mikið
 STR_6823_NONE                                                   :Ekkert
 STR_6824_REDUCED                                                :Minnkað
 STR_6825_NORMAL                                                 :Venjulegt
@@ -1975,8 +2040,8 @@ STR_6826_X1_5                                                   :x1.5
 STR_6827_X2                                                     :x2
 STR_6828_X3                                                     :x3
 STR_6829_X4                                                     :x4
-STR_682A_VERY_FLAT                                              :Mjög flatt
-STR_682B_FLAT                                                   :Flatt
+STR_682A_VERY_FLAT                                              :Mjög slétt
+STR_682B_FLAT                                                   :Slétt
 STR_682C_HILLY                                                  :Hæðótt
 STR_682D_MOUNTAINOUS                                            :Fjallótt
 STR_682E_STEADY                                                 :Stöðugur
@@ -2127,7 +2192,34 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} hefur verið yfirtekið af {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
 
+STR_LIVERY_DEFAULT                                              :Aðal litaskema
+STR_LIVERY_STEAM                                                :Gufuvagnar
+STR_LIVERY_DIESEL                                               :Díselvagnar
+STR_LIVERY_ELECTRIC                                             :Rafmagnsvagnar
+STR_LIVERY_MONORAIL                                             :Einteingungsvagnar
+STR_LIVERY_MAGLEV                                               :Segulsvifvagnar
+STR_LIVERY_DMU                                                  :Fjölvagna dísellest
+STR_LIVERY_EMU                                                  :Fjölvagna rafmagnslest
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :Farþegavagn (Gufu)
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Farþegavagn (Dísel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Farþegavagn (Rafmagns)
+STR_LIVERY_FREIGHT_WAGON                                        :Flutningsvagnar
+STR_LIVERY_BUS                                                  :Strætó
+STR_LIVERY_TRUCK                                                :Flutningabílar
+STR_LIVERY_PASSENGER_SHIP                                       :Farþegaferjur
+STR_LIVERY_FREIGHT_SHIP                                         :Flutningsskip
+STR_LIVERY_HELICOPTER                                           :Þyrlur
+STR_LIVERY_SMALL_PLANE                                          :Flugvélar
+STR_LIVERY_LARGE_PLANE                                          :Þotur
 
+STR_LIVERY_GENERAL_TIP                                          :{BLACK}Grunnlitur fyrirtækis
+STR_LIVERY_TRAIN_TIP                                            :{BLACK}Litaskema lesta
+STR_LIVERY_ROADVEH_TIP                                          :{BLACK}Litaskema bifreiða
+STR_LIVERY_SHIP_TIP                                             :{BLACK}Litaskema skipa
+STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Litaskema flugvéla
+STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Veldu lit fyrir valda hluti á listanum
+STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Veldu seinni lit fyrir valda hluti á listanum
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Veldu hluti til að breyta lit á, CTRL-smelltu til að velja marga saman. Smelltu í reitinn til að virkja valinn lit.
 
 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Gufu)
@@ -2421,22 +2513,28 @@ STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Viðgerð viðs
 
 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Á leið í {TOWN} Lestar Byggingu
 STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Á leið í {TOWN} Lestar Byggingu, {VELOCITY}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Viðhald í {TOWN} lestaskýli
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Viðhald í {TOWN} lestaskýli, {VELOCITY}
 
 STR_INVALID_ORDER                                               :{RED} (Ógild Skipun)
 
 STR_UNKNOWN_DESTINATION                                         :óþekktur áfangastaður
 STR_8812_EMPTY                                                  :{LTBLUE}Tómt
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} frá {STATION}
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} frá {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Lest {COMMA} bíður í skýli
 STR_8815_NEW_VEHICLES                                           :{BLACK}Ný faratæki
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Lestin er of löng
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Aðeins er hægt að eiga við lestir þegar þær bíða í skýli
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Lestir
+
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nýir lestarvagnar
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nýjir rafdrifnir lestarvagnar
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nýir einteingungsvagnar
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nýir segullestarvagnar
+STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Járnbrautarlestir
+
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Smíða vagn
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Afrita bifreið
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Þetta býr til aðra eins bifreið. Control smelltu til að deila áætlun
@@ -2451,6 +2549,9 @@ STR_8825_NON_STOP                                               :{BLACK}Viðstö
 STR_8826_GO_TO                                                  :{BLACK}Fara að
 STR_8827_FULL_LOAD                                              :{BLACK}Fullferma
 STR_8828_UNLOAD                                                 :{BLACK} Afferma
+STR_REFIT                                                       :{BLACK}Breyta
+STR_REFIT_TIP                                                   :{BLACK}Veldu farm til að breyta í. CTRL smelltu til að fjarlægja breytiskipun
+STR_REFIT_ORDER                                                 :(Breyta í {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Skipanir)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Endi skipana - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
@@ -2507,10 +2608,10 @@ STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Neyða l
 STR_SERVICE_HINT                                                :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ný {STRING} er nú fáanleg!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Verð: {CURRENCY} Þyngd: {WEIGHT_S}{}Hraði: {VELOCITY}  Hestöfl: {POWER}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Verð: {CURRENCY} Þyngd: {WEIGHT_S}{}Hraði: {VELOCITY}  Afl: {POWER}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Bilaður
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Þyngd: {LTBLUE}{WEIGHT_S}  {BLACK}Hestöfl: {LTBLUE}{POWER}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Þyngd: {LTBLUE}{WEIGHT_S}  {BLACK}Afl: {LTBLUE}{POWER}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður á þessu ári: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stöðvaður
@@ -2530,14 +2631,16 @@ STR_886F_TRANSFER                                               :{BLACK}Yfirfær
 STR_TRAIN_STOPPING                                              :{RED}Stöðva
 STR_TRAIN_STOPPING_VEL                                          :{RED}Stöðva, {VELOCITY}
 STR_INCOMPATIBLE_RAIL_TYPES                                     :Ósamstæðir lestarteinar
+STR_TRAIN_NO_POWER                                              :{RED}Ekkert afl
+STR_TRAIN_START_NO_CATENARY                                     :Á þetta lestarspor vantar rafmagnsvíra, lestin kemst ekki af stað
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Bíll fyrir
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Bílar
 STR_9002                                                        :{WHITE}{VEHICLE}
-STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Bílastöð
+STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} bifreiðastöð
 STR_9004_NEW_VEHICLES                                           :{BLACK}Kaupa bifreiðar
-STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Nýjir bílar
+STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Bifreiðaúrval
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Kaupa bifreið
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Get ekki byggt bíl...
 STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Upplýsingar)
@@ -2553,10 +2656,12 @@ STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Get ekki
 STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Bifreið {COMMA} bíður nú í skýli
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Er á leið til bifreiðaskýlis {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Er á leið til bifreiðaskýlis {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Get ekki sent bifreið í skýli...
 STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Finnur ekkert nálægt skýli
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
-STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Smíða nýja bifreið (þarfnast bifreiðaskýlis)
+STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Bæta við bílaflota fyrirtækisins (þarfnast bifreiðaskýlis)
 STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Núverandi aðgerð bifreiðar - smelltu hér til að stöðva/ræsa bifreið
 STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Sýna skipanir bifreiðar
 STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Miðja aðalsjónarhornið á bifreið
@@ -2564,7 +2669,7 @@ STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Senda bi
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Þvinga bifreið til að snúa við
 STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Sýna upplýsingar um bifreið
 STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
-STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Smíða nýja bifreið
+STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Bæta við bílaflota fyrirtækisins
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Dragðu bifreið hingað til að selja hana
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Miðja aðalsjónarhorn á bifreiðaskýli
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Bifreiðalisti - ýttu á bifreið fyrir nánari upplýsingar
@@ -2593,6 +2698,7 @@ STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Breyta b
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Breyta bifreið
 STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Breyta bifreið svo hún flytji valinn farm
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Get ekki breytt bifreið...
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu tegund farms sem bifreið mun flytja
 
 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Hafnarframkvæmdir
@@ -2619,25 +2725,27 @@ STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiða
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðað: {LTBLUE}{NUM}{BLACK} Verðmæti: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{CARGO}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Get ekki stöðvað/ræst skip...
-STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Get ekki sent skip í skýli...
+STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Get ekki sent skip í slipp...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Finnur ekkert nálægt skýli
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Stefnir að {TOWN} skipaskýlinu
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Stefnir að {TOWN} skipaskýlinu, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA} bíður í skýli
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Stefnir að {TOWN} slippi
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Stefnir að {TOWN} slippi, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Viðhald í {TOWN} slippi
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Viðhald í {TOWN} slippi, {VELOCITY}
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA} bíður í slippi
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Byggja höfn
-STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Reisa skipaskýli (til að smíða og skoða skip)
+STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Reisa slipp (til að smíða og viðhalda skipum)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skip - smelltu á skip fyrir nánari upplýsingar
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Smíða nýtt skip
 STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Dragðu skip hingað til að selja það
-STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Miðja aðalsjónarhorn á skipaskýli
+STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Miðja aðalsjónarhorn á slipp
 STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skip - smelltu fyrir nánari upplýsingar
-STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Smíða nýtt skip (þarfnast skipaskýlis)
+STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Smíða nýtt skip (þarfnast slipps)
 STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Skipalisti - smelltu á skip fyrir nánari upplýsingar
 STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Smíða valið skip
 STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Núverandi aðgerð skips - smelltu hér til að stöðva/ræsa skipið
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Sýna skipanir skips
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Miðja aðalsjónarhorn á staðsetningu skips
-STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Senda skipið í skipaskýli
+STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Senda skipið í slipp
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Sýna nánari upplýsingar um skip
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nýtt skip fáanlegt!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
@@ -2688,6 +2796,8 @@ STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Get ekki sent flugvél í flugskýli...
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}Stefnir á {STATION} flugskýli
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Stefnir á {STATION} flugskýli, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Viðhald í {STATION} flugskýli
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Viðhald í {STATION} flugskýli, {VELOCITY}
 STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flugvél {COMMA} bíður í flugskýli
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Flugvél er fyrir
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Get ekki stöðvað/ræst flugvél...
@@ -2779,13 +2889,44 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Peningar
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Peningar sem þetta fyrirtæki hefur tekið að láni
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Heildarpunktar af mögulegum punktum
 
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nýgrf stillingar
+STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF Stillingar
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF stillingar
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Virkja breytingar
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Stilla breytur
-STR_NEWGRF_TIP                                                  :{BLACK}Listi yfir öll nýgrf sett sem þú hefur sett inn. Smelltu til að breyta stillingunum
-STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Það eru engar nýgrf skrár innsettar! Vinsamlegast skoðaðu leiðbeiningarnar fyrir upplýsingar um hvernig setja á inn nýja grafík
+STR_NEWGRF_TIP                                                  :{BLACK}Listi yfir öll NewGRF sett sem þú hefur sett inn. Smelltu til að breyta stillingunum
+STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Það eru engar NewGRF skrár innsettar! Vinsamlegast skoðaðu leiðbeiningarnar fyrir upplýsingar um hvernig setja á inn nýja grafík
 STR_NEWGRF_FILENAME                                             :{BLACK}Skráarnafn: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF einkenni: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 summa: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Þú ert í þann mund að eiga við leik í gangi, við það gæti OpenTTD hrunið.{}Ertu viss um að þú viljir halda áfram?
+
+STR_NEWGRF_ADD                                                  :{BLACK}Bæta við
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Bæta NewGRF skrá við listann
+STR_NEWGRF_REMOVE                                               :{BLACK}Fjarlægja
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjarlægja valda NewGRF skrá af listanum
+STR_NEWGRF_MOVEUP                                               :{BLACK}Færa ofar
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Færa valda NewGRF skrá ofar á listann
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Færa neðar
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Færa valda NewGRF skrá neðar á listann
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Listi yfir NewGRF skrár sem eru til staðar. Smelltu á skrá til að eiga við eiginleika hennar.
+STR_NEWGRF_PARAMETER                                            :{BLACK}Eiginleikar: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Sláðu inn NewGRF breytur
+STR_NEWGRF_NO_INFO                                              :{BLACK}Engar upplýsingar tiltækar
+
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tiltækar NewGRF skrár
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Bæta á lista
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Bæta valinni NewGRF skrá í stillingarnar
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Uppfæra lista
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Uppfæra listann yfir tiltækar NewGRF skrár
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Get ekki bætt skrá við: tvö eins GRF einkenni
+
+STR_NEWGRF_NOT_FOUND                                            :{RED}Viðeigandi skrá finnst ekki
+STR_NEWGRF_DISABLED                                             :{RED}Óvirkt
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Viðeigandi skrá finnst ekki (samsvarandi GRF hlaðið)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Samsvarandi GRF hlaðið í staðin týndrar skrár
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Týndar GRF skrár hafa verið gerðar óvirkar
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Vantar GRF skrár til að hægt sé að hlaða leik
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Sérvalinn gjaldeyrir
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Gengi: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2813,18 +2954,44 @@ STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Sýna al
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Sýna allar flugvélar sem hafa þessa stöð á áætlun
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Sýna öll skip sem hafa þessa stöð á áætlun
 
-
-
-
+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Samnýttar skipanir {COMMA} {P farartækis farartækja}
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Sýna öll farartæki sem deila þessari áætlun
 
 ### depot strings
 
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Selja allar lestir í skýli
+STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Selja allar bifreiðar í skýli
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Selja öll skip í slippi
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Selja allar flugvélar í skýli
 
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Fá lista yfir allar lestir sem hafa þetta skýli á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP                        :{BLACK}Fá lista yfir allar bifreiðir sem hafa þetta skýli á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Fá lista yfir öll skip sem hafa þennan slipp á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Fá lista yfir allar flugvélar sem hafa flugskýli á þessum velli á áætlun
 
+STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Skipta öllum lestum í skýlinu sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Skipta öllum bifreiðum í skýlinu sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Skipta öllum skipum í slippnum sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Skipta öllum flugvélum í skýlinu sjálfvirkt út
 
+STR_SELL                                                        :{BLACK}Selja
+STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Þú ert í þann mund að selja öll farartækin.
+STR_ARE_YOU_SURE                                                :{BLACK}Ertu viss?
 
+STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - {COMMA} Lest{P "" ir}
+STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - {COMMA} Bifreið{P "" ar}
+STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING} - {COMMA} Skip
+STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Flugvél{P "" ar}
 
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Staðfestu að þú viljir selja allar lestirnar í skýlinu
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Staðfestu að þú viljir selja allar bifreiðarnar í skýlinu
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Staðfestu að þú viljir selja öll skipin í slippnum
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Staðfestu að þú viljir selja allar flugvélarnar í skýlinu
 
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Ekki selja allar lestirnar í skýlinu
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Ekki selja allar bifreiðarnar í skýlinu
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Ekki selja öll skipin í slippnum
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Ekki selja allar flugvélarnar í skýlinu
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Endurnýja {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Hefja skipti
@@ -2847,12 +3014,24 @@ STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Ekki hæ
 STR_ENGINES                                                     :Dráttarvagnar
 STR_WAGONS                                                      :Vagnar
 
+STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Smelltu til að stöðva allar lestir í skýlinu
+STR_MASS_STOP_DEPOT_ROADVEH_TIP                                 :{BLACK}Smelltu til að stöðva allar bifreiðar í skýlinu
+STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Smelltu til að stöðva öll skip í slippnum
+STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Smelltu til að stöðva allar flugvélar í flugskýlinu
 
+STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Smelltu til að ræsa allar lestir í skýlinu
+STR_MASS_START_DEPOT_ROADVEH_TIP                                :{BLACK}Smelltu til að ræsa allar bifreiðar í skýlinu
+STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Smelltu til að ræsa öll skip í slippnum
+STR_MASS_START_HANGAR_TIP                                       :{BLACK}Smelltu til að ræsa allar flugvélar í flugskýlinu
 
+STR_MASS_STOP_LIST_TIP                                          :{BLACK}Smelltu til að stöðva öll farartæki á listanum
+STR_MASS_START_LIST_TIP                                         :{BLACK}Smelltu til að ræsa öll farartæki á listanum
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Merkjalisti - {COMMA} merki
 
+STR_ORDER_REFIT_FAILED                                          :{WHITE}Order refit failure stopped {STRING} {COMMA}
+
 ############ Lists rail types
 
 STR_RAIL_VEHICLES                                               :Járnbrautavagnar
@@ -2865,7 +3044,7 @@ STR_MAGLEV_VEHICLES                                             :Segulsvifvagnar
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hámarkshraði: {GOLD}{VELOCITY}{BLACK}   Hestöfl: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hámarkshraði: {GOLD}{VELOCITY}{BLACK}   Afl: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Hraði: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Rekstrarkostnaður: {GOLD}{CURRENCY} á ári
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Burðargeta: {GOLD}{CARGO} {STRING}
@@ -2876,11 +3055,64 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Þyngd:
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Hámarkshraði: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Burðargeta: {GOLD}{COMMA} farþegar, {COMMA} pokar af pósti
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Drifvagnar: {GOLD}+{POWER}{BLACK} Þyngd: {GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Hægt að breyta farmi í: {GOLD}
+STR_PURCHASE_INFO_ALL_TYPES                                     :Allar tegundir farms
+STR_PURCHASE_INFO_ALL_BUT                                       :Allt nema {GOLD}
 
 ########### String for New Landscape Generator
 
+STR_GENERATE                                                    :{WHITE}Mynda land
+STR_RANDOM                                                      :{BLACK}Nýtt raðnúmer
+STR_RANDOM_HELP                                                 :{BLACK}Fá tilviljanakennt raðnúmer fyrir myndun lands
+STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Sköpun heims
+STR_RANDOM_SEED                                                 :{BLACK}Raðnúmer lands:
+STR_RANDOM_SEED_HELP                                            :{BLACK}Smelltu til að skrifa inn raðnúmer
+STR_LAND_GENERATOR                                              :{BLACK}Landmyndun:
+STR_TREE_PLACER                                                 :{BLACK}Planta trjám:
+STR_HEIGHTMAP_ROTATION                                          :{BLACK}Snúningur hæðarkorts:
+STR_TERRAIN_TYPE                                                :{BLACK}Gerð lands:
+STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Magn sjávar:
+STR_SMOOTHNESS                                                  :{BLACK}Sléttleiki lands:
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Hæð snjólínu:
+STR_DATE                                                        :{BLACK}Dags.:
+STR_NUMBER_OF_TOWNS                                             :{BLACK}Fjöldi bæja:
+STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Fjöldi iðnaða:
+STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_SNOW_LINE_UP                                                :{BLACK}Hækka snjólínu upp um eitt þrep
+STR_SNOW_LINE_DOWN                                              :{BLACK}Lækka snjólínu niður um eitt þrep
+STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Breyta hæð snjólínu
+STR_START_DATE_QUERY_CAPT                                       :{WHITE}Breyta upphafsári
+STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Stærð hæðarlínukorts
+STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ekki er mælt með því að breyta stærð grunnkorts of mikið. Viltu halda áfram?
+STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
+STR_HEIGHTMAP_NAME                                              :{BLACK}Nafn hæðarlínukorts:
+STR_HEIGHTMAP_SIZE                                              :{BLACK}Stærð: {ORANGE}{NUM} x {NUM}
+STR_GENERATION_WORLD                                            :{WHITE}Skapa heim...
+STR_GENERATION_ABORT                                            :{BLACK}Hætta
+STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Hætta við sköpun heims
+STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ertu viss um að þú viljir hætta við sköpunina?
+STR_PROGRESS                                                    :{WHITE}{NUM}% tilbúið
+STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
+STR_WORLD_GENERATION                                            :{BLACK}Sköpun heims
+STR_TREE_GENERATION                                             :{BLACK}Gróðursetning trjáa
+STR_UNMOVABLE_GENERATION                                        :{BLACK}Staðsetning fastra hluta
 STR_CLEARING_TILES                                              :{BLACK}Hrjúft og grýtt landslag
+STR_SETTINGUP_GAME                                              :{BLACK}Set upp leik
+STR_PREPARING_TILELOOP                                          :{BLACK}Keyri reitalykkju
+STR_PREPARING_GAME                                              :{BLACK}Undirbý leik
+STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Þessi stilling breytti erfiðleikastigi í sérsniðið
+STR_SE_FLAT_WORLD                                               :{WHITE}Slétt land
+STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Mynda slétt land
+STR_SE_RANDOM_LAND                                              :{WHITE}Handahófskennt land
+STR_SE_NEW_WORLD                                                :{BLACK}Búa til nýtt kort
+STR_SE_CAPTION                                                  :{WHITE}Tegund korts
+STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Lækka slétt land niður um eitt þrep
+STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Hækka slétt land upp um eitt þrep
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Breyta hæð á sléttu landi
+STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Hæð slétts lands yfir sjávarmáli
+STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}
 
+STR_SMALLMAP_CENTER                                             :{BLACK}Miðja heimskort á núverandi staðsetningu
 
 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}Lítill flugvöllur
@@ -2897,4 +3129,12 @@ STR_SMALL_AIRPORTS                                              :{BLACK}Litlir f
 STR_LARGE_AIRPORTS                                              :{BLACK}Stórir flugvellir
 STR_HUB_AIRPORTS                                                :{BLACK}Háannaflugvellir
 STR_HELIPORTS                                                   :{BLACK}Þyrluflugvellir
+
+############ Tooltip measurment
+
+STR_MEASURE_LENGTH                                              :{BLACK}Lengd: {NUM}
+STR_MEASURE_AREA                                                :{BLACK}Svæði: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Hæðarmunur {NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Svæði: {NUM} x {NUM}{}Hæðarmunur: {NUM} m
+
 ########

lang/italian.txt

@@ -398,7 +398,7 @@ STR_SELECT_ALL_TYPES                                            :{BLACK}Selezion
 STR_AVAILABLE_TRAINS                                            :{BLACK}Treni Disponibili
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Veicoli Disponibili
 STR_AVAILABLE_SHIPS                                             :{BLACK}Navi Disponibili
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeromobili Disponibili
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aerei Disponibili
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Mostra una lista di motrici disponibili per quel tipo di veicolo
 STR_MANAGE_LIST                                                 :{BLACK}Gestisci lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Manda istruzioni a tutti i veicoli in questa lista
@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} raggiunge lo status di '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} di {COMPANY} raggiunge lo status di '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Crea Scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor Scenario
 STR_0223_LAND_GENERATION                                        :{WHITE}Genera Terreno
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Terreno Casuale
+STR_0227_RESET_LAND                                             :{BLACK}Azzerra Terreno
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumenta ampiezza del terreno da abbassare/alzare
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Decrementa ampiezza del terreno da abbassare/alzare
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genera terreno casuale
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Azzerra paesaggio
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Azzerra Paesaggio
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Usa Heightmap
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Usa Heightmap
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Sei sicuro di voler azzerrare il paesaggio?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generazione paesaggio
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generazione città
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generazione industrie
@@ -1624,7 +1630,7 @@ STR_2024                                                        :{YELLOW}{COMPAN
 STR_2025_SUBSIDIES                                              :{WHITE}Sussidi
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Sussidi offerti per il servizio:
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} da {STRING} a {STRING}
-STR_2028_BY                                                     :{YELLOW} (dal {DATE_SHORT})
+STR_2028_BY                                                     :{YELLOW} (entro {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Nessuno
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servizi già sussidiati:
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} da {STATION} a {STATION}{YELLOW} ({COMPANY}
@@ -2421,7 +2427,7 @@ STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Camion Bolle Po
 STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Camion Bolle Wizzowow
 STR_80CC_MPS_OIL_TANKER                                         :Petroliera MPS
 STR_80CD_CS_INC_OIL_TANKER                                      :Petroliera CS-Inc.
-STR_80CE_MPS_PASSENGER_FERRY                                    :Traghetto FFP
+STR_80CE_MPS_PASSENGER_FERRY                                    :Traghetto MPS
 STR_80CF_FFP_PASSENGER_FERRY                                    :Traghetto FFP
 STR_80D0_BAKEWELL_300_HOVERCRAFT                                :Hovercraft Bakewell 300
 STR_80D1_CHUGGER_CHUG_PASSENGER                                 :Traghetto Chugger-Chug

lang/japanese.txt

@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} は「{STRING}」に当たった！
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME}（{COMPANY}）は「{STRING}」に当たった！
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}シナリオを作成
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}シナリオエディタ
 STR_0223_LAND_GENERATION                                        :{WHITE}地形の作成
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}ランダムな地形
+STR_0227_RESET_LAND                                             :{BLACK}地形をリセット
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}上げる／下げる地域のサイズを拡大します
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}上げる／下げる地域のサイズを縮小します
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}ランダムな地形を作成します
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}地形をリセットします
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}地形のリセット
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}ハイトマップを使用
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}ハイトマップを使用
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}地形をリセットしてもよろしいですか？
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}地形の作成
 STR_022F_TOWN_GENERATION                                        :{BLACK}市町村の建設
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}産業の建設
@@ -2952,9 +2958,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}この
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}売却
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}車庫／格納庫／造船所内のすべての車両を販売します。
 STR_ARE_YOU_SURE                                                :{BLACK}続けてもよろしいですか？
 
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}電車庫内のすべての列車の売却を確認
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}車庫内のすべての道路車両の売却を確認
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}造船所内のすべての船舶の売却を確認
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}格納庫内のすべての飛行機の売却を確認
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}電車庫内のすべての列車を売却しない
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}車庫内のすべての道路車両を売却しない
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}造船所内のすべての船舶を売却しない
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}格納庫内のすべての飛行機を売却しない
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}電車庫内のすべての列車を販売します
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}車庫内のすべての道路車両を販売します
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}造船所内のすべての船舶を販売します

lang/korean.txt

@@ -361,6 +361,7 @@ STR_015C_SAVE_GAME                                              :게임 저장
 STR_015D_LOAD_GAME                                              :불러오기
 STR_015E_QUIT_GAME                                              :그만하기
 STR_015F_QUIT                                                   :종료
+STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}정말로 이 게임을 중단하시겠습니까?
 STR_0161_QUIT_GAME                                              :{WHITE}게임 그만두기
 STR_SORT_ORDER_TIP                                              :{BLACK}정렬 방법을 선택하십시오 (내림차순/오름차순)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}정렬 기준 선택
@@ -614,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY}가 '{STRING}'를(을) 달성했습니다!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME}의 {COMPANY}, 드디어 {STRING}를(을) 달성했습니다!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}시나리오 생성
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}시나리오 에디터
 STR_0223_LAND_GENERATION                                        :{WHITE}지형 생성기
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}무작위 지형
+STR_0227_RESET_LAND                                             :{BLACK}지형 초기화
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}지형 편집툴의 크기를 키움
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}지형 편집툴의 크기를 줄임
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}무작위 지형을 생성
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}풍경 초기화
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}풍경 리셋
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}DEM지형 사용
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}DEM지형 사용
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}정말로 지형을 초기화하시겠습니까?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}지형 생성기
 STR_022F_TOWN_GENERATION                                        :{BLACK}마을 생성
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}산업 시설 생성
@@ -737,6 +744,7 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}시나
 STR_029A_PLAY_SCENARIO                                          :{BLACK}시나리오 플레이
 STR_PLAY_HEIGHTMAP                                              :{BLACK}DEM지형 플레이
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}DEM지형을 풍경으로 하여 게임을 시작합
+STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}이 시나리오를 종료하시겠습니까?
 STR_029C_QUIT_EDITOR                                            :{WHITE}에디터 종료
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...1200명 이상의 도시에만 건설할 수 있습니다!
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}시작년도를 1년 앞당깁니다.
@@ -2951,6 +2959,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}이 스
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}팔기
+STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}이 차고에 있는 모든 차량을 팔 것입니다.
+STR_ARE_YOU_SURE                                                :{BLACK}정말로 파시겠습니까?
+
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}이 차량기지에 있는 모든 열차를 팔 것인지 확인합니다.
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}이 차고에 있는 모든 자동차를 팔 것인지 확인합니다.
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}이 정박소에 있는 모든 선박을 팔 것인지 확인합니다.
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}이 격납고에 있는 모든 선박을 팔 것인지 확인합니다.
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}이 차량기지에 있는 모든 열차를 팔지 않습니다.
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}이 차량기지에 있는 모든 자동차를 팔지 않습니다.
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}이 차량기지에 있는 모든 선박을 팔지 않습니다.
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}이 차량기지에 있는 모든 항공기를 팔지 않습니다.
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}이 차량기지에 있는 모든 열차를 팝니다.
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}이 차량기지에 있는 모든 자동차를 팝니다.
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}이 차량기지에 있는 모든 선박을 팝니다.

lang/lithuanian.txt

@@ -329,6 +329,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Naujas
 STR_0141_LOAD_GAME                                              :{BLACK}Atverti žaidimą
 STR_SINGLE_PLAYER                                               :{BLACK}Vienas zaidejas
 STR_MULTIPLAYER                                                 :{BLACK}Žaidimas tinkle
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenarijaus redaktorius
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -428,6 +429,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Vagono talpa
 STR_NO_WAITING_CARGO                                            :{BLACK}Jokiu kroviniu nera pakrovimui
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pazymeti visus pastatus
 STR_SELECT_ALL_TYPES                                            :{BLACK}Pazymeti visus krovinio tipus (iskaitant nelaukiancius kroviniu)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Galimi traukiniai
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Galimi automobiliai
+STR_AVAILABLE_SHIPS                                             :{BLACK}Galimi laivai
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Galimi lėktuvai
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Peržiūrėti galimų variklių sąrašą tinkamų šiai transporto priemonei.
 STR_MANAGE_LIST                                                 :{BLACK}Tvarkyti sąrašą
 STR_MANAGE_LIST_TIP                                             :{BLACK}Siųsti nurodymus visoms šio sąrašo tr. priemonėms
@@ -1442,6 +1447,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Zaideju
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Nerastas tinklo irenginys arba sukompiliuota be ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nerado nei vieno zidimo tinkle
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Serveris neatsake i uzklausa
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nepavyko prisijungti dėl Papild. grafikos neatitikimo
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Zaidimo tinkle sinchronizacija nepavyko
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Nutruko rysys
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Negali atverti issaugoto zaidimo
@@ -1463,6 +1469,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :sinchronizacijo
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :negali uzkrauti zemelapio
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :prarastas rysys
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokolo klaida
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Papild. grafikos neatitikimas
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Ne autorizuota
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :gautas neteisingas paketas
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :bloga versija
@@ -1679,7 +1686,7 @@ STR_2041_SHOPPING_MALL                                          :Parduotuvių ra
 STR_2042_DO_IT                                                  :{BLACK}Pirmyn!
 STR_2043_LIST_OF_THINGS_TO_DO_AT                                :{BLACK}Sąrašas veiksmų, kuriuos galima atlikti šiame mieste - spragtelėjus pavadinimą, pateikiama daugiau informacijos
 STR_2044_CARRY_OUT_THE_HIGHLIGHTED                              :{BLACK}Atlikti aukščiau pasirinktą veiksmą
-STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Galimos akcijos:
+STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Galimi veiksmai:
 STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Maža reklamos kompanija
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Vidutinė reklamos kompanija
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Didelė reklamos kompanija

lang/norwegian_bokmal.txt

@@ -295,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nytt spi
 STR_0141_LOAD_GAME                                              :{BLACK}Last inn spill
 STR_SINGLE_PLAYER                                               :{BLACK}Énspiller
 STR_MULTIPLAYER                                                 :{BLACK}Flerspiller
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenario Editor
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -394,6 +395,10 @@ 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_TRAINS                                            :{BLACK}Tilgjengelige tog
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgjengelige kjøretøy
+STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgjengelige skip
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgjengelige luftfartøy
 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
@@ -609,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} oppnår '{STRING}'-status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} fra {COMPANY} oppnår '{STRING}'-status!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Lag scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarioredigerer
 STR_0223_LAND_GENERATION                                        :{WHITE}Landgenerering
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Tilfeldig landforming
+STR_0227_RESET_LAND                                             :{BLACK}Tilbakestill land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Øk størrelse av landareal å heve/senke
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Mink størrelse av landareal å heve/senke
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generer tilfeldig landskap
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Tilbakestill landskap
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Tilbakestill landskap
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Bruk høydekart
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Bruk høydekart
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Er du sikkert på du vil tilbakestille landskapet?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landskapsgenerering
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bygenerering
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrigenerering
@@ -1408,6 +1419,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste ov
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ingen nettverksadapter funnet eller kompilert uten ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kunne ikke finne noen nettverksspill
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Tjeneren svarte ikke på forespørselen
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kunne ikke koble til på grunn av en NewGRF som ikke stemmer
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Nettverksspill synkronisering feilet.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Nettverksspill tilkobling mistet
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikke laste server-lagret spill
@@ -1429,6 +1441,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniserings
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :klarte ikke å åpne kartet
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :forbindelsen ble brutt
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollfeil
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF stemmer ikke
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikke autorisert
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottok merkelig pakke
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :feil versjon
@@ -2945,9 +2958,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}Selg
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Du er nå i ferd med å selge alle kjøretøyene i depoet.
 STR_ARE_YOU_SURE                                                :{BLACK}Er du sikker på at du vil dette?
 
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Bekreft at du vil selge alle togene i depotet
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Bekreft at du vil selge alle bilene i depotet
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Bekreft at du vil selge alle skipene i depotet
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Bekreft at du vil slge all flyene i hangaren
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Ikke selg alle skip i depodet
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Ikke selg alle bilene i garasjen
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Ikke selg alle skip i depodet
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Ikke selg alle flyene i hangaren
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Selg alle tog i depodet
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Selg alle kjøretøy i garasjen
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Selg alle skip i depotet

lang/norwegian_nynorsk.txt

@@ -296,6 +296,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nytt spe
 STR_0141_LOAD_GAME                                              :{BLACK}Last inn spel
 STR_SINGLE_PLAYER                                               :{BLACK}Einspelar
 STR_MULTIPLAYER                                                 :{BLACK}Fleirspelar
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenarioredigering
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -614,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} oppnår status som '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} frå {COMPANY} oppnår status som '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Lag scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarioredigering
 STR_0223_LAND_GENERATION                                        :{WHITE}Landgenerering
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Tilfeldig landforming
+STR_0227_RESET_LAND                                             :{BLACK}Nullstill land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Øk storleiken på landarealet som skal hevast/senkast
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Mink storleiken på landarealet som skal hevast/senkast
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generer tilfeldig landskap
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Nullstill landskap
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Nullstill landskap
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Bruk høgdekart
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Bruk høgdekart
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Er du sikker på at du vil nullstille landskapet?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landskapsgenerering
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bygenerering
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrigenerering
@@ -1413,6 +1420,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste ov
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Finn inkje nettverksadapter eller kompilert utan ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kunne ikkje finne noko nettverksspel
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Tenaren svarte ikkje på spørringa
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kunne ikkje koble til grunna NewGRF-filer som ikkje passar saman
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Synkronisering i nettverksspelet feila
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Mista tilkoblinga til nettverksspelet
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikkje laste spel som var lagra på tenaren
@@ -1434,6 +1442,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniserings
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :klarte ikkje å opne kartet
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :sambandet vart brote
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollfeil
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-filer passar ikkje saman
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikkje autorisert
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottok merkeleg pakke
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :feil versjon
@@ -2950,9 +2959,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}Sel
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Du er i ferd med å selje alle køyretøya i depotet.
 STR_ARE_YOU_SURE                                                :{BLACK}Er du sikker?
 
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Stadfest at du vil selje alle toga i togstallen.
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Stadfest at du vil selje alle køyretøya i depotet.
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Stadfest at du vil selje alle skipa i depotet.
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Stadfest at du vil selje alle flya i hangaren.
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Ikkje sel alle toga i togstallen
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Ikkje sel alle køyretøya i depotet
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Ikkje sel alle skipa i depotet
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Ikkje sel alle flya i hangaren
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sel alle toga i togstallen
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Sel alle køyretøya i garasjen
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sel alle skipa i depotet

lang/polish.txt

@@ -667,16 +667,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} osiąga status: '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} osiągnęło status '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Tworzenie Scenariusza
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Edytor Scenariuszy
 STR_0223_LAND_GENERATION                                        :{WHITE}Tworzenie terenu
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Przypadkowy ląd
+STR_0227_RESET_LAND                                             :{BLACK}Kasowanie lądu
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zwiększ powierzchnie do podwyższenia/obniżenia
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zmniejsz powierzchnie do podwyższenia/obniżenia
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Tworzenie przypadkowego lądu
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Resetuj krajobraz
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Resetuj krajobraz
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Użyj mapy wysokości
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Użyj mapy wysokości
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Jesteś pewien że chcesz zrestartować krajobraz?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Tworzenie krajobrazu
 STR_022F_TOWN_GENERATION                                        :{BLACK}Tworzenie miast
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Tworzenie przedsiębiorstw
@@ -980,10 +986,10 @@ STR_TOWNNAME_ITALIAN                                            :Włoskie
 STR_TOWNNAME_CATALAN                                            :Katalońskie
 ############ end of townname region
 
-STR_CURR_GBP                                                    :Funty (ÂŁ)
+STR_CURR_GBP                                                    :Funty (£)
 STR_CURR_USD                                                    :Dolar ($)
-STR_CURR_EUR                                                    :Euro (€)
-STR_CURR_YEN                                                    :Jeny (ÂĄ)
+STR_CURR_EUR                                                    :Euro (€)
+STR_CURR_YEN                                                    :Jeny (¥)
 STR_CURR_ATS                                                    :Szyling austriacki (ATS)
 STR_CURR_BEF                                                    :Frank belgijski (BEF)
 STR_CURR_CHF                                                    :Frank szwajcarski (CHF)

lang/portuguese.txt

@@ -116,36 +116,36 @@ STR_QUANTITY_PLASTIC                                            :{VOLUME} de pl
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida{P "" s} gasosa{P "" s}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
-STR_ABBREV_COAL                                                 :{TINYFONT}CL
-STR_ABBREV_MAIL                                                 :{TINYFONT}ML
-STR_ABBREV_OIL                                                  :{TINYFONT}OL
-STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
-STR_ABBREV_GOODS                                                :{TINYFONT}GD
-STR_ABBREV_GRAIN                                                :{TINYFONT}GR
-STR_ABBREV_WOOD                                                 :{TINYFONT}WD
-STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
-STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_COAL                                                 :{TINYFONT}CV
+STR_ABBREV_MAIL                                                 :{TINYFONT}CR
+STR_ABBREV_OIL                                                  :{TINYFONT}PT
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}GD
+STR_ABBREV_GOODS                                                :{TINYFONT}BN
+STR_ABBREV_GRAIN                                                :{TINYFONT}CR
+STR_ABBREV_WOOD                                                 :{TINYFONT}MD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}FR
+STR_ABBREV_STEEL                                                :{TINYFONT}AÇ
 STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
 STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
-STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_MAIZE                                                :{TINYFONT}ML
 STR_ABBREV_FRUIT                                                :{TINYFONT}FT
 STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
-STR_ABBREV_FOOD                                                 :{TINYFONT}FD
-STR_ABBREV_PAPER                                                :{TINYFONT}PR
-STR_ABBREV_GOLD                                                 :{TINYFONT}GD
-STR_ABBREV_WATER                                                :{TINYFONT}WR
-STR_ABBREV_WHEAT                                                :{TINYFONT}WH
-STR_ABBREV_RUBBER                                               :{TINYFONT}RB
-STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_FOOD                                                 :{TINYFONT}CM
+STR_ABBREV_PAPER                                                :{TINYFONT}PP
+STR_ABBREV_GOLD                                                 :{TINYFONT}OU
+STR_ABBREV_WATER                                                :{TINYFONT}AG
+STR_ABBREV_WHEAT                                                :{TINYFONT}TR
+STR_ABBREV_RUBBER                                               :{TINYFONT}BR
+STR_ABBREV_SUGAR                                                :{TINYFONT}AÇ
 STR_ABBREV_TOYS                                                 :{TINYFONT}TY
-STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_SWEETS                                               :{TINYFONT}DC
 STR_ABBREV_COLA                                                 :{TINYFONT}CL
-STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
-STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
-STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}AD
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BO
+STR_ABBREV_TOFFEE                                               :{TINYFONT}CM
 STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
-STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BG
 STR_ABBREV_NONE                                                 :{TINYFONT}NÃO
 STR_ABBREV_ALL                                                  :{TINYFONT}TUDO
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
@@ -606,24 +606,30 @@ STR_0213_BUSINESSMAN                                            :Negociante
 STR_0214_ENTREPRENEUR                                           :Empresário
 STR_0215_INDUSTRIALIST                                          :Industrial
 STR_0216_CAPITALIST                                             :Capitalista
-STR_0217_MAGNATE                                                :Magnate
-STR_0218_MOGUL                                                  :Grande magnate
-STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate do século
+STR_0217_MAGNATE                                                :Magnata
+STR_0218_MOGUL                                                  :Grande magnata
+STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnata do século
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} conquista '{STRING}' desempenho!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista '{STRING}' desempenho!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Criar Cenário
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Cenário
 STR_0223_LAND_GENERATION                                        :{WHITE}Gerar Terreno
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Terreno Aleatório
+STR_0227_RESET_LAND                                             :{BLACK}Repor Terreno
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumentar área de terreno a baixar/levantar
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Diminuir área de terreno a baixar/levantar
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Gerar terreno aleatório
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Repor terreno
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Repor Terreno
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Usar mapa de alturas
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Usar mapa de alturas
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Tem a certeza que deseja repor o terreno?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}A gerar terreno
 STR_022F_TOWN_GENERATION                                        :{BLACK}A gerar cidades
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}A gerar indústrias
@@ -1036,7 +1042,7 @@ STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fila de
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o rato está na borda do mapa: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estações não uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova procura de caminho global (NPF, overrides NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova procura de caminho global (NPF, substitui NTP): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Multiplicador de peso para simular comboios pesados: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}

lang/romanian.txt

@@ -295,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Joc nou
 STR_0141_LOAD_GAME                                              :{BLACK}Încarcã joc
 STR_SINGLE_PLAYER                                               :{BLACK}Un singur jucãtor
 STR_MULTIPLAYER                                                 :{BLACK}Multiplayer
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor harta
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -390,6 +391,7 @@ STR_ENGINE_SORT_POWER                                           :Putere
 STR_ENGINE_SORT_INTRO_DATE                                      :Data lansarii
 STR_ENGINE_SORT_RUNNING_COST                                    :Cost exploatare
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Cost exploatare/putere
+STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacitate incarcatura
 STR_NO_WAITING_CARGO                                            :{BLACK}Nu este în asteptare nici un fel de încãrcãturã
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alege toate facilitãtile
 STR_SELECT_ALL_TYPES                                            :{BLACK}Alege toate tipurile de încãrcãturi (inclusiv încãrcãturile care nu sunt în asteptare)
@@ -612,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} a dobandit titlul de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} al {COMPANY} dobandeste titlul de '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Creeazã scenariu
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor scenarii
 STR_0223_LAND_GENERATION                                        :{WHITE}Generator suprafatã uscat
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Uscat aleatoriu
+STR_0227_RESET_LAND                                             :{BLACK}Reseteazã terenul
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Mãreste aria de editare a terenului
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Micsoreazã aria de editare a terenului
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genereazã teren aleator
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reseteazã peisajul
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Resetare peisaj
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Foloseste harta de inaltimi
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Foloseste harta inaltimi
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Esti sigur cã vrei sa resetezi peisajul?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generare peisaj
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generare oras
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generare industrii
@@ -1411,6 +1419,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Nu a fost detectatã o placã de retea valabilã
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Nu a fost gãsit nici un joc în retea
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Serverul nu a rãspuns cererii
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nu m-am putut conecta din cauza unei nepotriviri NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Sincronizarea jocului in retea a esuat.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Conexiunea jocului in reatea a fost intrerupta.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nu am reusit sa incarc jocul-server salvat.
@@ -1432,6 +1441,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :eroare de desin
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nu pot incarca harta
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :conexiune pierduta
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :eroare de protocol
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Nepotrivire NewGRF
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :neautorizat
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :primit pachet ciudat
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :versiune incorecta
@@ -2661,6 +2671,7 @@ STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Autovehi
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Cumpãrã un autovehicul
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Mutã un autovehicul aici pentru a-l vinde
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centreazã imaginea pe locatia acestei autobaze
+STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista selectie vehicule rutiere - apasa pe vehicul pentru informatii
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Cumpãrã autovehiculul selectat
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Un nou autovehicul disponibil!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}

lang/russian.txt

@@ -616,16 +616,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} достиг статуса '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} из {COMPANY} достиг статуса '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Создать сценарий
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Редактор сценариев
 STR_0223_LAND_GENERATION                                        :{WHITE}Генератор карты
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Случайная Карта
+STR_0227_RESET_LAND                                             :{BLACK}Сбросить карту
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Увеличить площадь изменения рельефа
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Уменьшить площадь изменения рельефа
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Создать случайную карту
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Сбросить карту
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Сбросить карту
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Исп. РЕЛЬЕФ
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Исп. РЕЛЬЕФ
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Вы уверены что хотите сбросить землю?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Создание ландшафта
 STR_022F_TOWN_GENERATION                                        :{BLACK}Создание города
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Создание промышленности
@@ -1015,44 +1021,44 @@ STR_CONFIG_PATCHES_ON                                           :да
 STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Показывать скорость в панели статуса транспорта: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Разрешить строительство на склонах и берегу: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Разрешить более реалистичные зоны покрытия: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Разрешить удалять больше дорог, мостов, т.п.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Использовать очень длинные поезда: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Разрешить реалистичное ускорение: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Запретить повороты на 90 град.: {ORANGE}{STRING} {LTBLUE} (требуется NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Объединять станции: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}При вкл. полной загрузке отправляться, когда заполнен один тип вагонов: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Улучшенный алгоритм загрузки: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Разрешить удаление всех принадлежащих городу объектов: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Включить строительство очень длинных поездов: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Включить реалистичное ускорение для поездов: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Запретить резкие повороты поездам и кораблям: {ORANGE}{STRING} {LTBLUE}(NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Объединять построенные рядом станции: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Покидать станцию, когда любой груз полностью загружен: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Использовать улучшенный алгоритм загрузки: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Постепенная загрузка транспорта: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Инфляция: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Доставлять груз на станцию, только если она его принимает: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Строить очень длинные мосты: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Добавлять депо в расписание: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Разрешить строительство очень длинных мостов: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Разрешить добавлять депо в маршрут: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Разрешить строительство сырьевых предприятий: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Строить неск. предприятий 1 типа в одном городе: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Одинаковые предприятия можно строить рядом: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Всегда показывать длинную дату в панели состояния: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Сигналы на стороне движения: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Показывать светофоры на стороне движения: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Показывать финансовую статистику в конце года: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Приказ без остановки в стиле TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Разрешить ожидание въезда на автостанцию: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Использовать поведение TTDP для приказа "без остановок": {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Разрешить автомобилям ожидать въезда на станцию: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Смещать обзор, когда курсор находится у края экрана: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Разрешить взятку местной администрации: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Станции могут быть разной формы: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Новый поиск пути (NPF, без NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Коэф. увеличения веса груза: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Станции могут быть произвольной формы: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Включить новый алгоритм навигации (NPF, заменяет NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Множитель увеличения веса груза для товарных поездов: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Всегда разрешать малые аэропорты: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Всегда разрешать строительство малых аэропортов: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Предупреждать, если поезд не находит дороги: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Пересмотреть расписания: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Предупреждать, если поезд заблудился: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Проверять маршруты транспортных средств на правильность: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :нет
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :да, кроме остановленных трансп. средств
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :всего транспорта
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Предупреждать, что трансп. средство приносит убыток: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Предупреждать, если поезд приносит убыток: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Транспорт никогда не устаревает: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Автоматически обновлять устаревший транспорт
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Обновить транспорт за (через) {ORANGE}{STRING}{LTBLUE} мес. после устаревания
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Минимальная сумма для автообновления: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Автоматически обновлять изношенный транспорт
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Обновлять через {ORANGE}{STRING}{LTBLUE} месяцев после истечения срока службы
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Минимальная сумма, необходимая для автообновления: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Длительность сообщений об ошибке: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Показывать количество жителей города после названия: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Убирать деревья при включении прозрачности зданий: {ORANGE}{STRING}
@@ -1060,7 +1066,7 @@ STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Уби
 STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Генератор земли: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Оригинальный
 STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
-STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Макс. дистанция от края карты до Нефтепер. завода {ORANGE}{STRING}
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Макс. расстояние от края карты до нефтепер. заводов: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Высота "снежной" линии: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Неровность земли (только для TerraGenesis) : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Очень гладкий
@@ -1087,37 +1093,37 @@ STR_CONFIG_PATCHES_LIVERIES_OWN                                 :только д
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :для всех компаний
 STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Предпочитать командный чат при нажатии Enter: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Макс. кол-во поездов у игрока: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Макс. кол-во автотранспорта у игрока: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Макс. кол-во авиатранспорта у игрока: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Макс. кол-во кораблей у игрока: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Максимальное количество поездов у игрока: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Максимальное количество кол-во автомобилей у игрока: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Максимальное количество авиатранспорта у игрока: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Максимальное количество кораблей у игрока: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Не допускать постройки поездов конкурентами: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Не допускать постройки автомобилей конкурентами: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Не допускать постройки самолётов конкурентами: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Не допускать постройки авиатранспорта конкурентами: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Не допускать постройки кораблей конкурентами: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Включить новый AI (альфа-версия): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Разрешить появление AI-конкурентов в сетевой игре: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Интервал обслуживания поездов: {ORANGE}{STRING} дней/%
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Интервал обслуживания поездов: {ORANGE}отключено
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Интервал обслуживания автотранспорта: {ORANGE}{STRING} дней/%
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Интервал обслуживания автотранспорта: {ORANGE}отключено
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Интервал обслуживания самолетов: {ORANGE}{STRING} дней/%
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Интервал обслуживания самолетов: {ORANGE}отключено
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Интервал обслуживания поездов: {ORANGE}не обслуживаются
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Интервал обслуживания автомобилей: {ORANGE}{STRING} дней/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Интервал обслуживания автомобилей: {ORANGE}не обслуживаются
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Интервал обслуживания авиатранспорта: {ORANGE}{STRING} дней/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Интервал обслуживания авиатранспорта: {ORANGE}не обслуживается
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Интервал обслуживания кораблей: {ORANGE}{STRING} дней/%
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Интервал обслуживания кораблей: {ORANGE}отключено
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Не обслуживать, если поломки выкл. : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Интервал обслуживания кораблей: {ORANGE}не обслуживаются
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Отключить обслуживание, если поломки выключены: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Включить ограничение скорости вагонов: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Откл. электрофицир. ЖД: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Отключить электрофицированную железную дорогу: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}"Цветные" новости появл. в : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Год начала игры: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Год окончания игры: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Включить плавную экономику (более мелкие изменения)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Разрешить покупку акций других компаний
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}При перетаскивании ставить сигналы каждые : {ORANGE}{STRING} клетки
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}При перетаскивании ставить светофоры каждые: {ORANGE}{STRING} клетки
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Положение главной панели инструментов: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :слева
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :в центре
@@ -1138,9 +1144,9 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Изменить значение
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Некоторые из выбранных интервалов обслуживания не совместимы с выбранной установкой. Допускаются значения 5-90% или 30-800 дней.
-STR_CONFIG_PATCHES_YAPF_SHIPS                                   :{LTBLUE}Исп. YAPF для кораблей: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_ROAD                                    :{LTBLUE}Исп. YAPF для авто: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_RAIL                                    :{LTBLUE}Исп. YAPF для поездов: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_SHIPS                                   :{LTBLUE}Использовать YAPF для кораблей: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_ROAD                                    :{LTBLUE}Использовать YAPF для автомобилей: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_RAIL                                    :{LTBLUE}Использовать YAPF для поездов: {ORANGE}{STRING}
 
 STR_TEMPERATE_LANDSCAPE                                         :Умеренный ландшафт
 STR_SUB_ARCTIC_LANDSCAPE                                        :Субарктический ландшафт
@@ -1263,7 +1269,7 @@ STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Пере
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Выбор типа груза для перевозки
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Переоборудование поезда для выделенного типа груза
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Не могу переоборуд. поезд...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Интервал обслуживания в процентах: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Интервалы обслуживания в процентах от срока службы: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Изменить производительность
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Добро пожаловать в новый ИИ, он совершенствуется. Вы должны быть готовы к проблемам. Когда это случится, сделайте снимок и отправьте на форум. Наслаждайтесь!

lang/slovak.txt

@@ -8,24 +8,24 @@
 ##id 0x0000
 STR_NULL                                                        :
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Za okrajom mapy
-STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Prilis blizko okraja mapy
-STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Mala hotovost - potrebna {CURRENCY}
+STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Príliš blízko okraja mapy
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Malá hotovost - potrebných {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY64}
 STR_0005                                                        :{RED}{CURRENCY64}
 STR_EMPTY                                                       :
-STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Potrebny rovny teren
+STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Potrebný rovný terén
 STR_0008_WAITING                                                :{BLACK}Caka: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
 STR_000A_EN_ROUTE_FROM                                          :{WHITE}{CARGO}{YELLOW}  (na ceste z
 STR_000B                                                        :{YELLOW}{STATION})
-STR_000C_ACCEPTS                                                :{BLACK}Prijima: {WHITE}
-STR_000D_ACCEPTS                                                :{BLACK}Prijima: {GOLD}
+STR_000C_ACCEPTS                                                :{BLACK}Prijíma: {WHITE}
+STR_000D_ACCEPTS                                                :{BLACK}Prijíma: {GOLD}
 STR_000E                                                        :
-STR_000F_PASSENGERS                                             :Cestujucich
+STR_000F_PASSENGERS                                             :Cestujúcich
 STR_000F_PASSENGERS.g                                           :cestujucich
 STR_0010_COAL                                                   :Uhlie
 STR_0010_COAL.g                                                 :uhlia
-STR_0011_MAIL                                                   :Postu
+STR_0011_MAIL                                                   :Poštu
 STR_0011_MAIL.g                                                 :posty
 STR_0012_OIL                                                    :Ropu
 STR_0012_OIL.g                                                  :ropy
@@ -37,13 +37,13 @@ STR_0015_GRAIN                                                  :Obilie
 STR_0015_GRAIN.g                                                :obilia
 STR_0016_WOOD                                                   :Drevo
 STR_0016_WOOD.g                                                 :dreva
-STR_0017_IRON_ORE                                               :Zeleznu rudu
+STR_0017_IRON_ORE                                               :Železnú rudu
 STR_0017_IRON_ORE.g                                             :zeleznej rudy
 STR_0018_STEEL                                                  :Ocel
 STR_0018_STEEL.g                                                :ocele
 STR_0019_VALUABLES                                              :Cennosti
 STR_0019_VALUABLES.g                                            :cennosti
-STR_001A_COPPER_ORE                                             :Medenna ruda
+STR_001A_COPPER_ORE                                             :Medenná ruda
 STR_001A_COPPER_ORE.g                                           :medennej rudy
 STR_001B_MAIZE                                                  :Kukuricu
 STR_001B_MAIZE.g                                                :kukurice
@@ -84,7 +84,7 @@ STR_002C_PLASTIC.g                                              :zuvaciek
 STR_002D_FIZZY_DRINKS                                           :Sumienku
 STR_002D_FIZZY_DRINKS.g                                         :sumienky
 STR_002E                                                        :
-STR_002F_PASSENGER                                              :Cestujuci
+STR_002F_PASSENGER                                              :Cestujúci
 STR_002F_PASSENGER.g                                            :cestujucich
 STR_0030_COAL                                                   :Uhlie
 STR_0030_COAL.g                                                 :uhlia
@@ -100,13 +100,13 @@ STR_0035_GRAIN                                                  :Obilie
 STR_0035_GRAIN.g                                                :obilia
 STR_0036_WOOD                                                   :Drevo
 STR_0036_WOOD.g                                                 :dreva
-STR_0037_IRON_ORE                                               :Zelezna ruda
+STR_0037_IRON_ORE                                               :Železná ruda
 STR_0037_IRON_ORE.g                                             :zeleznej rudy
 STR_0038_STEEL                                                  :Ocel
 STR_0038_STEEL.g                                                :ocele
 STR_0039_VALUABLES                                              :Cennosti
 STR_0039_VALUABLES.g                                            :cennosti
-STR_003A_COPPER_ORE                                             :Medenna ruda
+STR_003A_COPPER_ORE                                             :Medenná ruda
 STR_003A_COPPER_ORE.g                                           :medennej rudy
 STR_003B_MAIZE                                                  :Kukurica
 STR_003B_MAIZE.g                                                :kukurice
@@ -165,7 +165,7 @@ STR_QUANTITY_DIAMONDS                                           :{COMMA} deb{P n
 STR_QUANTITY_FOOD                                               :{WEIGHT} jedla
 STR_QUANTITY_PAPER                                              :{WEIGHT} papiera
 STR_QUANTITY_GOLD                                               :{COMMA} deb{P na ny ien} zlata
-STR_QUANTITY_WATER                                              :{VOLUME} voda
+STR_QUANTITY_WATER                                              :{VOLUME} vody
 STR_QUANTITY_WHEAT                                              :{WEIGHT} psenice
 STR_QUANTITY_RUBBER                                             :{VOLUME} kaucuk
 STR_QUANTITY_SUGAR                                              :{WEIGHT} cukru
@@ -216,12 +216,12 @@ STR_00AE                                                        :{WHITE}{DATE_SH
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Nastavenia hry
-STR_00B2_MESSAGE                                                :{YELLOW}Sprava
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Sprava od {STRING}
+STR_00B2_MESSAGE                                                :{YELLOW}Správa
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Správa 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_00B4_CAN_T_DO_THIS                                          :{WHITE}Nie je možné vykonat ...
+STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Oblast nie je možné vycistit ...
+STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Povodný copyright: {COPYRIGHT} 1995 Chris Sawyer, vsetky prava vyhradene
 STR_00B7_VERSION                                                :{BLACK}OpenTTD verzia {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 team OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK} Preklad - Lukas Lengyel & gpsoft
@@ -229,78 +229,78 @@ STR_TRANSLATED_BY                                               :{BLACK} Preklad
 STR_00C5                                                        :{BLACK}{CROSS}
 STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Koniec
-STR_00C8_YES                                                    :{BLACK}Ano
+STR_00C8_YES                                                    :{BLACK}Áno
 STR_00C9_NO                                                     :{BLACK}Nie
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Si si isty ze chces ukoncit hru a vratit sa do {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Si si istý že chces ukoncit hru a vrátit sa do {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                                                :Nic
-STR_00D1_DARK_BLUE                                              :Tmavomodra
-STR_00D2_PALE_GREEN                                             :Svetlozelena
-STR_00D3_PINK                                                   :Ruzova
-STR_00D4_YELLOW                                                 :Zlta
-STR_00D5_RED                                                    :Cervena
-STR_00D6_LIGHT_BLUE                                             :Svetlomodra
-STR_00D7_GREEN                                                  :Zelena
-STR_00D8_DARK_GREEN                                             :Tmavozelena
-STR_00D9_BLUE                                                   :Modra
-STR_00DA_CREAM                                                  :Kremova
-STR_00DB_MAUVE                                                  :Ruzova
-STR_00DC_PURPLE                                                 :Fialova
-STR_00DD_ORANGE                                                 :Oranzova
-STR_00DE_BROWN                                                  :Hneda
-STR_00DF_GREY                                                   :Seda
+STR_00D1_DARK_BLUE                                              :Tmavomodrá
+STR_00D2_PALE_GREEN                                             :Svetlozelená
+STR_00D3_PINK                                                   :Ružová
+STR_00D4_YELLOW                                                 :Žltá
+STR_00D5_RED                                                    :Cervená
+STR_00D6_LIGHT_BLUE                                             :Svetlomodrá
+STR_00D7_GREEN                                                  :Zelená
+STR_00D8_DARK_GREEN                                             :Tmavozelená
+STR_00D9_BLUE                                                   :Modrá
+STR_00DA_CREAM                                                  :Krémová
+STR_00DB_MAUVE                                                  :Ružová
+STR_00DC_PURPLE                                                 :Fialová
+STR_00DD_ORANGE                                                 :Oranžová
+STR_00DE_BROWN                                                  :Hnedá
+STR_00DF_GREY                                                   :Sedá
 STR_00E0_WHITE                                                  :Biela
-STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}V hre je prilis vela dopravnych prostriedkov
+STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}V hre je prílis vela dopravných prostriedkov
 STR_00E2                                                        :{BLACK}{COMMA}
 STR_00E3                                                        :{RED}{COMMA}
-STR_00E4_LOCATION                                               :{BLACK}Pozicia
+STR_00E4_LOCATION                                               :{BLACK}Pozícia
 STR_00E5_CONTOURS                                               :Vrstevnice
-STR_00E6_VEHICLES                                               :Dopravne Prostriedky
+STR_00E6_VEHICLES                                               :Dopravné prostriedky
 STR_00E7_INDUSTRIES                                             :Priemysel
 STR_00E8_ROUTES                                                 :Trasy
-STR_00E9_VEGETATION                                             :Vegetacia
-STR_00EA_OWNERS                                                 :Vlastnici
+STR_00E9_VEGETATION                                             :Vegetácia
+STR_00EA_OWNERS                                                 :Vlastníci
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Cesty
-STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Zeleznicne drahy
-STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Stanice/Letiska/Pristavy
-STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Budovy/Tovarne
-STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Dopravne Prostriedky
+STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Železnicné trate
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Stanice/Letiská/Prístavy
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Budovy/Priemysel
+STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Dopravné prostriedky
 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}Vlaky
-STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Auta
+STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Cestné vozidlá
 STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Lode
-STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Lietadla
-STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Dopravne Trasy
-STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Uholna bana
-STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Elektraren
+STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Lietadlá
+STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Dopravné trasy
+STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Uholná bana
+STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Elektráren
 STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Les
-STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Pila
-STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Ropna rafineria
+STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Píla
+STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Ropná rafinéria
 STR_00FF_FARM                                                   :{BLACK}{TINYFONT}Farma
-STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Tovaren
+STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Továren
 STR_0101_PRINTING_WORKS                                         :{BLACK}{TINYFONT}Tlaciaren
-STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}Ropny vrt
-STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Zelezorudna bana
+STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}Ropné vrty
+STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Železorudná bana
 STR_0104_STEEL_MILL                                             :{BLACK}{TINYFONT}Oceliaren
 STR_0105_BANK                                                   :{BLACK}{TINYFONT}Banka
-STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Vyroba papiera
-STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Zlata bana
-STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Vyroba potravin
-STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Diamantova bana
-STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Medenna bana
-STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Ovocny sad
-STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Kaucukova plantaz
-STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Vodny zdroj
+STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Výroba papiera
+STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Zlatá bana
+STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Výroba potravín
+STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Diamantová bana
+STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Medenná bana
+STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Ovocný sad
+STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Kaucuková plantáž
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Vodný zdroj
 STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Vodojem
-STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Pila
+STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Píla
 STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Les cukrovej vaty
 STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Cukrovar
 STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Vyroba baterii
@@ -312,30 +312,30 @@ STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFON
 STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Bublifuk
 STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Karamelovy lom
 STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Cukrova bana
-STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Zeleznicna stanica
+STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Železnicná stanica
 STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Nakladacia rampa
-STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Autobusova zastavka
+STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Autobusová stanica
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Letisko
-STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Pristav
-STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Hruby teren
-STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Travnaty teren
-STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Holy teren
+STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Prístav
+STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Nerovný terén
+STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Trávnatý terén
+STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Holý terén
 STR_0123_FIELDS                                                 :{BLACK}{TINYFONT}Polia
 STR_0124_TREES                                                  :{BLACK}{TINYFONT}Lesy
 STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Skaly
 STR_0126_WATER                                                  :{BLACK}{TINYFONT}Voda
-STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Bez vlastnika
-STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Mesta
+STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Bez vlastníka
+STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Mestá
 STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}Priemysel
-STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Pust
+STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Púšt
 STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Sneh
-STR_012C_MESSAGE                                                :{WHITE}Sprava
+STR_012C_MESSAGE                                                :{WHITE}Správa
 STR_012D                                                        :{WHITE}{STRING}
-STR_012E_CANCEL                                                 :{BLACK}Zrusit
+STR_012E_CANCEL                                                 :{BLACK}Zrušit
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Premenovat
-STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Pouzitych prilis vela mien
-STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Vybrane meno je uz pouzite
+STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Použitých príliš vela mien
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Vybrané meno je už použité
 
 STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
@@ -345,14 +345,14 @@ STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
 STR_OSNAME_OS2                                                  :OS/2
 
-STR_013B_OWNED_BY                                               :{WHITE}...vlastnik {STRING}
-STR_013C_CARGO                                                  :{BLACK}Naklad
-STR_013D_INFORMATION                                            :{BLACK}Informacie
+STR_013B_OWNED_BY                                               :{WHITE}... vlastníkom je {STRING}
+STR_013C_CARGO                                                  :{BLACK}Náklad
+STR_013D_INFORMATION                                            :{BLACK}Informácie
 STR_013E_CAPACITIES                                             :{BLACK}Kapacita
-STR_013E_TOTAL_CARGO                                            :{BLACK}Celkovy naklad
+STR_013E_TOTAL_CARGO                                            :{BLACK}Celkový náklad
 STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacita: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Celkovy naklad (kapacita) tohoto vlaku:
+STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Celkový náklad (kapacita) tohto vlaku:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nová hra
@@ -374,7 +374,7 @@ STR_0148_GAME_OPTIONS                                           :{BLACK}Nastaven
 STR_0150_SOMEONE                                                :niekto{SKIP}{SKIP}
 STR_0151_MAP_OF_WORLD                                           :Mapa sveta
 STR_0152_TOWN_DIRECTORY                                         :Zoznam miest
-STR_0153_SUBSIDIES                                              :Dotacie
+STR_0153_SUBSIDIES                                              :Dotácie
 
 STR_UNITS_IMPERIAL                                              :Imperialne
 STR_UNITS_METRIC                                                :Metricke
@@ -409,18 +409,18 @@ STR_UNITS_FORCE_METRIC                                          :{COMMA} megapon
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 ############ range for menu starts
-STR_0154_OPERATING_PROFIT_GRAPH                                 :Graf prevadzkoveho zisku
-STR_0155_INCOME_GRAPH                                           :Graf trzieb
-STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf prepraveneho nakladu
-STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Graf hodnotenia vykonu
+STR_0154_OPERATING_PROFIT_GRAPH                                 :Graf prevádzkového zisku
+STR_0155_INCOME_GRAPH                                           :Graf tržieb
+STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf prepraveného nákladu
+STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Graf hodnotenia výkonu
 STR_0158_COMPANY_VALUE_GRAPH                                    :Graf hodnoty spolocnosti
 STR_0159_CARGO_PAYMENT_RATES                                    :Ceny prepravy
-STR_015A_COMPANY_LEAGUE_TABLE                                   :Hodnotenie spolocnosti
+STR_015A_COMPANY_LEAGUE_TABLE                                   :Hodnotenie spolocností
 STR_PERFORMANCE_DETAIL_MENU                                     :Detailny rating vykonu
 ############ range for menu ends
 
 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
-STR_015C_SAVE_GAME                                              :Ulozit hru
+STR_015C_SAVE_GAME                                              :Uložit hru
 STR_015D_LOAD_GAME                                              :Nahrat hru
 STR_015E_QUIT_GAME                                              :Ukoncit hru
 STR_015F_QUIT                                                   :Ukoncit OpenTTD
@@ -492,49 +492,49 @@ STR_016E                                                        :{TINYFONT}{STRI
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauza
-STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Ulozit hru, opustit hru, ukoncit program
-STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam stanic spolocnosti
+STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Uložit hru, opustit hru, ukoncit program
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam staníc spolocnosti
 STR_0174_DISPLAY_MAP                                            :{BLACK}Zobrazit mapu
 STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Zobrazit mapu, zoznam miest
 STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Zobrazit zoznam miest
-STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Financne informacie o spolocnosti
-STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Informacie o spolocnosti
+STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Financné informécie o spolocnosti
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Informácie o spolocnosti
 STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Grafy
-STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Hodnotenie spolocnosti
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Hodnotenie spolocností
 STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam vlakov
 STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam automobilov
-STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam lodi
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam lodí
 STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam lietadiel
-STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Priblizit
+STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Priblížit
 STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Oddialit
-STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Vystavba zeleznice
-STR_0182_BUILD_ROADS                                            :{BLACK}Vystavba ciest
-STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Vystavba pristavov
-STR_0184_BUILD_AIRPORTS                                         :{BLACK}Vystavba letisk
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Vysadba stromov, rezervacia pozemku
-STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Informacie o pozemku
+STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Výstavba železnice
+STR_0182_BUILD_ROADS                                            :{BLACK}Výstavba ciest
+STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Výstavba prístavov
+STR_0184_BUILD_AIRPORTS                                         :{BLACK}Výstavba letísk
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Výsadba stromov, kúpa pozemku, ...
+STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Informácie o pozemku
 STR_0187_OPTIONS                                                :{BLACK}Nastavenia
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
-STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Nieje mozne zmenit servisny interval...
+STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Nie je možné zmenit servisný interval ...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Zavriet okno
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Nadpis okna - potiahni pre posun okna
 STR_STICKY_BUTTON                                               :{BLACK}Oznacit toto okno, aby sa nedalo zatvorit klavesou 'Zavri vsetky okna'
 STR_RESIZE_BUTTON                                               :{BLACK}Uchop a tahaj pre zmenu velkosti okna
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kliknutim sem sa presuniete do sucasneho vychodzieho adresara pre ukladanie
-STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Zburanie budov, cistenie terenu
-STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Znizit roh terenu
-STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Zvysit roh terenu
-STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Navigacna lista
+STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Demolácia budov, úprava terénu, ...
+STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Znížit roh terénu
+STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Zvýšit roh terénu
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Navigacná lišta
 STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}Navigacna lista - posuva vypis dolava/doprava
 STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Zobrazit vrstevnice na mape
-STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Zobrazit dopravne prostriedky na mape
+STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Zobrazit dopravné prostriedky na mape
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Zobrazit priemysel na mape
-STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Zobrazit dopravne trasy na mape
-STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Zobrazit vegetaciu na mape
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Zobrazit vlastnikov pozemkov na mape
-STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Zapnut / Vypnut nazvy miest na mape
-STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (posledny rok: {CURRENCY})
+STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Zobrazit dopravné trasy na mape
+STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Zobrazit vegetáciu na mape
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Zobrazit vlastníkov pozemkov na mape
+STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Zapnút / Vypnút názvy miest na mape
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (posledný rok: {CURRENCY})
 
 ############ range for service numbers starts
 STR_AGE                                                         :{COMMA} rok{P "" y ov} ({COMMA})
@@ -545,21 +545,21 @@ STR_019C_ROAD_VEHICLE                                           :{G=m}Automobil
 STR_019D_AIRCRAFT                                               :{G=s}Lietadlo
 STR_019E_SHIP                                                   :{G=z}Lod
 STR_019F_TRAIN                                                  :{G=m}Vlak
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} je star{G y a e}
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} je velmi star{G y a e}
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} je velmi star{G y a e} a potrebuje vymenit
-STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informacie o pozemku
-STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Naklady na odstranenie: {LTBLUE}N/A
-STR_01A5_COST_TO_CLEAR                                          :{BLACK}Naklady na odstranenie: {LTBLUE}{CURRENCY}
-STR_01A6_N_A                                                    :Nezname
-STR_01A7_OWNER                                                  :{BLACK}Vlastnik: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Miestna sprava: {LTBLUE}{STRING}
-STR_01A9_NONE                                                   :Nezname
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} je star{G ý á é}
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} je velmi star{G ý á é}
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} je velmi star{G ý á é} a potrebuje vymenit
+STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informácie o pozemku
+STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Náklady na odstránenie: {LTBLUE}N/A
+STR_01A5_COST_TO_CLEAR                                          :{BLACK}Náklady na odstránenie: {LTBLUE}{CURRENCY}
+STR_01A6_N_A                                                    :Neznáme
+STR_01A7_OWNER                                                  :{BLACK}Vlastník: {LTBLUE}{STRING}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Miestna správa: {LTBLUE}{STRING}
+STR_01A9_NONE                                                   :Neznáme
 STR_01AA_NAME                                                   :{BLACK}Meno
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
 
 ############ range for days starts
-STR_01AC_1ST                                                    :1
+STR_01AC_1ST                                                    :1/
 STR_01AD_2ND                                                    :2
 STR_01AE_3RD                                                    :3
 STR_01AF_4TH                                                    :4
@@ -678,16 +678,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} ziskal oznacenie '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} ziskal oznacenie '{STRING}' !
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Vytvorit scenar
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor scenarov
 STR_0223_LAND_GENERATION                                        :{WHITE}Generovanie uzemia
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Nahodne uzemie
+STR_0227_RESET_LAND                                             :{BLACK}Zresetovat uzemie
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Pre zvysenie/znizenie oblasti je potrebne zvacsit uzemie
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Pre zvysenie/znizenie oblasti je potrebne zmensit uzemie
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Vygenerovat nahodne uzemie
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Zresetovat uzemie
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Zresetovat Uzemie
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Pouzit vyskovu mapu
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Pouzit vyskovu mapu
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Si si isty ze chces zresetovat uzemie ?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Vytvorenie uzemia
 STR_022F_TOWN_GENERATION                                        :{BLACK}Vytvorenie mesta
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Vytvorenie priemyslu
@@ -1736,7 +1742,7 @@ STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}V meste {TOWN} zavladol dopravny chaos!{}{}Rekonstrukcia ciest financovana {COMPANY} prinesie 6 mesiacov utrpenia pre motoristov!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (v rekonstrukcii)
+STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (vo výstavbe)
 STR_2059_IGLOO                                                  :Iglu
 STR_205A_TEPEES                                                 :Vigvam
 STR_205B_TEAPOT_HOUSE                                           :Kaviaren
@@ -1955,7 +1961,7 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Nemozno
 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Tunel musi byt najskor zburany
 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Most musi byt najskor zburany
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Nemozno zacat a skoncit na tom istom mieste
-STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Pod mostom je potrebna voda alebo udolie
+STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Pod mostom je potrebná voda alebo údolie
 STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Zaciatok a koniec musi byt v rovine
 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}To miesto je nepouzitelne ako vstup do tunela
 STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
@@ -2828,7 +2834,7 @@ STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová ka
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nemozno prestavat lod...
 STR_9842_REFITTABLE                                             :(mozna prestavba)
 STR_GO_TO_SHIP_DEPOT                                            :Chod do {TOWN} Lodenice
-SERVICE_AT_SHIP_DEPOT                                           :Opravit v {TOWN} Lodenici
+SERVICE_AT_SHIP_DEPOT                                           :Opravit v {TOWN} lodenici
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Letiska
@@ -2902,7 +2908,7 @@ STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vybrat ty
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING}{}{BLACK}Náklady na prestavbu: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nie je mozne prestavat na novy typ nakladu ...
 STR_GO_TO_AIRPORT_HANGAR                                        :Chod do {STATION} Hangaru
-SERVICE_AT_AIRPORT_HANGAR                                       :Opravit v {STATION} Hangare
+SERVICE_AT_AIRPORT_HANGAR                                       :Opravit v {STATION} hangári
 
 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Zeppelin zniceny pri nehode na {STATION}!

lang/slovenian.txt

@@ -2,7 +2,7 @@
 ##ownname Slovenščina
 ##isocode sl_SL
 ##plural 8
-##case r d t 3sk
+##case r d t
 
 ##id 0x0000
 STR_NULL                                                        :
@@ -656,16 +656,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} dosega naslov '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} iz podjetja {COMPANY} prejema naslov '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Ustvari Scenarij
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Urejevalnik scenarijev
 STR_0223_LAND_GENERATION                                        :{WHITE}Generator terena
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Nakljucni teren
+STR_0227_RESET_LAND                                             :{BLACK}Ponastavi teren
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Povečaj območje za nižanje/višanje terena
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zmanjšaj območje za nižanje/višanje terena
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Ustvari naključni teren
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Zbriši pokrajino
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Zbriši pokrajino
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Uporabi višinsko karto
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Uporabi višinsko karto
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Zagotovo zelis uniciti pokrajino?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generator pokrajine
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generator mest
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generator industrije
@@ -1864,8 +1870,6 @@ STR_4801                                                        :{WHITE}{INDUSTR
 STR_4802_COAL_MINE                                              :Premogovnik
 STR_4802_COAL_MINE.r                                            :Premogovnika
 STR_4803_POWER_STATION                                          :Termo elektrarna
-STR_4803_POWER_STATION.3sk                                      :Termo elektrarni
-STR_4803_POWER_STATION.r                                        :Termo elektrarne
 STR_4804_SAWMILL                                                :Žaga
 STR_4804_SAWMILL.r                                              :Žage
 STR_4805_FOREST                                                 :Gozd
@@ -3033,9 +3037,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Prikaz v
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}Prodaj
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Pripravljas se na prodajo vseh vozil v garazi.
 STR_ARE_YOU_SURE                                                :{BLACK}Zagotovo?
 
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Potrditev prodaje vseh vlakov v garazi
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Potrditev prodaje vseh cestnih vozil v garazi
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Potrditev prodaje vseh ladij v garazi
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Potrditev prodaje vseh letal v hangarju
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Preklic prodaje vseh vlakov v garazi
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Preklic prodaje vseh cestnih vozil v garazi
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Preklic prodaje vseh ladij v garazi
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Preklic prodaje vseh letal v hangarju
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Prodaj vse vlake v garaži
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Prodaj vsa vestna vozila v garaži
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Prodaj vse ladje v garaži

lang/spanish.txt

@@ -615,16 +615,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} logra el estado '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} logra el estado '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Crear Escenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de escenarios
 STR_0223_LAND_GENERATION                                        :{WHITE}Generación de terrenos
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Terreno al azar
+STR_0227_RESET_LAND                                             :{BLACK}Reponer terreno
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumentar el tamaño del bloque de terreno a bajar/subir
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Reducir tamaño del bloque de terreno a bajar/subir
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generar terreno al azar
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Hacer reset del paisaje
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Hacer reset del paisaje
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Usar Mapa de alturas
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Usar Mapa de alturas
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}¿Está seguro que desea realizar un reset al paisaje?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generación de paisaje
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generación de poblaciones
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generación de industria
@@ -1695,7 +1701,7 @@ STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}No se pu
 STR_2806                                                        :{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...demasiadas señales
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}No se puede colocar una señal aquí...
-STR_280A_SIGN                                                   :
+STR_280A_SIGN                                                   :Señal
 STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Editar texto de la señal
 STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}No se puede cambiar el nombre de la señal...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Seleccione el tipo de árboles a plantar

lang/swedish.txt

@@ -295,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nytt spe
 STR_0141_LOAD_GAME                                              :{BLACK}Ladda spel
 STR_SINGLE_PLAYER                                               :{BLACK}En spelare
 STR_MULTIPLAYER                                                 :{BLACK}Flera spelare
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenario editor
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -613,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} uppnår '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} från {COMPANY} uppnår '{STRING}' status!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Nytt scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario-editor
 STR_0223_LAND_GENERATION                                        :{WHITE}Skapa mark
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Slumpmässig mark
+STR_0227_RESET_LAND                                             :{BLACK}Återställ mark
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Öka storlek av yta att höja/sänka
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Minska storlek av yta att höja/sänka
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generera slumpmässig mark
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Återställ landskapet
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Återställ landskapet
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Använd höjdkarta
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Använd höjdkarta
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Vill du verkligen återställa landskapet?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Skapa landskap
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bygg städer
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Bygg industrier
@@ -1412,6 +1419,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientli
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Inget nätverkskort funnet eller så är spelet kompilerat utan ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kunde inte hitta några nätverksspel
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Servern svarade inte på förfrågan
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kunde inte ansluta på grund av att NewGRF är omaka
 STR_NETWORK_ERR_DESYNC                                          :{WHITE}Nätverk, Spelsynkronisering misslyckades
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Nätverk, koppling förlorad
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunde inte ladda det sparade spelet från servern
@@ -1433,6 +1441,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniserings
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kunde inte ladda kartan
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :anslutning förlorad
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollfel
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF är omaka
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :inte godkänd
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottog konstigt paket
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :fel revision

lang/traditional_chinese.txt

@@ -46,7 +46,7 @@ STR_0026_CANDY                                                  :糖果
 STR_0027_COLA                                                   :可樂
 STR_0028_COTTON_CANDY                                           :棉花糖
 STR_0029_BUBBLES                                                :泡泡
-STR_002A_TOFFEE                                                 :乳脂糖
+STR_002A_TOFFEE                                                 :太妃糖
 STR_002B_BATTERIES                                              :電池
 STR_002C_PLASTIC                                                :塑膠
 STR_002D_FIZZY_DRINKS                                           :汽水
@@ -78,7 +78,7 @@ STR_0046_CANDY                                                  :糖果
 STR_0047_COLA                                                   :可樂
 STR_0048_COTTON_CANDY                                           :棉花糖
 STR_0049_BUBBLE                                                 :泡泡
-STR_004A_TOFFEE                                                 :乳脂糖
+STR_004A_TOFFEE                                                 :太妃糖
 STR_004B_BATTERY                                                :電池
 STR_004C_PLASTIC                                                :塑膠
 STR_004D_FIZZY_DRINK                                            :汽水
@@ -110,7 +110,7 @@ STR_QUANTITY_SWEETS                                             :{COMMA}包糖
 STR_QUANTITY_COLA                                               :{VOLUME}可樂
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT}棉花糖
 STR_QUANTITY_BUBBLES                                            :{COMMA}泡泡
-STR_QUANTITY_TOFFEE                                             :{WEIGHT}乳脂糖
+STR_QUANTITY_TOFFEE                                             :{WEIGHT}太妃糖
 STR_QUANTITY_BATTERIES                                          :{COMMA}顆電池
 STR_QUANTITY_PLASTIC                                            :{VOLUME}塑膠
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA}杯汽水
@@ -142,7 +142,7 @@ STR_ABBREV_SWEETS                                               :{TINYFONT}糖
 STR_ABBREV_COLA                                                 :{TINYFONT}可
 STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}棉
 STR_ABBREV_BUBBLES                                              :{TINYFONT}泡
-STR_ABBREV_TOFFEE                                               :{TINYFONT}乳
+STR_ABBREV_TOFFEE                                               :{TINYFONT}太
 STR_ABBREV_BATTERIES                                            :{TINYFONT}電
 STR_ABBREV_PLASTIC                                              :{TINYFONT}膠
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}汽
@@ -155,7 +155,7 @@ STR_00B1_GAME_OPTIONS                                           :{WHITE}遊戲
 STR_00B2_MESSAGE                                                :{YELLOW}訊息
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}來自{STRING}的訊息
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}注意！
-STR_00B4_CAN_T_DO_THIS                                          :{WHITE}不能執行以下命令....
+STR_00B4_CAN_T_DO_THIS                                          :{WHITE}不能執行以下動作....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}不能清除這個地段....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}原著作權為{COPYRIGHT} 1995 Chris Sawyer, 版權所有
 STR_00B7_VERSION                                                :{BLACK}OpenTTD 版本 {REV}
@@ -167,7 +167,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}離開
 STR_00C8_YES                                                    :{BLACK}是
 STR_00C9_NO                                                     :{BLACK}否
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}你是否確認放棄進行中的遊戲並回到{STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}你要放棄遊戲並回到 {STRING} 嗎?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -194,7 +194,7 @@ STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}遊戲
 STR_00E2                                                        :{BLACK}{COMMA}
 STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}位置
-STR_00E5_CONTOURS                                               :輪廓
+STR_00E5_CONTOURS                                               :地形
 STR_00E6_VEHICLES                                               :交通工具
 STR_00E7_INDUSTRIES                                             :工業
 STR_00E8_ROUTES                                                 :路線
@@ -210,12 +210,12 @@ STR_00F1_200M                                                   :{BLACK}{TINYFON
 STR_00F2_300M                                                   :{BLACK}{TINYFONT}300米
 STR_00F3_400M                                                   :{BLACK}{TINYFONT}400米
 STR_00F4_500M                                                   :{BLACK}{TINYFONT}500米
-STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}路軌列車
+STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}列車
 STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}公車/貨車
 STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}輪船
 STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}飛機
 STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}運輸路線
-STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}煤礦
+STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}煤礦場
 STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}發電廠
 STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}森林
 STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}鋸木廠
@@ -246,11 +246,11 @@ STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFON
 STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}塑膠噴泉
 STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}汽水工廠
 STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}泡泡生產器
-STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}奶糖採礦場
-STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}砂糖礦
+STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}太妃糖採礦場
+STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}砂糖礦場
 STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}列車站
 STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}貨車裝卸站
-STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}巴士站
+STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}公車站
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}機場/直昇機場
 STR_011F_DOCK                                                   :{BLACK}{TINYFONT}碼頭
 STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}泥地
@@ -270,10 +270,10 @@ STR_012D                                                        :{WHITE}{STRING}
 STR_012E_CANCEL                                                 :{BLACK}取消
 STR_012F_OK                                                     :{BLACK}確定
 STR_0130_RENAME                                                 :{BLACK}更名
-STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}已定議過多名稱
+STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}已定義過多名稱
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}所選名稱已被使用
 
-STR_0133_WINDOWS                                                :視窗
+STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
 STR_0135_OSX                                                    :OS X
 STR_OSNAME_BEOS                                                 :BeOS
@@ -282,10 +282,10 @@ STR_OSNAME_AMIGAOS                                              :AmigaOS
 STR_OSNAME_OS2                                                  :OS/2
 
 STR_013B_OWNED_BY                                               :{WHITE}...已被{STRING}擁有
-STR_013C_CARGO                                                  :{BLACK}貨櫃
+STR_013C_CARGO                                                  :{BLACK}貨物
 STR_013D_INFORMATION                                            :{BLACK}資訊
 STR_013E_CAPACITIES                                             :{BLACK}載量
-STR_013E_TOTAL_CARGO                                            :{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}此列車的總載量:
@@ -309,7 +309,7 @@ STR_0148_GAME_OPTIONS                                           :{BLACK}遊戲
 
 STR_0150_SOMEONE                                                :某人{SKIP}{SKIP}
 STR_0151_MAP_OF_WORLD                                           :世界地圖
-STR_0152_TOWN_DIRECTORY                                         :市鎮指南
+STR_0152_TOWN_DIRECTORY                                         :市鎮目錄
 STR_0153_SUBSIDIES                                              :補貼
 
 STR_UNITS_IMPERIAL                                              :英制
@@ -345,12 +345,12 @@ STR_UNITS_FORCE_METRIC                                          :{COMMA} 噸力
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 ############ range for menu starts
-STR_0154_OPERATING_PROFIT_GRAPH                                 :營運利益報表
-STR_0155_INCOME_GRAPH                                           :收入報表
-STR_0156_DELIVERED_CARGO_GRAPH                                  :已運載量報表
-STR_0157_PERFORMANCE_HISTORY_GRAPH                              :業績歷史報表
-STR_0158_COMPANY_VALUE_GRAPH                                    :公司市值報表
-STR_0159_CARGO_PAYMENT_RATES                                    :貨物收費報表
+STR_0154_OPERATING_PROFIT_GRAPH                                 :營運利益圖表
+STR_0155_INCOME_GRAPH                                           :收入圖表
+STR_0156_DELIVERED_CARGO_GRAPH                                  :已運載量圖表
+STR_0157_PERFORMANCE_HISTORY_GRAPH                              :業績歷史圖表
+STR_0158_COMPANY_VALUE_GRAPH                                    :公司市值圖表
+STR_0159_CARGO_PAYMENT_RATES                                    :貨物收費圖表
 STR_015A_COMPANY_LEAGUE_TABLE                                   :公司排行榜
 STR_PERFORMANCE_DETAIL_MENU                                     :詳細營運數據
 ############ range for menu ends
@@ -360,6 +360,7 @@ STR_015C_SAVE_GAME                                              :儲存遊戲
 STR_015D_LOAD_GAME                                              :載入遊戲
 STR_015E_QUIT_GAME                                              :放棄遊戲
 STR_015F_QUIT                                                   :離開
+STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}你是否確認放棄進行中的遊戲?
 STR_0161_QUIT_GAME                                              :{WHITE}放棄遊戲
 STR_SORT_ORDER_TIP                                              :{BLACK}選擇排序 (逆序/順序)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}選擇排序項目
@@ -369,8 +370,8 @@ STR_SORT_BY_POPULATION                                          :{BLACK}人口
 STR_SORT_BY_PRODUCTION                                          :{BLACK}產量
 STR_SORT_BY_TYPE                                                :{BLACK}種類
 STR_SORT_BY_TRANSPORTED                                         :{BLACK}輸出量
-STR_SORT_BY_NAME                                                :{BLACK}名字
-STR_SORT_BY_DROPDOWN_NAME                                       :名字
+STR_SORT_BY_NAME                                                :{BLACK}名稱
+STR_SORT_BY_DROPDOWN_NAME                                       :名稱
 STR_SORT_BY_DATE                                                :{BLACK}日期
 STR_SORT_BY_NUMBER                                              :編號
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :上年盈利
@@ -420,7 +421,7 @@ STR_0169_AUG                                                    :八月
 STR_016A_SEP                                                    :九月
 STR_016B_OCT                                                    :十月
 STR_016C_NOV                                                    :十一月
-STR_016D_DEC                                                    :十一月
+STR_016D_DEC                                                    :十二月
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
@@ -428,22 +429,22 @@ STR_016F                                                        :{TINYFONT}{STRI
 STR_0170                                                        :{TINYFONT}{STRING}-
 STR_0171_PAUSE_GAME                                             :{BLACK}暫停遊戲
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}儲存遊戲, 於棄遊戲, 離開
-STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}展示公司各車站列表
-STR_0174_DISPLAY_MAP                                            :{BLACK}展示地圖
-STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}展示地圖和市鎮指南
-STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}展示市鎮指南
-STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}展示公司財務資訊
-STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}展示公司一般資訊
-STR_0179_DISPLAY_GRAPHS                                         :{BLACK}展示圖表
-STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}展示公司排行榜
-STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}展示公司擁有的列車
-STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}展示公司擁有的巴士與貨車
-STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}展示公司擁有的輪船
-STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}展示公司擁有的飛機
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}顯示公司各車站列表
+STR_0174_DISPLAY_MAP                                            :{BLACK}顯示地圖
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}顯示地圖和市鎮目錄
+STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}顯示市鎮目錄
+STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}顯示公司財務資訊
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}顯示公司一般資訊
+STR_0179_DISPLAY_GRAPHS                                         :{BLACK}顯示圖表
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}顯示公司排行榜
+STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}顯示公司擁有的列車
+STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}顯示公司擁有的巴士與貨車
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}顯示公司擁有的輪船
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}顯示公司擁有的飛機
 STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}拉近視域
 STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}拉遠視域
-STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}建造路軌
-STR_0182_BUILD_ROADS                                            :{BLACK}建造道路
+STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}鋪設路軌
+STR_0182_BUILD_ROADS                                            :{BLACK}鋪設道路
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}興建碼頭設施
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}興建機場設施
 STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}植樹
@@ -460,9 +461,9 @@ STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}跳到
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}於一格土地上拆卸建築物等
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}下降土地上的一角
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}上昇土地上的一角
-STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}捲動棒 - 上下捲動清單
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}捲軸 - 上下捲動清單
 STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}捲動棒 - 左右捲動清單
-STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}於地圖上顯示土地輪廓
+STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}於地圖上顯示地形
 STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}於地圖上顯示交通公具
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}於地圖上顯示各種工業
 STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}於地圖上顯示運輸路線
@@ -478,11 +479,11 @@ STR_AGE_RED                                                     :{RED}{COMMA}
 
 STR_019C_ROAD_VEHICLE                                           :巴士/貨車
 STR_019D_AIRCRAFT                                               :飛機
-STR_019E_SHIP                                                   :輪船
+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}
@@ -582,7 +583,7 @@ STR_01FF                                                        :{TINYFONT}{BLAC
 STR_0200_LAST_MESSAGE_NEWS_REPORT                               :上一次訊息或新聞報告
 STR_0201_MESSAGE_SETTINGS                                       :訊息設定
 STR_MESSAGE_HISTORY_MENU                                        :訊息紀錄
-STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}展示「上一次訊息或新聞報告」、「展示訊息」選項
+STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}展示「上一次訊息或新聞報告」、「顯示訊息」選項
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}訊息選項
 STR_0205_MESSAGE_TYPES                                          :{BLACK}訊息種類:
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}首個交通工具已到達玩家的車站
@@ -590,8 +591,8 @@ STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}首個
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}意外 / 災難
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}公司資訊
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}經濟氣候變化
-STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}給玩家的運載工具的建議或資訊
-STR_020C_NEW_VEHICLES                                           :{YELLOW}新運載工具
+STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}給玩家的載具的建議或資訊
+STR_020C_NEW_VEHICLES                                           :{YELLOW}新載具
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}接收貨物的改動
 STR_020E_SUBSIDIES                                              :{YELLOW}資助
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}一般資訊
@@ -613,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY}達成'{STRING}的地位'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} 的 {COMPANY} 達成 '{STRING}' 地位!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}建立新場景
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}場景編輯器
 STR_0223_LAND_GENERATION                                        :{WHITE}產生地形
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}隨機地形
+STR_0227_RESET_LAND                                             :{BLACK}重設地形
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}增加地形升降的範圍
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}減少地形升降的範圍
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}產生隨機地形
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}重設地形
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}重設地形
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}使用高度圖
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}使用高度圖
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}你是否確認放棄要重設地形?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}產生地形
 STR_022F_TOWN_GENERATION                                        :{BLACK}產生市鎮
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}產生工業
@@ -631,7 +638,7 @@ STR_0233_TOWN_GENERATION                                        :{WHITE}產生
 STR_0234_NEW_TOWN                                               :{BLACK}新的市鎮
 STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}建造新的市鎮
 STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}不能建造市鎮...
-STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...太接近地圖邊帶
+STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...太接近地圖邊緣
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...太接近另一個市鎮
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...地點不適合
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...已有太多市鎮
@@ -642,7 +649,7 @@ 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_0240_COAL_MINE                                              :{BLACK}煤礦場
 STR_0241_POWER_STATION                                          :{BLACK}發電廠
 STR_0242_SAWMILL                                                :{BLACK}鋸木場
 STR_0243_FOREST                                                 :{BLACK}森林
@@ -651,20 +658,20 @@ 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_0249_IRON_ORE_MINE                                          :{BLACK}鐵礦場
 STR_024A_OIL_WELLS                                              :{BLACK}油井
 STR_024B_BANK                                                   :{BLACK}銀行
 STR_024C_PAPER_MILL                                             :{BLACK}造紙廠
 STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}食物加工廠
 STR_024E_PRINTING_WORKS                                         :{BLACK}印刷廠
-STR_024F_GOLD_MINE                                              :{BLACK}金礦
-STR_0250_LUMBER_MILL                                            :{BLACK}Lumber Mill
+STR_024F_GOLD_MINE                                              :{BLACK}金礦場
+STR_0250_LUMBER_MILL                                            :{BLACK}伐木場
 STR_0251_FRUIT_PLANTATION                                       :{BLACK}水果莊園
 STR_0252_RUBBER_PLANTATION                                      :{BLACK}橡膠莊園
 STR_0253_WATER_SUPPLY                                           :{BLACK}供水站
 STR_0254_WATER_TOWER                                            :{BLACK}水塔
-STR_0255_DIAMOND_MINE                                           :{BLACK}鑽石礦
-STR_0256_COPPER_ORE_MINE                                        :{BLACK}銅礦
+STR_0255_DIAMOND_MINE                                           :{BLACK}鑽石礦場
+STR_0256_COPPER_ORE_MINE                                        :{BLACK}銅礦場
 STR_0257_COTTON_CANDY_FOREST                                    :{BLACK}棉花糖森林
 STR_0258_CANDY_FACTORY                                          :{BLACK}糖果工廠
 STR_0259_BATTERY_FARM                                           :{BLACK}電池農場
@@ -674,9 +681,9 @@ STR_025C_TOY_FACTORY                                            :{BLACK}玩具
 STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}塑膠噴泉
 STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}汽水廠
 STR_025F_BUBBLE_GENERATOR                                       :{BLACK}泡泡工場
-STR_0260_TOFFEE_QUARRY                                          :{BLACK}奶糖礦場
-STR_0261_SUGAR_MINE                                             :{BLACK}砂糖礦
-STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}興建煤碳礦場
+STR_0260_TOFFEE_QUARRY                                          :{BLACK}太妃糖礦場
+STR_0261_SUGAR_MINE                                             :{BLACK}砂糖礦場
+STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}興建煤礦場
 STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}興建發電廠
 STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}興建鋸木廠
 STR_0265_PLANT_FOREST                                           :{BLACK}植林
@@ -691,7 +698,7 @@ STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}開設
 STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}興建造紙廠
 STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}興建食物加工廠
 STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}興建印刷廠
-STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}興建黃金礦場
+STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}興建金礦場
 STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}開設銀行 (只能在市鎮內開設)
 STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}興建鋸木廠 (砍伐雨林出產木材)
 STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}種植蔬果園
@@ -709,10 +716,10 @@ STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}興建
 STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}興建塑膠噴泉
 STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}興建汽水工廠
 STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}興建泡泡產生器
-STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}興建太妃糖礦
+STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}興建太妃糖礦場
 STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}興建砂糖礦場
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}不能在這裡建造 {STRING} ...
-STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...市鎮應該要先被建造
+STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...先要建造市鎮
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...每個市鎮僅允許一個
 STR_0288_PLANT_TREES                                            :{BLACK}植樹
 STR_0289_PLACE_SIGN                                             :{BLACK}設置標誌
@@ -736,6 +743,7 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}儲存
 STR_029A_PLAY_SCENARIO                                          :{BLACK}以此場景開始
 STR_PLAY_HEIGHTMAP                                              :{BLACK}玩高度圖
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}以高度圖為地形開始新遊戲
+STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}你是否確認放棄要編輯中的場景?
 STR_029C_QUIT_EDITOR                                            :{WHITE}離開編輯器
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...只能在市鎮人口超過 1200 人的地方建造
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}將開始時間提早一年
@@ -766,7 +774,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :遊戲選項
 STR_02C5_DIFFICULTY_SETTINGS                                    :難易設定
-STR_02C7_CONFIG_PATCHES                                         :設定補綴
+STR_02C7_CONFIG_PATCHES                                         :設置修正
 STR_NEWGRF_SETTINGS                                             :NewGRF 設定
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}顯示市鎮名稱
@@ -805,7 +813,7 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}將主
 
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}貨幣單位
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
-STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}貨幣單位
+STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}選擇貨幣單位
 STR_MEASURING_UNITS                                             :{BLACK}量度單位
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}量度單位
@@ -873,7 +881,7 @@ STR_TOWNNAME_FRENCH                                             :法國
 STR_TOWNNAME_GERMAN                                             :德國
 STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :英國 (增訂版)
 STR_TOWNNAME_LATIN_AMERICAN                                     :拉丁美洲
-STR_TOWNNAME_SILLY                                              :荒唐名字
+STR_TOWNNAME_SILLY                                              :荒唐名稱
 STR_TOWNNAME_SWEDISH                                            :瑞典
 STR_TOWNNAME_DUTCH                                              :荷蘭
 STR_TOWNNAME_FINNISH                                            :芬蘭
@@ -1172,9 +1180,9 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}選擇
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
 STR_WAYPOINT_RAW                                                :{WAYPOINT}
-STR_EDIT_WAYPOINT_NAME                                          :{WHITE}更改路標名字
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}更改路標名稱
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}不能更改路標名字
+STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}不能更改路標名稱
 STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}將路軌變為路標
 STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}不能建立鐵路路標
 STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}不能移除鐵路路標
@@ -1455,7 +1463,7 @@ STR_NETWORK_CHAT_CLIENT                                         :[私人] {STRIN
 STR_NETWORK_CHAT_TO_CLIENT                                      :[私人] 給 {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[全員] :
 STR_NETWORK_CHAT_ALL                                            :[全員] {STRING}: {GRAY}{STRING}
-STR_NETWORK_NAME_CHANGE                                         :將自己的名字改為
+STR_NETWORK_NAME_CHANGE                                         :將自己的名稱改為
 STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} 伺服器關閉連線
 STR_NETWORK_SERVER_REBOOT                                       :{WHITE} 伺服器正在重新啟動...{}請稍候...
 
@@ -1518,10 +1526,10 @@ STR_1004_TOO_HIGH                                               :{WHITE}太高
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}沒有適合的鐵路軌道
 STR_1007_ALREADY_BUILT                                          :{WHITE}...已經建了
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}必須先移除鐵道
-STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}建造鐵道
+STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}鋪設鐵道
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}建造電氣化鐵道
-STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}建造單軌
-STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}建造磁浮軌
+STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}鋪設單軌
+STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}鋪設磁浮軌
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}選擇鐵道橋樑
 STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}不能在這邊建築鐵道機廠...
 STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}不能在這邊建築鐵道車站...
@@ -1530,11 +1538,11 @@ STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}不能
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}不能從這邊移除鐵道...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}不能從這邊移除號誌...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}鐵道機廠方向
-STR_1015_RAILROAD_CONSTRUCTION                                  :建築鐵道
+STR_1015_RAILROAD_CONSTRUCTION                                  :鋪設鐵道
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :建造電氣化鐵道
-STR_1016_MONORAIL_CONSTRUCTION                                  :建築單軌
-STR_1017_MAGLEV_CONSTRUCTION                                    :建築磁浮軌
-STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}建築鐵軌
+STR_1016_MONORAIL_CONSTRUCTION                                  :鋪設單軌
+STR_1017_MAGLEV_CONSTRUCTION                                    :鋪設磁浮軌
+STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}鋪設鐵軌
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}建築鐵路機廠 (用來建造、維修列車)
 STR_101A_BUILD_RAILROAD_STATION                                 :{BLACK}建築鐵道車站
 STR_101B_BUILD_RAILROAD_SIGNALS                                 :{BLACK}建築鐵道號誌
@@ -1556,16 +1564,16 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :有綜合號誌
 ##id 0x1800
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}必須先移除道路
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}道路施工中
-STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}建築道路
+STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}鋪設道路
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}選擇道路橋樑
-STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}不能在此建築道路...
+STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}不能在此鋪設道路...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}不能從此移除道路...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}車庫方向
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}不能在此建築車庫...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}無法建築公車站...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}無法建築貨運站...
-STR_180A_ROAD_CONSTRUCTION                                      :建築道路
-STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}建築一段公路
+STR_180A_ROAD_CONSTRUCTION                                      :鋪設道路
+STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}鋪設一段公路
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}建築車庫 (用來製造與維護公路車輛)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}建築公車站
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}建築貨運站
@@ -1601,22 +1609,22 @@ STR_200F_TALL_OFFICE_BLOCK                                      :摩天辦公大
 STR_2010_OFFICE_BLOCK                                           :辦公大樓
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :平房
 STR_2012_CHURCH                                                 :教堂
-STR_2013_LARGE_OFFICE_BLOCK                                     :大辦公區
+STR_2013_LARGE_OFFICE_BLOCK                                     :大型辦公大樓
 STR_2014_TOWN_HOUSES                                            :住宅
 STR_2015_HOTEL                                                  :旅館
 STR_2016_STATUE                                                 :雕像
 STR_2017_FOUNTAIN                                               :噴泉
 STR_2018_PARK                                                   :公園
-STR_2019_OFFICE_BLOCK                                           :辦公區
+STR_2019_OFFICE_BLOCK                                           :辦公大樓
 STR_201A_SHOPS_AND_OFFICES                                      :店舖與公司
 STR_201B_MODERN_OFFICE_BUILDING                                 :現代辦公建築
 STR_201C_WAREHOUSE                                              :倉庫
 STR_201D_OFFICE_BLOCK                                           :辦公區
 STR_201E_STADIUM                                                :體育館
 STR_201F_OLD_HOUSES                                             :老舊房屋
-STR_2020_LOCAL_AUTHORITY                                        :{BLACK}區域當局
-STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}顯示區域當局資訊
-STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} 區域當局
+STR_2020_LOCAL_AUTHORITY                                        :{BLACK}地方政府
+STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}顯示地方政府資訊
+STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} 地方政府
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}運輸公司評比:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}補助
@@ -1630,11 +1638,11 @@ STR_202D_UNTIL                                                  :{YELLOW}, 補
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}補助過期:{}{}將 {STRING} 從 {STRING} 運到 {STRING} 從此不再提供補助。
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}補助結束:{}{}將 {STRING} 從 {STATION} 運到 {STATION} 不再提供補助。
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}提供補助:{}{}首先將 {STRING} 從 {STRING} 運到 {STRING} 的公司將得到區域當局補助一年！
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年得到額外 50% 的運費補助！
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年收到雙倍運費！
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年收到三倍運費！
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年收到四倍運費！
-STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} 區域當局拒絕在城內建造另一座機場
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年得到額外 50% 的運費補助！
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年收到雙倍運費！
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年收到三倍運費！
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} 獲得補助！{}{}將 {STRING} 從 {STATION} 運到 {STATION} 的服務可在往後一年收到四倍運費！
+STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} 地方政府拒絕在城內建造另一座機場
 STR_2036_COTTAGES                                               :農舍
 STR_2037_HOUSES                                                 :住宅
 STR_2038_FLATS                                                  :平房
@@ -1748,8 +1756,8 @@ STR_3048_STATIONS                                               :{WHITE}{COMPANY
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- 無 -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...地點不適合
-STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}太靠近另一個船塢
-STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}必須先摧毀船塢
+STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}太靠近另一個碼頭
+STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}必須先摧毀碼頭
 STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}選擇鐵道車站方向
 STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}選擇鐵道車站的月台數量
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}選擇鐵道車站的長度
@@ -1772,7 +1780,7 @@ STR_3063_SHIP_DOCK                                              :船塢
 STR_3064_HIGHLIGHT_COVERAGE_AREA                                :{BLACK}顯示建築地點的運輸涵蓋範圍
 STR_3065_DON_T_HIGHLIGHT_COVERAGE                               :{BLACK}不顯示建築地點的運輸涵蓋範圍
 STR_3066_COVERAGE_AREA_HIGHLIGHT                                :{BLACK}顯示運輸涵蓋範圍
-STR_3068_DOCK                                                   :{WHITE}船塢
+STR_3068_DOCK                                                   :{WHITE}碼頭
 STR_3069_BUOY                                                   :浮標
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...被浮標擋住
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...車站範圍太大
@@ -1842,7 +1850,7 @@ STR_4818_WATER_TOWER                                            :水塔
 STR_4819_FACTORY                                                :工廠
 STR_481A_FARM                                                   :農場
 STR_481B_LUMBER_MILL                                            :伐木場
-STR_481C_COTTON_CANDY_FOREST                                    :太妃糖森林
+STR_481C_COTTON_CANDY_FOREST                                    :綿花糖森林
 STR_481D_CANDY_FACTORY                                          :甜點工廠
 STR_481E_BATTERY_FARM                                           :電池農場
 STR_481F_COLA_WELLS                                             :可樂井
@@ -1878,8 +1886,8 @@ STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} 產量減半
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}{INDUSTRY} 遇到蟲害！{}產量減半
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...只能位於地圖邊緣
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} 在 {INDUSTRY} 的產量上升 {COMMA}%！
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} 在 {INDUSTRY} 的產量減少 {COMMA}%！
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{1:INDUSTRY}的{0:STRING}產量上升 {2:COMMA}%！
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{1:INDUSTRY}的{0:STRING}產量減少 {2:COMMA}%！
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}隧道內有列車
@@ -1957,7 +1965,7 @@ STR_SV_STNAME_EXCHANGE                                          :{STRING} 轉運
 STR_SV_STNAME_AIRPORT                                           :{STRING} 機場
 STR_SV_STNAME_OILFIELD                                          :{STRING} 油田
 STR_SV_STNAME_MINES                                             :{STRING} 礦場
-STR_SV_STNAME_DOCKS                                             :{STRING} 船塢
+STR_SV_STNAME_DOCKS                                             :{STRING} 碼頭
 STR_SV_STNAME_BUOY_1                                            :{STRING} 一號浮標
 STR_SV_STNAME_BUOY_2                                            :{STRING} 二號浮標
 STR_SV_STNAME_BUOY_3                                            :{STRING} 三號浮標
@@ -2470,7 +2478,7 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Sikorsky 直升
 STR_80FE_GURU_X2_HELICOPTER                                     :Lockheed X2 直升機
 STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut 直升機
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}運具製造商的訊息
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}我們剛設計了一種新 {STRING} - 您有興趣獨家使用它一年，讓我們在正式發佈之前觀察它的表現嗎？
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}我們剛設計了一種新{STRING} - 您有興趣獨家使用它一年，讓我們在正式發佈之前觀察它的表現嗎？
 STR_8102_RAILROAD_LOCOMOTIVE                                    :鐵道機車頭
 STR_8103_ROAD_VEHICLE                                           :汽車
 STR_8104_AIRCRAFT                                               :飛機
@@ -2692,9 +2700,9 @@ STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}無法
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}選擇汽車要運送的酬載種類
 
 ##id 0x9800
-STR_9800_DOCK_CONSTRUCTION                                      :建造船塢
-STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}建造船塢
-STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}無法在此建造船塢...
+STR_9800_DOCK_CONSTRUCTION                                      :建造碼頭
+STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}建造碼頭
+STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}無法在此建造碼頭...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} 船塢
 STR_9804_NEW_SHIPS                                              :{BLACK}購買船舶
 STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - 船舶 {COMMA} 艘
@@ -2723,7 +2731,7 @@ STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正前
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船塢維護中
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船塢維護中, {VELOCITY}
 STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}船舶 {COMMA} 已在船塢待命
-STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}建造船塢
+STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}建造碼頭
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}建造船塢 (用以購買/維護船舶)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}船舶 - 點選船舶可看到詳細資訊
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}購買新船舶
@@ -2762,7 +2770,7 @@ STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}新容
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}無法改裝船舶...
 STR_9842_REFITTABLE                                             :(可改裝)
 STR_GO_TO_SHIP_DEPOT                                            :前往 {TOWN} 船塢
-SERVICE_AT_SHIP_DEPOT                                           :在{TOWN}船廠進行維修
+SERVICE_AT_SHIP_DEPOT                                           :在{TOWN}船塢進行維修
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}機場
@@ -2950,6 +2958,20 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}顯示
 
 ### depot strings
 
+STR_SELL                                                        :{BLACK}出售
+STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}你將要出售所有停泊地維修廠內的運具
+STR_ARE_YOU_SURE                                                :{BLACK}你是否確定要這樣做?
+
+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}確定出售所有停泊在機廠內的列車
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}確定出售所有停泊在車庫內的車輛
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}確定出售所有停靠在船塢內的船舶
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}確定出售所有停泊在飛機棚內的飛機
+
+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}取消出售所有停泊在機廠內的列車
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}取消出售所有停泊在車庫內的車輛
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}取消出售所有停靠在船塢內的船舶
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}取消出售所有停泊在飛機棚內的飛機
+
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}出售機廠内所有列車
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}出售車庫内所有汽車
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}出售船塢内所有船舶

lang/turkish.txt

@@ -614,16 +614,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} '{STRING}' ünvanını kazandı!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} - {COMPANY} '{STRING}' unvanını kazandı!
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Senaryo Yap
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Senaryo Editörü
 STR_0223_LAND_GENERATION                                        :{WHITE}Yer Yapımı
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Rastgele Yerler
+STR_0227_RESET_LAND                                             :{BLACK}Yerleri Sıfırla
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}yükseltme/alçaltma alanını arttır
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}yükseltme/alçaltma alanını arttır
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Rastgele harita yap
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Haritayı sıfırla
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Haritayı Sıfırla
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Yükseklik Haritasi Kullan
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Yükseklik Haritasi Kullan
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Her taraf su olsun mu?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Harita yapımı
 STR_022F_TOWN_GENERATION                                        :{BLACK}Şehir yapımı
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Fabrika yapımı

lang/ukrainian.txt

@@ -23,38 +23,55 @@ STR_000D_ACCEPTS                                                :{BLACK}Прий
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :пасажири
 STR_000F_PASSENGERS.r                                           :пасажирів
+STR_000F_PASSENGERS.z                                           :пасажирів
 STR_0010_COAL                                                   :вугілля
 STR_0010_COAL.r                                                 :вугілля
-STR_0011_MAIL                                                   :пошту
+STR_0010_COAL.z                                                 :вугілля
+STR_0011_MAIL                                                   :пошта
 STR_0011_MAIL.r                                                 :пошти
-STR_0012_OIL                                                    :нафту
+STR_0011_MAIL.z                                                 :пошту
+STR_0012_OIL                                                    :нафта
 STR_0012_OIL.r                                                  :нафти
-STR_0013_LIVESTOCK                                              :тварин
+STR_0012_OIL.z                                                  :нафту
+STR_0013_LIVESTOCK                                              :тварини
 STR_0013_LIVESTOCK.r                                            :тварин
+STR_0013_LIVESTOCK.z                                            :тварин
 STR_0014_GOODS                                                  :товари
 STR_0014_GOODS.r                                                :товарів
+STR_0014_GOODS.z                                                :товари
 STR_0015_GRAIN                                                  :зерно
 STR_0015_GRAIN.r                                                :зерна
-STR_0016_WOOD                                                   :деревину
+STR_0015_GRAIN.z                                                :зерно
+STR_0016_WOOD                                                   :деревина
 STR_0016_WOOD.r                                                 :деревини
-STR_0017_IRON_ORE                                               :залізну руду
+STR_0016_WOOD.z                                                 :деревину
+STR_0017_IRON_ORE                                               :залізна руда
 STR_0017_IRON_ORE.r                                             :залізної руди
+STR_0017_IRON_ORE.z                                             :залізну руду
 STR_0018_STEEL                                                  :сталь
 STR_0018_STEEL.r                                                :сталі
+STR_0018_STEEL.z                                                :сталь
 STR_0019_VALUABLES                                              :коштовності
 STR_0019_VALUABLES.r                                            :коштовностей
-STR_001A_COPPER_ORE                                             :мідну руду
+STR_0019_VALUABLES.z                                            :коштовності
+STR_001A_COPPER_ORE                                             :мідна руда
 STR_001A_COPPER_ORE.r                                           :мідної руди
-STR_001B_MAIZE                                                  :кукурудзу
+STR_001A_COPPER_ORE.z                                           :мідну руду
+STR_001B_MAIZE                                                  :кукурудза
 STR_001B_MAIZE.r                                                :кукурудзи
+STR_001B_MAIZE.z                                                :кукурудзу
 STR_001C_FRUIT                                                  :фрукти
 STR_001C_FRUIT.r                                                :фруктів
+STR_001C_FRUIT.z                                                :фрукти
 STR_001D_DIAMONDS                                               :діаманти
 STR_001D_DIAMONDS.r                                             :діамантів
+STR_001D_DIAMONDS.z                                             :діаманти
 STR_001E_FOOD                                                   :продукти
 STR_001E_FOOD.r                                                 :продуктів
+STR_001E_FOOD.z                                                 :продукти
 STR_001F_PAPER                                                  :папір
 STR_001F_PAPER.r                                                :паперу
+STR_001F_PAPER.z                                                :папір
 STR_0020_GOLD                                                   :золото
 STR_0020_GOLD.r                                                 :золота
 STR_0020_GOLD.z                                                 :золото
@@ -79,7 +96,7 @@ STR_0026_CANDY.z                                                :солодощ
 STR_0027_COLA                                                   :кола
 STR_0027_COLA.r                                                 :коли
 STR_0027_COLA.z                                                 :колу
-STR_0028_COTTON_CANDY                                           :солодку вату
+STR_0028_COTTON_CANDY                                           :солодка вата
 STR_0028_COTTON_CANDY.r                                         :солодкої вати
 STR_0028_COTTON_CANDY.z                                         :солодку вату
 STR_0029_BUBBLES                                                :бульбашки
@@ -91,14 +108,13 @@ STR_002A_TOFFEE.z                                               :іриски
 STR_002B_BATTERIES                                              :батарейки
 STR_002B_BATTERIES.r                                            :батарейок
 STR_002B_BATTERIES.z                                            :батарейки
-STR_002C_PLASTIC                                                :пластик
-STR_002C_PLASTIC.r                                              :пластику
-STR_002C_PLASTIC.z                                              :ластик
-STR_002D_FIZZY_DRINKS                                           :газовану воду
+STR_002C_PLASTIC                                                :пластилін
+STR_002C_PLASTIC.z                                              :пластилін
+STR_002D_FIZZY_DRINKS                                           :газована водф
 STR_002D_FIZZY_DRINKS.r                                         :газованої води
 STR_002D_FIZZY_DRINKS.z                                         :газовану воду
 STR_002E                                                        :
-STR_002F_PASSENGER                                              :пасажирів
+STR_002F_PASSENGER                                              :пасажири
 STR_002F_PASSENGER.r                                            :пасажирів
 STR_002F_PASSENGER.z                                            :пасажирів
 STR_0030_COAL                                                   :вугілля
@@ -141,6 +157,7 @@ STR_003C_FRUIT                                                  :фрукти
 STR_003C_FRUIT.r                                                :фруктів
 STR_003C_FRUIT.z                                                :фрукти
 STR_003D_DIAMOND                                                :діаманти
+STR_003D_DIAMOND.r                                              :діамантів
 STR_003D_DIAMOND.z                                              :діаманти
 STR_003E_FOOD                                                   :продукти
 STR_003E_FOOD.r                                                 :продуктів
@@ -184,9 +201,8 @@ STR_004A_TOFFEE.z                                               :іриски
 STR_004B_BATTERY                                                :батарейки
 STR_004B_BATTERY.r                                              :батарейок
 STR_004B_BATTERY.z                                              :батарейки
-STR_004C_PLASTIC                                                :пластик
-STR_004C_PLASTIC.r                                              :пластику
-STR_004C_PLASTIC.z                                              :пластик
+STR_004C_PLASTIC                                                :пластилін
+STR_004C_PLASTIC.z                                              :пластилін
 STR_004D_FIZZY_DRINK                                            :газована вода
 STR_004D_FIZZY_DRINK.r                                          :газованої води
 STR_004D_FIZZY_DRINK.z                                          :газовану воду
@@ -267,7 +283,7 @@ 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-2007 OpenTTD-група
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 команда OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK} Перекладач(і) -
 
 STR_00C5                                                        :{BLACK}{CROSS}
@@ -589,9 +605,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}
@@ -722,16 +738,22 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} досягла статусу '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}Гравець {PLAYERNAME} з {COMPANY} досяг статусу '{STRING}'
 STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Створити сценарій
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Редактор сценарію
 STR_0223_LAND_GENERATION                                        :{WHITE}Створити ландшафт
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Випадковий ландшафт
+STR_0227_RESET_LAND                                             :{BLACK}Очистити ділянку
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Збільшити область ділянки для підняття/опускання
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Зменшити область ділянки для підняття/опускання
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Створити випадкову ділянку
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Очистити ландшафт
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Очистити ландшафт
+STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Викортстовувати рельєф
+STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Взяти з карти висот
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Ви дійсно бажаєте очистити ландшафт?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Створення ландшафту
 STR_022F_TOWN_GENERATION                                        :{BLACK}Створення міст
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Створення виробництва
@@ -859,7 +881,7 @@ STR_02A5_TOWN_SIZE                                              :{YELLOW}Роз
 
 STR_02B6                                                        :{STRING}  -  {STRING}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Показує останнє повідомлення або новини
-STR_OFF                                                         :Викл
+STR_OFF                                                         :Відкл.
 STR_SUMMARY                                                     :Коротко
 STR_FULL                                                        :Повністю
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
@@ -919,11 +941,11 @@ STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Вибе
 STR_MEASURING_UNITS                                             :{BLACK}Система одиниць виміру
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Вибір системи одиниць виміру
-STR_02E6_ROAD_VEHICLES                                          :{BLACK}Напрямок руху
+STR_02E6_ROAD_VEHICLES                                          :{BLACK}Транспорт
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Виберіть по якій стороні їхатиме транспорт
-STR_02E9_DRIVE_ON_LEFT                                          :Лівосторонній
-STR_02EA_DRIVE_ON_RIGHT                                         :Правосторонній
+STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Виберіть, по якій стороні їхатиме транспорт
+STR_02E9_DRIVE_ON_LEFT                                          :Їде по лівій стороні
+STR_02EA_DRIVE_ON_RIGHT                                         :Їде по правій стороні
 STR_02EB_TOWN_NAMES                                             :{BLACK}Назви міст
 STR_02EC                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Виберіть стиль назв міст
@@ -942,7 +964,7 @@ STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Грат
 STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Грати з 2-8 гравцями
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Показати налашування гри
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Показати налашування складності
-STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Почати нову використовуючи сценарій
+STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Почати нову гру, використовуючи сценарій
 STR_0304_QUIT                                                   :{BLACK}Вихід
 STR_0305_QUIT_OPENTTD                                           :{BLACK}покинути 'OpenTTD'
 STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
@@ -1141,7 +1163,7 @@ STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Пок
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Показувати вікно фінансів в кінці року: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch сумісна команда "без зупинки": {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Ставати транспорту в чергу: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Прокручувати вікно коли курсор з краю: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Прокручувати вікно, коли курсор з краю: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Дозволити підкупляти місцеву владу: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Неоднорідні станції: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Новий глобальний пошук шляху(NPF, замість NTP): {ORANGE}{STRING}
@@ -1860,16 +1882,16 @@ STR_304A_NONE                                                   :{YELLOW}- не
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...ділянка не підходить для цього
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Дуже близько до іншого порту
 STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Спочатку зруйнуйте порт
-STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Виберіть направлення залізничної станції
+STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Виберіть орієнтацію залізничної станції
 STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Виберіть кількість колій залізничної станції
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Виберіть довжину залізничної станції
-STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Виберіть направлення зупинки
-STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Виберіть направлення вантажної станції
+STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Виберіть орієнтацію зупинки
+STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Виберіть орієнтацію вантажної станції
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Показати станцію в центрі екрану
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Показати рейтинг станції
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Перейменувати станцію
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Показати список приймання вантажів
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Назва станції - натисніть на назву щоб показати в центрі екрану
+STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Назва станції - натисніть на назву, щоб показати в центрі екрану
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Виберіть розмір/тип аеропорту
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
@@ -1885,8 +1907,8 @@ STR_3066_COVERAGE_AREA_HIGHLIGHT                                :{BLACK}Підс
 STR_3068_DOCK                                                   :{WHITE}Порт
 STR_3069_BUOY                                                   :Бакен
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...бакен на шляху
-STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...станції дуже розкидані
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...неоднорідні станції відмінено
+STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...станція занадто велика
+STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...неоднорідні станції відключені
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Утримуйте CTRL для вибору більш ніж одного пункту
 
 STR_UNDEFINED                                                   :(невизначено)
@@ -1897,7 +1919,7 @@ STR_STAT_CLASS_WAYP                                             :Пункт
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Орієнтація депо
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...має бути збудовано на воді
 STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Неможливо будувати корабельне депо тут...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Виберіть направлення корабельного депо
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Виберіть орієнтацію корабельного депо
 STR_3804_WATER                                                  :Вода
 STR_3805_COAST_OR_RIVERBANK                                     :Берег
 STR_3806_SHIP_DEPOT                                             :Корабельне депо
@@ -2336,8 +2358,6 @@ STR_LIVERY_DIESEL                                               :Дизельн
 STR_LIVERY_ELECTRIC                                             :Електричні потяги
 STR_LIVERY_MONORAIL                                             :Монорельс
 STR_LIVERY_MAGLEV                                               :Потяги на магнітній подушці
-STR_LIVERY_DMU                                                  :
-STR_LIVERY_EMU                                                  :
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Пасажирський вагон (пар)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Пасажирський вагон (дизель)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Пасажирський вагон (електричка)

lang/unfinished/afrikaans.txt

@@ -82,6 +82,28 @@ STR_004A_TOFFEE                                                 :Tameletjie
 STR_004B_BATTERY                                                :Battery
 STR_004C_PLASTIC                                                :Plastiek
 STR_004D_FIZZY_DRINK                                            :Koeldrank
+STR_QUANTITY_STEEL                                              :{WEIGHT} van staal
+STR_QUANTITY_VALUABLES                                          :{COMMA} sak{P "" ke} van kosbaarhede
+STR_QUANTITY_COPPER_ORE                                         :{WEIGHT} van koper erts
+STR_QUANTITY_MAIZE                                              :{WEIGHT} van graan
+STR_QUANTITY_FRUIT                                              :{WEIGHT} van vrugte
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sak{P "" ke} van diamante
+STR_QUANTITY_FOOD                                               :{WEIGHT} van kos
+STR_QUANTITY_PAPER                                              :{WEIGHT} van papier
+STR_QUANTITY_GOLD                                               :{COMMA} sak{P "" ke} van goud
+STR_QUANTITY_WATER                                              :{VOLUME} van water
+STR_QUANTITY_WHEAT                                              :{WEIGHT} van koring
+STR_QUANTITY_RUBBER                                             :{VOLUME} van gomlastiek
+STR_QUANTITY_SUGAR                                              :{WEIGHT} van suiker
+STR_QUANTITY_TOYS                                               :{COMMA} speel{P ding goed}
+STR_QUANTITY_SWEETS                                             :{COMMA} sak{P "" ke} van lekkers
+STR_QUANTITY_COLA                                               :{VOLUME} van cola
+STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} van spookasem
+STR_QUANTITY_BUBBLES                                            :{COMMA} borrel{P "" s}
+STR_QUANTITY_TOFFEE                                             :{WEIGHT} van tameletjie
+STR_QUANTITY_BATTERIES                                          :{COMMA} batter{P y ye}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} van plastiek
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} koeldran{P k ke}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}SK
@@ -122,11 +144,13 @@ STR_00B0_MAP                                                    :{WHITE}Kaart -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spel Opsies
 STR_00B2_MESSAGE                                                :{YELLOW}Boodskap
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Boodskap van {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Waarskuwing!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan nie dit doen nie....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan nie die area reinig nie....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Oorspronklik kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou
 STR_00B7_VERSION                                                :{BLACK}OpenTTD bewerking {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Die OpenTTD span
+STR_TRANSLATED_BY                                               :{BLACK}  Vertaler(s) -
 
 STR_00C5                                                        :{BLACK}{CROSS}
 STR_00C6                                                        :{SILVER}{CROSS}
@@ -253,11 +277,15 @@ STR_013D_INFORMATION                                            :{BLACK}Inligtin
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteite
 STR_013E_TOTAL_CARGO                                            :{BLACK}Totaale Vrag
 STR_013F_CAPACITY                                               :{BLACK}Kapasiteit: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Kapasiteit: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Totaale vrag kapasitiet van die trein:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nuwe Spel
 STR_0141_LOAD_GAME                                              :{BLACK}Laai Spel
+STR_SINGLE_PLAYER                                               :{BLACK}Enkel speeler
 STR_MULTIPLAYER                                                 :{BLACK}Veelspeler
+STR_SCENARIO_EDITOR                                             :{BLACK}Draaiboek Redakteur
 
 STR_64                                                          :64
 STR_128                                                         :128
@@ -270,17 +298,40 @@ STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Spel Opsies
 
 STR_0150_SOMEONE                                                :iemand{SKIP}{SKIP}
-STR_0151_MAP_OF_WORLD                                           :
 STR_0152_TOWN_DIRECTORY                                         :Stad index
 STR_0153_SUBSIDIES                                              :Subsidiëe
 
+STR_UNITS_IMPERIAL                                              :Imperiaal
+STR_UNITS_METRIC                                                :Metriek
+STR_UNITS_SI                                                    :SI
 
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/h
+STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s
 
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hp
+STR_UNITS_POWER_METRIC                                          :{COMMA}hp
+STR_UNITS_POWER_SI                                              :{COMMA}kW
 
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}t
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
 
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} ton{P "" s}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} tonne{P "" s}
+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} gallon{P "" s}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} litre{P "" s}
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 
+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lbf
+STR_UNITS_FORCE_METRIC                                          :{COMMA} ton krag
+STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Opereer profyt grafiek
@@ -290,6 +341,7 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Prestasie geski
 STR_0158_COMPANY_VALUE_GRAPH                                    :Maatskappy waarde grafiek
 STR_0159_CARGO_PAYMENT_RATES                                    :Vrag betaaling grade
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Maatskappy verbond tafel
+STR_PERFORMANCE_DETAIL_MENU                                     :Omstandig prestasie gradering
 ############ range for menu ends
 
 STR_015B_OPENTTD                                                :{WHITE}Omtrent OpenTTD
@@ -299,9 +351,45 @@ STR_015E_QUIT_GAME                                              :Verlaat Spel
 STR_015F_QUIT                                                   :Uitgang
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Is jy seker jy wil die spel verlaat?
 STR_0161_QUIT_GAME                                              :{WHITE}Verlaat Spel
+STR_SORT_ORDER_TIP                                              :{BLACK}Selekteer sorteer orde (afklimende/klimende)
+STR_SORT_CRITERIA_TIP                                           :{BLACK}Selekteer sorteer maatstaf
+STR_SORT_BY                                                     :{BLACK}Sorteer by
 
+STR_SORT_BY_POPULATION                                          :{BLACK}Populasie
+STR_SORT_BY_PRODUCTION                                          :{BLACK}Produksie
+STR_SORT_BY_TYPE                                                :{BLACK}Tipe
+STR_SORT_BY_TRANSPORTED                                         :{BLACK}Uitvervoer
+STR_SORT_BY_NAME                                                :{BLACK}Naam
+STR_SORT_BY_DROPDOWN_NAME                                       :Naam
+STR_SORT_BY_DATE                                                :{BLACK}Datum
+STR_SORT_BY_NUMBER                                              :Nommer
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profyt verlede jaar
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profyt die jaar
+STR_SORT_BY_AGE                                                 :Ouderdom
+STR_SORT_BY_RELIABILITY                                         :Deeglikheid
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Totaale kapasitiet per vrag tipe
+STR_SORT_BY_MAX_SPEED                                           :Maksimum spoed
+STR_SORT_BY_MODEL                                               :Model
+STR_SORT_BY_VALUE                                               :Waarde
+STR_SORT_BY_FACILITY                                            :Stasie tipe
+STR_SORT_BY_WAITING                                             :Wagtend vrag waarde
+STR_SORT_BY_RATING_MAX                                          :Vrag gradering
+STR_ENGINE_SORT_ENGINE_ID                                       :EngineID (klassieke sorteer)
+STR_ENGINE_SORT_COST                                            :Koste
+STR_ENGINE_SORT_POWER                                           :Krag
+STR_ENGINE_SORT_INTRO_DATE                                      :Inleiding Datum
+STR_ENGINE_SORT_RUNNING_COST                                    :Loopkoste
+STR_ENGINE_SORT_CARGO_CAPACITY                                  :Vrag Kapasiteit
 STR_NO_WAITING_CARGO                                            :{BLACK}Geen vrag van enige tipe is op wag
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Wys 'n lys van beskikbaare enjin tipes vir die voertiug tipe.
+STR_MANAGE_LIST                                                 :{BLACK}Bestuur lys
+STR_MANAGE_LIST_TIP                                             :{BLACK}Stuur instruksies na alle voertuie in die lys
+STR_REPLACE_VEHICLES                                            :Vervang voertuie
+STR_SEND_TRAIN_TO_DEPOT                                         :Stuur na Depot
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur na Depot
+STR_SEND_SHIP_TO_DEPOT                                          :Stuur na Depot
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur na Hangar
+STR_SEND_FOR_SERVICING                                          :Stuur vir Diens
 
 ############ range for months starts
 STR_0162_JAN                                                    :Jan
@@ -349,6 +437,9 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}kan nie tussendiens tydperk verander nie...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Maak venster toe
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Venster titel - sleep die om venster te beweeg
+STR_STICKY_BUTTON                                               :{BLACK}Bemerk die venste as ontoemaakbaar by die"Sluit Alle Vensters" sleutel
+STR_RESIZE_BUTTON                                               :{BLACK}Kliek en sleep om venster te vergroot
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kliek hier om na die huidige bewaar/laai leer te spring
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Breek gebou af ens. op 'n landblokkie
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Verlaag 'n hoek van land
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Verhoog 'n hoek van land
@@ -491,6 +582,7 @@ STR_MESSAGES_ALL                                                :{YELLOW}Stel al
 STR_MESSAGE_SOUND                                               :{YELLOW}Speel geluid vir opsommige nuus boodskappe
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...te ver van vorige destinasie
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Hoof maatskappye wat het {NUM}{}({STRING} Vlak) gekry
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Maatskappy Liga Tafel in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Sakeman
 STR_0214_ENTREPRENEUR                                           :Ondernemer
@@ -501,20 +593,17 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} behaal '{STRING}' stand!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} van {COMPANY} behaal '{STRING}' stand!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Skep Draaiboek
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Draaiboek Redakteur
 STR_0223_LAND_GENERATION                                        :{WHITE}Land Ontwikkeling
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Lukraak Land
-STR_0227_RESET_LAND                                             :{BLACK}Herstel Land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Vergroot land area om te verlaag/verhoog
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Verminder land area om te verlaag/verhoog
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Ontwikkel lukraak land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Herstel landerye
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Herstel landerye
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Is jy seker jy wil die landerye herstel?
+STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Is jy seker jy wil alle speler-besittend eiendom verwyder?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landerye ontwikkeling
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stad ontwikkeling
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Nyweheid ontwikkeling
@@ -619,6 +708,7 @@ STR_0290_DELETE                                                 :{BLACK}Uitwis
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Uitwis hele stad
 STR_0292_SAVE_SCENARIO                                          :Bewaar draaiboek
 STR_0293_LOAD_SCENARIO                                          :Laai draaiboek
+STR_LOAD_HEIGHTMAP                                              :Laai Hoogtekaart
 STR_0294_QUIT_EDITOR                                            :Verlaat redakteur
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Verlaat
@@ -626,6 +716,9 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Bewaar d
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Laai Draaiboek
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Bewaar Draaiboek
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Speel Draaiboek
+STR_PLAY_HEIGHTMAP                                              :{BLACK}Speel Hoogtekaart
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}begin 'n nuwe spel, gebruikend 'n hoogtekaart as oStart a new game, using a heightmap as landscape
+STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Is jy seker jy wil die draaiboek verlaat?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Verlaat Redakteur
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kan slegs in stede met 'n populasie van te minste 1200 gebou word
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Beweeg die begin datum terug 1 jaar
@@ -640,6 +733,7 @@ STR_02A5_TOWN_SIZE                                              :{YELLOW}Stad gr
 STR_02B6                                                        :{STRING}  -  {STRING}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Vertoon laaste boodskap of nuus verslag
 STR_OFF                                                         :Af
+STR_SUMMARY                                                     :Opsomming
 STR_FULL                                                        :Vol
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Stad index
@@ -655,14 +749,17 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spel opsies
 STR_02C5_DIFFICULTY_SETTINGS                                    :Moeilikheid stellings
+STR_02C7_CONFIG_PATCHES                                         :Skep Stukke
 STR_NEWGRF_SETTINGS                                             :Newgrf stellings
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stad naame vertoon
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Stasie naame vertoon
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Tekens vertoon
+STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Wegpunte vertoon
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Volle animasie
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Volle aanwyse
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Deurskynend geboue
+STR_TRANSPARENT_SIGNS                                           :{SETX 12}Deurskynend stasie tekens
 ############ range ends here
 
 ############ range for menu starts
@@ -680,10 +777,14 @@ STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Vertoon
 STR_02DD_SUBSIDIES                                              :Subsidiee
 STR_02DE_MAP_OF_WORLD                                           :Kaart van wêreld
 STR_EXTRA_VIEW_PORT                                             :Ekstra gesigswerf
+STR_SIGN_LIST                                                   :Teken lys
 STR_02DF_TOWN_DIRECTORY                                         :Stad indeks
+STR_TOWN_POPULATION                                             :{BLACK}Wereld populasie: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Gesigswerf {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Afskryf na gesigswerf
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Afskryf die lokasie van die wereldwerf na die gesigswerf
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Deeg van gesigswerf
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Deeg die lokasie van die gesigspunt na die hoofskerm
 
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Koers eenheide
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
@@ -742,18 +843,32 @@ STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Skermsku
 
 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Koop land vir toekomende gebruik
 STR_032F_AUTOSAVE                                               :{RED}OUTOBEWAAR
+STR_SAVING_GAME                                                 :{RED}*  *  BEWAAR SPEL  *  *
+STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Bewaar nog in vorder, wag asb tot dit klaar is!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Kies 'Ezy Straat styl musiek' musiek lys
 
 STR_0335_6                                                      :{BLACK}6
 STR_0336_7                                                      :{BLACK}7
 
 ############ start of townname region
+STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engels (Oorspronkilik)
+STR_TOWNNAME_FRENCH                                             :Frans
+STR_TOWNNAME_DUTCH                                              :Hollands
+STR_TOWNNAME_FINNISH                                            :Finnish
+STR_TOWNNAME_POLISH                                             :Polish
+STR_TOWNNAME_SLOVAKISH                                          :Slovakish
+STR_TOWNNAME_NORWEGIAN                                          :Norwegian
+STR_TOWNNAME_HUNGARIAN                                          :Hungarian
+STR_TOWNNAME_AUSTRIAN                                           :Austrian
+STR_TOWNNAME_ROMANIAN                                           :Romanian
+STR_TOWNNAME_CZECH                                              :Czech
+STR_TOWNNAME_SWISS                                              :Swiss
 ############ end of townname region
 
 STR_CURR_GBP                                                    :Pounds ()
 STR_CURR_USD                                                    :Dollars ($)
-STR_CURR_EUR                                                    :Euro ()
-STR_CURR_YEN                                                    :Yen ()
+STR_CURR_EUR                                                    :Euro (€)
+STR_CURR_YEN                                                    :Yen (¥)
 STR_CURR_ATS                                                    :Austrian Shilling (ATS)
 STR_CURR_BEF                                                    :Belgian Franc (BEF)
 STR_CURR_CHF                                                    :Swiss Franc (CHF)
@@ -772,7 +887,11 @@ STR_CURR_NOK                                                    :Norwegian Krone
 STR_CURR_PLN                                                    :Polish Zloty (PLN)
 STR_CURR_ROL                                                    :Romanian Leu (ROL)
 STR_CURR_RUR                                                    :Russian Rubles (RUR)
+STR_CURR_SIT                                                    :Slovenian Tolar (SIT)
 STR_CURR_SEK                                                    :Swedish Krona (SEK)
+STR_CURR_YTL                                                    :Turkish Lira (YTL)
+STR_CURR_SKK                                                    :Slovak Koruna (SKK)
+STR_CURR_BRR                                                    :Brazilian Real (BRL)
 
 STR_CURR_CUSTOM                                                 :Gewoonte...
 
@@ -861,6 +980,7 @@ STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ongelyk
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Klein lughawe is altyd toegelaat: {ORANGE}{STRING}
 
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Waarsku as trein verloor is: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Bespreek voertuig se opdrae: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nee
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, maar uitsluit gestopde voertuie
@@ -877,8 +997,19 @@ STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Onsigba
 STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Land ontwikkelaar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Oorspronklik
 STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Max afstand van kant vir Olie Raffineerderye {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sneeu lyn hoogte: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Ruheid van terrein (slegs TerraGenesis) : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Baie Glad
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Glad
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH                   :Ru
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Baie Ru
+STR_CONFIG_PATCHES_TREE_PLACER                                  :{LTBLUE}Boom plaas algoritme: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TREE_PLACER_NONE                             :Geen
+STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL                         :Oorspronklik
+STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED                         :Verbeterde
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION                           :{LTBLUE}Hoogtekaart rotasie: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Die hoogtevlak 'n platte landerye kaart kry: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max stasie omvang: {ORANGE}{STRING} {RED}Waarskuwing: Ho<48>stelling vertraag spel
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Versien helikopters by helihawes outomaties: {ORANGE}{STRING}
@@ -888,6 +1019,7 @@ STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Wys maa
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Geen
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Eie maatskappy
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Alle maatskappye
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Verkies span gesels met <ENTER>: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max treine per speler: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max pad voertuie per speler: {ORANGE}{STRING}
@@ -920,6 +1052,7 @@ STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Eindig
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Stel vloeiende ekonomie in staak (meer, kleiner veranderings)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Toelaat deele aankoop van ander maatskappye
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Wanneer sleeping, plaas seine elke: {ORANGE}{STRING} teel(e)
+STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Outomaties bou semaphores voor: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posisie van hoof werktuigbaan: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Links
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Senter
@@ -1052,7 +1185,7 @@ STR_NETWORK_MULTIPLAYER                                         :{WHITE}Veelspel
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Speler naam:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Die is die naam waarmee ander spelers sal jou aanwys
 STR_NETWORK_CONNECTION                                          :{BLACK}Verbinding:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Kies tueen internet spel of 'n Plaaslike Area Netwerk (LAN) spel
+STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Kies teen internet spel of 'n Plaaslike Area Netwerk (LAN) spel
 
 STR_NETWORK_START_SERVER                                        :{BLACK}Begin bediender
 STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Begin u eie bediender
@@ -1223,10 +1356,13 @@ STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :bediender vol
 STR_NETWORK_CLIENT_JOINED                                       :het die spel verbind
 STR_NETWORK_GIVE_MONEY                                          :het vir u maatskappy geld gegee ({CURRENCY})
 STR_NETWORK_GAVE_MONEY_AWAY                                     :u het vir {STRING} geld ({CURRENCY}) gegee
+STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Span] :
 STR_NETWORK_CHAT_COMPANY                                        :[Span] {STRING}:
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Span] Na {STRING}:
+STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privaat] :
 STR_NETWORK_CHAT_CLIENT                                         :[Privaat] {STRING}:
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Privaat] Na {STRING}:
+STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}:
 STR_NETWORK_NAME_CHANGE                                         :het hy/sy naam verander na
 STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Die bediender het die sessie toegemaak
@@ -1884,7 +2020,34 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} is deur {COMPANY}! oorgevat!
 STR_7080_PROTECTED                                              :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
 
+STR_LIVERY_DEFAULT                                              :Standaard Lewery
+STR_LIVERY_STEAM                                                :Stoom Enjin
+STR_LIVERY_DIESEL                                               :Diesel Enjin
+STR_LIVERY_ELECTRIC                                             :Elektriese Enjin
+STR_LIVERY_MONORAIL                                             :Eenspoor Enjin
+STR_LIVERY_MAGLEV                                               :Maglev Enjin
+STR_LIVERY_DMU                                                  :DMU
+STR_LIVERY_EMU                                                  :EMU
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passasier Rytuig (Stoom)
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passasier Rytuig (Diesel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passasier Rytuig (Elektries)
+STR_LIVERY_FREIGHT_WAGON                                        :Vraag Wa
+STR_LIVERY_BUS                                                  :Bus
+STR_LIVERY_TRUCK                                                :Vraagmotor
+STR_LIVERY_PASSENGER_SHIP                                       :Passasier Veer
+STR_LIVERY_FREIGHT_SHIP                                         :Vraag Skip
+STR_LIVERY_HELICOPTER                                           :Helikopter
+STR_LIVERY_SMALL_PLANE                                          :Klein Vliegtuig
+STR_LIVERY_LARGE_PLANE                                          :Groot Vliegtuig
 
+STR_LIVERY_GENERAL_TIP                                          :{BLACK}Wys generaal kleur skemas
+STR_LIVERY_TRAIN_TIP                                            :{BLACK}Wys trein kleur skemas
+STR_LIVERY_ROADVEH_TIP                                          :{BLACK}Wys pad voertuig kleur skemas
+STR_LIVERY_SHIP_TIP                                             :{BLACK}Wys skip kleur skemas
+STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Wys vliegtuig kleurskemas
+STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Kies die premere kleur vir die verkieste skema
+STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Kies die sekondere kleur vir die verkieste skema
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Kies 'n kleur skema te verander, of veelvoud skemas met CTRL+kliek. Kliek op die boks te skakel gebruik van skema
 
 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Stoom)
@@ -2176,11 +2339,14 @@ STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gaan deurgaande
 
 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op pad na {TOWN} Trein Depot
 STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op pad na {TOWN} Trein Depot, {VELOCITY}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Diens by {TOWN} Trein Depot
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Diens by {TOWN} Trein Depot, {VELOCITY}
 
 STR_INVALID_ORDER                                               :{RED} (Swak Opdrag)
 
 STR_8812_EMPTY                                                  :{LTBLUE}Leeg
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} vanaf {STATION}
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} van {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Trein {COMMA} wag in depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nuwe Voertuie
 STR_8816                                                        :{BLACK}-
@@ -2301,6 +2467,8 @@ STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kani nie
 STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Pad voertuig {COMMA} wag in depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Op pad na {TOWN} Pad Depot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Diens by {TOWN} Pad Depot
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Diens by {TOWN} Pad Depot, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan nie voertuig na depot stuur nie...
 STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan nie plaaslike depot vind nie
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Pad voertuie - kliek op voertuig vir inligting
@@ -2366,6 +2534,8 @@ STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan nie
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan nie plaaslike depot vind nie
 STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Op pad na {TOWN} Skip Depot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Skip Depot, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Diens by {TOWN} Skip Depot
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Diens by {TOWN} Skip Depot, {VELOCITY}
 STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skip {COMMA} wag in depot
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Bou skip werf
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Bou skip depot (vir opbou en diens van skepe)
@@ -2431,6 +2601,8 @@ STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan nie vlietuig na hangar stuur nie...
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op pad na {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Diens by {STATION} Hangar
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Diens by {STATION} Hangar, {VELOCITY}
 STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Vliegtuig {COMMA} wag in die vliegtuig hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Vliegtuig in die pad
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan nie vliegtuig stop/aanvang nie...
@@ -2544,9 +2716,22 @@ STR_PLANE                                                       :{BLACK}{PLANE}
 
 
 ### depot strings
+STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Is jy seker jy wil al die voertuie in die depot nou verkoop?
 
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Verkoop allep treine in die depot
+STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Verkoop alle pad voertuie in die depot
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Verkoop alle skepe in die depot
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Verkoop alle vliegtuie in die hangar
 
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Kry 'n lys van alle treine met die huidige depot in sy opdrae
+STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP                        :{BLACK}Kry 'n lys van alle pad voertuie met die huidige depot in sy opdrae
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Kry 'n lys van alle skepe met die huidige depot in sy opdrae
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Kry 'n lys van alle vliegtuie wat enige hangar by die lughawe in sy opdrae het
 
+STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Outovervang alle treine in die depot
+STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Outovervang alle pad voertuie in die depot
+STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Outovervang alle skepe in die depot
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Outovervang alle vlietuie in die hangar
 
 
 STR_NOT_REPLACING                                               :{BLACK}Word nie vervang nie
@@ -2555,8 +2740,18 @@ STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Enjin is
 
 STR_ENGINES                                                     :Enjine
 
+STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Kliek om alle treine in die depot te stop
+STR_MASS_STOP_DEPOT_ROADVEH_TIP                                 :{BLACK}Kliek om alle pad voertuie in die depot te stop
+STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Kliek om alle skepe in die depot te stop
+STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Kliek om alle vlietuie in die hangar te stop
 
+STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Kliek om alle treine in die depot te laat ry
+STR_MASS_START_DEPOT_ROADVEH_TIP                                :{BLACK}Kliek om alle pad voertuie in die depot te laayt ry
+STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Kliek om alle skepe in die depot te laat ry
+STR_MASS_START_HANGAR_TIP                                       :{BLACK}Kliek om alle vliegtuie in die hangar te laat ry
 
+STR_MASS_STOP_LIST_TIP                                          :{BLACK}Kliek om alle voertuie in die lys te stop
+STR_MASS_START_LIST_TIP                                         :{BLACK}Kliek om aller voertuie in die lys te laat ry
 
 
 
@@ -2564,7 +2759,7 @@ STR_ENGINES                                                     :Enjine
 
 STR_ELRAIL_VEHICLES                                             :Elektrifiseerde Spoor Voertuie
 STR_MONORAIL_VEHICLES                                           :Eenspoor Voertuie
-STR_MAGLEV_VEHICLES                                             :Maglev voertuie
+STR_MAGLEV_VEHICLES                                             :Maglev Voertuie
 
 ############ End of list of rail types
 
@@ -2572,11 +2767,32 @@ STR_MAGLEV_VEHICLES                                             :Maglev voertuie
 
 ########### String for New Landscape Generator
 
+STR_GENERATE                                                    :{WHITE}Ontwikkel
+STR_LAND_GENERATOR                                              :{BLACK}Land ontwikkelaar:
+STR_HEIGHTMAP_ROTATION                                          :{BLACK}Hoogtekaart rotasie:
+STR_DATE                                                        :{BLACK}Date:
+STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skaal waaskuwing
+STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Te veel afskaaling van oorpsrong kaart is nie goedgekeur nie. Gaan aan met ontwikkeling?
+STR_HEIGHTMAP_NAME                                              :{BLACK}Hoogtekaart name:
+STR_HEIGHTMAP_SIZE                                              :{BLACK}Groote: {ORANGE}{NUM} x {NUM}
+STR_GENERATION_WORLD                                            :{WHITE}Wereld Ontwikkeling...
+STR_GENERATION_ABORT                                            :{BLACK}Verlaat
+STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Verlaat Wereld Ontwikkeling
+STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Wil jy rerig die ontwikkeling verlaat?
+STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
 STR_CLEARING_TILES                                              :{BLACK}Ru en rotserig area ontwikkeling
+STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Die aksie het die moeilikheids vlak na gewoonte verander
+STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Beweeg die hoogte van platte land een af
+STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Beweeg die hoogte van platte land bo een
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Verander die hoogte van platte land
+STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Hoogte van platte land:
+STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}
 
 
 ########### String for new airports
 STR_CITY_AIRPORT                                                :{BLACK}Stad
+STR_METRO_AIRPORT                                               :{BLACK}Metropolitaans lughawe
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internasionaale lughawe
 STR_COMMUTER_AIRPORT                                            :{BLACK}Pendelaar
 STR_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Tussenkontinentaal
@@ -2585,9 +2801,14 @@ STR_HELIDEPOT                                                   :{BLACK}Helidepo
 STR_HELISTATION                                                 :{BLACK}Helistasie
 
 STR_LARGE_AIRPORTS                                              :{BLACK}Groot Lughawe
+STR_HUB_AIRPORTS                                                :{BLACK}Naaf lughawe
 STR_HELIPORTS                                                   :{BLACK}Helikopter lughawe
 
 ############ Tooltip measurment
 
+STR_MEASURE_LENGTH                                              :{BLACK}Lengte: {NUM}
+STR_MEASURE_AREA                                                :{BLACK}Area: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengte: {NUM}{}Hoogte verskil: {NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Hoogte verskil: {NUM} m
 
 ########

lang/unfinished/croatian.txt

@@ -396,8 +396,6 @@ STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Pogledaj
 STR_MANAGE_LIST                                                 :{BLACK}Uredi popis
 STR_MANAGE_LIST_TIP                                             :{BLACK}Pošalji upute svim vozilima na ovoj listi
 STR_REPLACE_VEHICLES                                            :Zamjeni vozila
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :
-STR_SEND_SHIP_TO_DEPOT                                          :
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošalji u hangar
 STR_SEND_FOR_SERVICING                                          :Pošalji na servis
 

lang/unfinished/frisian.txt

@@ -1010,8 +1010,6 @@ STR_3036_VERY_POOR                                              :Hiel Min
 STR_3037_POOR                                                   :Min
 STR_3039_GOOD                                                   :Goed
 STR_303A_VERY_GOOD                                              :Hiel Goed
-STR_303B_EXCELLENT                                              :
-STR_303C_OUTSTANDING                                            :
 ############ range for rating ends
 
 STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)

lang/unfinished/greek.txt

@@ -480,7 +480,6 @@ STR_01FE_DIFFICULTY                                             :{BLACK}{G=f}Δ
 STR_01FF                                                        :{TINYFONT}{BLACK}{DATE_LONG}
 STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Τελευταίο μήνυμα/αναφορά νέων
 STR_0201_MESSAGE_SETTINGS                                       :Ρυθμίσεις μηνυμάτων
-STR_MESSAGE_HISTORY_MENU                                        :
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Εμφάνιση τελευταίου μηνύματος/αναφοράς νέων, επιλογές μηνυμάτων
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Επιλογές Μηνυμάτων
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Τύποι μηνυμάτων:

langs.vcproj

@@ -256,6 +256,19 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="lang\korean.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating korean language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					Outputs="lang\korean.lng"/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="lang\lithuanian.txt"
 			>
@@ -353,6 +366,18 @@
 					Outputs="lang\russian.lng"/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\lang\simplified_chinese.txt">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating simplified chinese language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					Outputs="lang\simplified_chinese.lng"/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath=".\lang\slovak.txt">
 			<FileConfiguration
@@ -405,6 +430,18 @@
 					Outputs="lang\swedish.lng"/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\lang\traditional_chinese.txt">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating traditional chinese language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					Outputs="lang\traditional_chinese.lng"/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath=".\lang\turkish.txt">
 			<FileConfiguration

langs_vs80.vcproj

@@ -297,6 +297,20 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="lang\korean.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating korean language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="lang\korean.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="lang\lithuanian.txt"
 			>
@@ -409,6 +423,20 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\lang\simplified_chinese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating simplified chinese language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="lang\simplified_chinese.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath=".\lang\slovak.txt"
 			>
@@ -465,6 +493,20 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\lang\traditional_chinese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating traditional chinese language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="lang\traditional_chinese.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath=".\lang\turkish.txt"
 			>

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";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif

network_udp.c

@@ -736,7 +736,7 @@ void NetworkUDPSearchGame(void)
 		if (!NetworkUDPListen(&_udp_client_socket, 0, 0, true))
 			return;
 
-	DEBUG(net, 0)("[NET][UDP] Searching server");
+	DEBUG(net, 2)("[NET][UDP] Searching server");
 
 	NetworkUDPBroadCast(_udp_client_socket);
 	_network_udp_broadcast = 300; // Stay searching for 300 ticks

newgrf.c

@@ -209,6 +209,24 @@ static uint32 grf_load_var(byte size, byte **buf)
 	}
 }
 
+static const char *grf_load_string(byte **buf, size_t max_len)
+{
+	const char *string   = *(const char **)buf;
+	size_t string_length = ttd_strnlen(string, max_len);
+
+	if (string_length == max_len) {
+		/* String was not NUL terminated, so make sure it is now. */
+		(*buf)[string_length - 1] = '\0';
+		DEBUG(grf, 7) ("String was not terminated with a zero byte.");
+	} else {
+		/* Increase the string length to include the NUL byte. */
+		string_length++;
+	}
+	*buf += string_length;
+
+	return string;
+}
+
 static GRFFile *GetFileByGRFID(uint32 grfid)
 {
 	GRFFile *file;
@@ -1056,6 +1074,21 @@ static bool StationChangeInfo(uint stid, int numinfo, int prop, byte **bufp, int
 			FOR_EACH_OBJECT statspec[i]->blocked = grf_load_byte(&buf);
 			break;
 
+		case 0x16: /* TODO Animation info */
+			FOR_EACH_OBJECT grf_load_word(&buf);
+			ret = true;
+			break;
+
+		case 0x17: /* TODO Animation speed */
+			FOR_EACH_OBJECT grf_load_byte(&buf);
+			ret = true;
+			break;
+
+		case 0x18: /* TODO Animation triggers */
+			FOR_EACH_OBJECT grf_load_word(&buf);
+			ret = true;
+			break;
+
 		default:
 			ret = true;
 			break;
@@ -1446,6 +1479,11 @@ static void SafeChangeInfo(byte *buf, int len)
 	uint8 numinfo;
 	uint8 index;
 
+	if (len == 1) {
+		grfmsg(8, "Silently ignoring one-byte special sprite 0x00");
+		return;
+	}
+
 	check_length(len, 6, "SafeChangeInfo");
 	buf++;
 	feature  = grf_load_byte(&buf);
@@ -2029,7 +2067,6 @@ static void FeatureNewName(byte *buf, int len)
 	uint8 num;
 	uint16 id;
 	uint16 endid;
-	const char* name;
 	bool new_scheme = _cur_grffile->grf_version >= 7;
 	bool generic;
 
@@ -2051,13 +2088,19 @@ static void FeatureNewName(byte *buf, int len)
 	DEBUG(grf, 6) ("FeatureNewName: About to rename engines %d..%d (feature %d) in language 0x%02X.",
 	               id, endid, feature, lang);
 
-	name = (const char*)buf; /*transfer read value*/
 	len -= generic ? 6 : 5;
 
 	for (; id < endid && len > 0; id++) {
-		size_t ofs = strlen(name) + 1;
+		const char *name   = grf_load_string(&buf, len);
+		size_t name_length = strlen(name) + 1;
 
-		if (ofs < 128) {
+		len -= (int)name_length;
+
+		if (name_length == 1) {
+			DEBUG(grf, 7) ("FeatureNewName: Can't add empty name");
+		} else if (name_length > 127) {
+			DEBUG(grf, 7) ("FeatureNewName: Too long a name (%d)", name_length);
+		} else {
 			DEBUG(grf, 8) ("FeatureNewName: %d <- %s", id, name);
 
 			switch (feature) {
@@ -2126,17 +2169,7 @@ static void FeatureNewName(byte *buf, int len)
 					break;
 #endif
 			}
-		} else {
-			/* ofs is the string length + 1, so if the string is empty, ofs
-			 * is 1 */
-			if (ofs == 1) {
-				DEBUG(grf, 7) ("FeatureNewName: Can't add empty name");
-			} else {
-				DEBUG(grf, 7) ("FeatureNewName: Too long a name (%d)", ofs);
-			}
 		}
-		name += ofs;
-		len -= (int)ofs;
 	}
 }
 
@@ -2565,7 +2598,7 @@ static void GRFInfo(byte *buf, int len)
 	check_length(len, 8, "GRFInfo"); buf++;
 	version = grf_load_byte(&buf);
 	grfid = grf_load_dword(&buf);
-	name = (const char*)buf;
+	name = grf_load_string(&buf, len - 6);
 	info = name + strlen(name) + 1;
 
 	_cur_grffile->grfid = grfid;
@@ -2637,10 +2670,16 @@ static void GRFError(byte *buf, int len)
 	};
 	uint8 severity;
 	uint8 msgid;
+	const char *data;
 
 	check_length(len, 6, "GRFError");
-	severity = buf[1];
-	msgid = buf[3];
+
+	buf++; /* Skip the action byte. */
+	severity = grf_load_byte(&buf);
+	buf++; /* TODO: Language id. */
+	msgid = grf_load_byte(&buf);
+
+	data = grf_load_string(&buf, len - 4);
 
 	// Undocumented TTDPatch feature.
 	if ((severity & 0x80) == 0 && _cur_stage < GLS_ACTIVATION) {
@@ -2650,9 +2689,9 @@ static void GRFError(byte *buf, int len)
 	severity &= 0x7F;
 
 	if (msgid == 0xFF) {
-		grfmsg(severity, "%s", buf+4);
+		grfmsg(severity, "%s", data);
 	} else {
-		grfmsg(severity, msgstr[msgid], buf+4);
+		grfmsg(severity, msgstr[msgid], data);
 	}
 }
 
@@ -2663,11 +2702,9 @@ static void GRFComment(byte *buf, int len)
 	 *
 	 * V ignored       Anything following the 0C is ignored */
 
-	static char comment[256];
 	if (len == 1) return;
 
-	ttd_strlcpy(comment, (char*)(buf + 1), minu(sizeof(comment), len));
-	grfmsg(GMS_NOTICE, "GRFComment: %s", comment);
+	grfmsg(GMS_NOTICE, "GRFComment: %.*s", len - 1, (const char*)(buf + 1));
 }
 
 /* Action 0x0D (GLS_SAFETYSCAN) */

newgrf_config.c

@@ -15,14 +15,10 @@
 
 #include "fileio.h"
 #include "fios.h"
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef WIN32
 # include <io.h>
-#else
-# include <unistd.h>
-# include <dirent.h>
 #endif /* WIN32 */
 
 
@@ -266,7 +262,7 @@ static uint ScanPath(const char *path)
 	DIR *dir;
 	GRFConfig *c;
 
-	if ((dir = opendir(path)) == NULL) return 0;
+	if ((dir = ttd_opendir(path)) == NULL) return 0;
 
 	while ((dirent = readdir(dir)) != NULL) {
 		const char *d_name = FS2OTTD(dirent->d_name);

newgrf_engine.c

@@ -1031,7 +1031,7 @@ static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, byte base_rando
 			 * i.e.), so we give them all the NEW_CARGO triggered
 			 * vehicle's portion of random bits. */
 			assert(first);
-			DoTriggerVehicle(GetFirstVehicleInChain(v), VEHICLE_TRIGGER_ANY_NEW_CARGO, new_random_bits, false);
+			DoTriggerVehicle((v->type == VEH_Train) ? GetFirstVehicleInChain(v) : v, VEHICLE_TRIGGER_ANY_NEW_CARGO, new_random_bits, false);
 			break;
 
 		case VEHICLE_TRIGGER_DEPOT:

newgrf_gui.c

@@ -465,6 +465,9 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
 			break;
 
 		case WE_DESTROY:
+			if (!WP(w, newgrf_d).execute) {
+				CopyGRFConfigList(WP(w, newgrf_d).orig_list, *WP(w, newgrf_d).list);
+			}
 			/* Remove the temporary copy of grf-list used in window */
 			ClearGRFConfigList(WP(w, newgrf_d).list);
 			break;

oldloader.c

@@ -1510,16 +1510,29 @@ static bool LoadOldMain(LoadgameState *ls)
 	}
 
 	for (i = 0; i < OLD_MAP_SIZE; i ++) {
-		if (IsTileType(i, MP_RAILWAY)) {
-			/* We save presignals different from TTDPatch, convert them */
-			if (GetRailTileType(i) == RAIL_TILE_SIGNALS) {
-				/* This byte is always zero in TTD for this type of tile */
-				if (_m[i].m4) /* Convert the presignals to our own format */
-					_m[i].m4 = (_m[i].m4 >> 1) & 7;
-			}
-			/* TTDPatch stores PBS things in L6 and all elsewhere; so we'll just
-			 * clear it for ourselves and let OTTD's rebuild PBS itself */
-			_m[i].m4 &= 0xF; /* Only keep the lower four bits; upper four is PBS */
+		switch (GetTileType(i)) {
+			case MP_RAILWAY:
+				/* We save presignals different from TTDPatch, convert them */
+				if (GetRailTileType(i) == RAIL_TILE_SIGNALS) {
+					/* This byte is always zero in TTD for this type of tile */
+					if (_m[i].m4) /* Convert the presignals to our own format */
+						_m[i].m4 = (_m[i].m4 >> 1) & 7;
+				}
+				/* TTDPatch stores PBS things in L6 and all elsewhere; so we'll just
+				 * clear it for ourselves and let OTTD's rebuild PBS itself */
+				_m[i].m4 &= 0xF; /* Only keep the lower four bits; upper four is PBS */
+				break;
+			case MP_WATER: {
+				/* TTDPatch has all tiles touching water as coast (water)-type, we don't.
+				 * This is only true from a certain TTDP version, but there is no harm
+				 * in checking all the time */
+				Slope s = GetTileSlope(i, NULL);
+				if (s == SLOPE_ENW || s == SLOPE_NWS || s == SLOPE_SEN || s == SLOPE_WSE || IsSteepSlope(s)) {
+					SetTileType(i, MP_CLEAR);
+					SetTileOwner(i, OWNER_NONE);
+				}
+			default: break;
+			} break;
 		}
 	}
 

openttd.c

@@ -1119,7 +1119,7 @@ static void UpdateSignOwner(void)
 
 extern void UpdateOldAircraft( void );
 extern void UpdateOilRig( void );
-
+extern bool StationRect_BeforeAddTile(Station *st, TileIndex tile, int mode);
 
 static inline RailType UpdateRailType(RailType rt, RailType min)
 {
@@ -1170,7 +1170,7 @@ bool AfterLoadGame(void)
 
 		switch (gcf_res) {
 			case GCF_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break;
-			case GCF_NOT_FOUND: return false; /*_switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; break; */
+			case GCF_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; break;
 			default: break;
 		}
 	}
@@ -1490,6 +1490,13 @@ bool AfterLoadGame(void)
 
 	if (!CheckSavegameVersion(27)) AfterLoadStations();
 
+	BEGIN_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0) {
+		if (GetTileType(tile) == MP_STATION) {
+			Station *st = GetStationByTile(tile);
+			StationRect_BeforeAddTile(st, tile, 2 /* RECT_MODE_FORCE */);
+		}
+	} END_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0);
+
 	{
 		/* Set up the engine count for all players */
 		Player *players[MAX_PLAYERS];
@@ -1578,6 +1585,15 @@ bool AfterLoadGame(void)
 		SettingsDisableElrail(_patches.disable_elrails);
 	}
 
+	/* Buoys do now store the owner of the previous water tile, which can never
+	 * be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */
+	if (CheckSavegameVersion(46)) {
+		Station *st;
+		FOR_ALL_STATIONS(st) {
+			if (IsBuoy(st) && IsTileOwner(st->xy, OWNER_NONE)) SetTileOwner(st->xy, OWNER_WATER);
+		}
+	}
+
 	return true;
 }
 

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"

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"

order_cmd.c

@@ -167,6 +167,16 @@ static void DeleteOrderWarnings(const Vehicle* v)
 }
 
 
+static TileIndex GetOrderLocation(const Order *o)
+{
+	switch (o->type) {
+		default: NOT_REACHED();
+		case OT_GOTO_STATION: return GetStation(o->dest)->xy;
+		case OT_GOTO_DEPOT:   return GetDepot(o->dest)->xy;
+	}
+}
+
+
 /** Add an order to the orderlist of a vehicle.
  * @param tile unused
  * @param p1 various bitstuffed elements
@@ -343,18 +353,30 @@ int32 CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	 * handle any more then this.. */
 	if (v->num_orders >= MAX_BACKUP_ORDER_COUNT) return_cmd_error(STR_8832_TOO_MANY_ORDERS);
 
-	/* For ships, make sure that the station is not too far away from the
-	 * previous destination, for human players with new pathfinding disabled */
-	if (v->type == VEH_Ship && IsHumanPlayer(v->owner) &&
-		sel_ord != 0 && GetVehicleOrder(v, sel_ord - 1)->type == OT_GOTO_STATION
-		&& !_patches.new_pathfinding_all) {
+	if (v->type == VEH_Ship &&
+			IsHumanPlayer(v->owner) &&
+			!_patches.new_pathfinding_all) {
+		// Make sure the new destination is not too far away from the previous
+		const Order *prev = NULL;
+		const Order *o;
+		uint n = 0;
 
-		int dist = DistanceManhattan(
-			GetStation(GetVehicleOrder(v, sel_ord - 1)->dest)->xy,
-			GetStation(new_order.dest)->xy // XXX type != OT_GOTO_STATION?
-		);
-		if (dist >= 130)
-			return_cmd_error(STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO);
+		/* Find the last goto station or depot order before the insert location.
+		 * If the order is to be inserted at the beginning of the order list this
+		 * finds the last order in the list. */
+		for (o = v->orders; o != NULL; o = o->next) {
+			if (o->type == OT_GOTO_STATION || o->type == OT_GOTO_DEPOT) prev = o;
+			if (++n == sel_ord && prev != NULL) break;
+		}
+		if (prev != NULL) {
+			uint dist = DistanceManhattan(
+				GetOrderLocation(prev),
+				GetOrderLocation(&new_order)
+			);
+			if (dist >= 130) {
+				return_cmd_error(STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO);
+			}
+		}
 	}
 
 	if (flags & DC_EXEC) {

order_gui.c

@@ -76,7 +76,7 @@ static void DrawOrdersWindow(Window *w)
 
 		/* delete */
 		SetWindowWidgetDisabledState(w,  5,
-				(uint)v->num_orders + (shared_orders ? 1 : 0) <= (uint)WP(w, order_d).sel);
+				(uint)v->num_orders + ((shared_orders || v->num_orders != 0) ? 1 : 0) <= (uint)WP(w, order_d).sel);
 
 		/* non-stop only for trains */
 		SetWindowWidgetDisabledState(w,  6, v->type != VEH_Train || order == NULL);

os/debian/README.Debian

@@ -23,10 +23,10 @@ You should copy the data files from the original TTD into the data directory
 	mixing. My VIA AC97 device cannot do hardware mixing, for example.
 
 -Scenarios
-	There are a few scenarios included in this release. When you start openttd
-	it will look for scenarios in ~/.openttd/scenario, while the premade
-	scenarios are in /usr/share/games/openttd/data/scenario. You have two
-	options to use the scenarios.
+	There are a few scenarios included in this release. When you start
+	openttd it will look for scenarios in ~/.openttd/scenario, while the
+	premade scenarios are in /usr/share/games/openttd/data/scenario. You
+	have two options to use the scenarios.
 	* Navigate to /usr/share/games/openttd/data/scenario within openttd.
 	* Copy scenarios from /usr/share/games/openttd/data/scenario to
 	  ~/.openttd/scenario. We are looking into a better solution for this.

os/debian/changelog

@@ -1,23 +1,44 @@
-openttd (0.5.0~rc5-1) unstable; urgency=low
+openttd (0.5.0-1) unstable; urgency=low
 
   * New upstream release
 
- -- Matthijs Kooijman <matthijs@xanthe>  Thu,  8 Feb 2007 13:37:31 +0100
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100
+
+openttd (0.5.0~rc5-1) unstable; urgency=low
+
+  [ Matthijs Kooijman ]
+  * New upstream release
+  * Compile with freetype and fontconfig support.
+
+  [ Jordi Mallach ]
+  * Convert debconf templates to podebconf.
+  * Add a Catalan translation.
+  * Minor packaging cleanups.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 12 Feb 2007 09:25:41 +0100
 
 openttd (0.5.0~rc4-1) unstable; urgency=low
 
   * New upstream release
 
- -- Matthijs Kooijman <matthijs@xanthe>  Wed, 17 Jan 2007 01:37:31 +0100
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 18 Jan 2007 21:17:28 +0100
 
 openttd (0.5.0~rc3-1) unstable; urgency=low
 
   * New upstream release
 
- -- Matthijs Kooijman <matthijs@xanthe>  Sun,  7 Jan 2007 13:43:45 +0100
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 18 Jan 2007 20:21:04 +0100
 
 openttd (0.5.0~rc2-1) unstable; urgency=low
 
+  * New upstream release
+  * Removed fix for empty scenarios dir, openttd Makefile now properly handles
+    this.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 31 Dec 2006 12:24:37 +0100
+
+openttd (0.5.0~rc1-1) unstable; urgency=low
+
   * New upstream release.
 
  -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 22 Dec 2006 11:03:46 +0100

os/debian/control

@@ -2,7 +2,8 @@ Source: openttd
 Section: contrib/games
 Priority: optional
 Maintainer: Matthijs Kooijman <m.kooijman@student.utwente.nl>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libsdl-dev, zlib1g-dev, libpng-dev
+Uploaders: Jordi Mallach <jordi@debian.org>
+Build-Depends: debhelper (>= 4.0.0), dpatch, libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
 Standards-Version: 3.7.2
 
 Package: openttd

os/debian/copyright

@@ -1,9 +1,9 @@
-This package was debianized by Matthijs Kooijman <m.kooijman@student.utwente.nl> on
-Wed, 15 Sep 2004 00:24:01 +0200.
+This package was debianized by Matthijs Kooijman <m.kooijman@student.utwente.nl>
+on Wed, 15 Sep 2004 00:24:01 +0200.
 
 It was downloaded from http://sourceforge.net/projects/openttd
 
-Upstream Author: Ludvig Strigeus (ludde) and many others
+Upstream author: Ludvig Strigeus (ludde) and many others.
 
 License:
 
@@ -19,7 +19,7 @@ License:
 
    You should have received a copy of the GNU General Public License
    along with this package; if not, write to the Free Software
-	 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.

os/debian/po/POTFILES.in

@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates

os/debian/po/ca.po

@@ -0,0 +1,35 @@
+# Catalan translation of openttd's Debconf templates.
+# Copyright <20> 2007 Software in the Public Interest
+# This file is distributed under the same license as the openttd package.
+# Jordi Mallach <jordi@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openttd 0.5.0-1\n"
+"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
+"POT-Creation-Date: 2007-02-01 12:25+0100\n"
+"PO-Revision-Date: 2007-02-01 12:16+0100\n"
+"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
+"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "You need to install data files"
+msgstr "Heu d'instal<61>lar els fitxers de dades"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenTTD needs the data files from the original TTD game to run. You should "
+"install these data files before you can play the game. See README.Debian for "
+"more details on which files need to be copied where."
+msgstr ""
+"OpenTTD necessita els fitxers de dades del joc TTD original per a funcionar. "
+"Haureu d'instal<61>lar aquests fitxers de dades abans de poder jugar al joc. "
+"Llegiu el document README.Debian per a obtindre m<>s detalls sobre quins "
+"fitxers s'han de copiar i a quina ubicaci<63>."

os/debian/po/templates.pot

@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
+"POT-Creation-Date: 2007-02-01 12:25+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "You need to install data files"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenTTD needs the data files from the original TTD game to run. You should "
+"install these data files before you can play the game. See README.Debian for "
+"more details on which files need to be copied where."
+msgstr ""

os/debian/postinst

@@ -1,44 +1,8 @@
 #! /bin/sh
-# postinst script for openttd
-#
-# see: dh_installdeb(1)
 
 set -e
 
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
 . /usr/share/debconf/confmodule
 
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
-
-exit 0
-
-

os/debian/postrm

@@ -1,41 +0,0 @@
-#! /bin/sh
-# postrm script for openttd
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-       purge|remove)
-       	;;
-       
-       upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

os/debian/rules

@@ -21,9 +21,8 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
-	
 	rm Makefile.config || true
-	$(MAKE) PREFIX=/usr MIDI=/usr/bin/timidity INSTALL=1 BINARY_DIR=games DATA_DIR=share/games/openttd ICON_DIR=share/pixmaps PERSONAL_DIR=.openttd USE_HOMEDIR=1
+	$(MAKE) PREFIX=/usr MIDI=/usr/bin/timidity INSTALL=1 BINARY_DIR=games DATA_DIR=share/games/openttd ICON_DIR=share/pixmaps PERSONAL_DIR=.openttd USE_HOMEDIR=1 WITH_FREETYPE=1 WITH_FONTCONFIG=1
 
 	#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
 

os/debian/templates

@@ -1,6 +1,6 @@
 Template: openttd/datafiles
 Type: note
-Description: You need to install data files
- OpenTTD needs the datafiles from the original TTD game to run. You should
- install these datafiles before you can play the game. See README.Debian for
- more details on which files need to be copied where.
+_Description: You need to install data files
+ OpenTTD needs the data files from the original TTD game to run. You should
+ install these data files before you can play the game. See README.Debian
+ for more details on which files need to be copied where.

os/win32/installer/InstallChoices.ini

@@ -1,38 +0,0 @@
-; Ini file generated by the HM NIS Edit IO designer.
-[Settings]
-NumFields=4
-
-[Field 1]
-Type=Button
-Text=Instant Install
-Flags=NOTIFY
-Left=0
-Right=58
-Top=0
-Bottom=15
-
-[Field 2]
-Type=Button
-Text=Advanced Install
-Flags=NOTIFY
-Left=0
-Right=58
-Top=19
-Bottom=35
-
-[Field 3]
-Type=Label
-Text=Install OpenTTD instantly and quickly, no questions asked
-Left=62
-Right=245
-Top=3
-Bottom=11
-
-[Field 4]
-Type=Label
-Text=In case you want to change location, options, Start Menu location, etc
-Left=62
-Right=283
-Top=23
-Bottom=31
-

os/win32/installer/TTD to OpenTTD Transition Guide.txt

@@ -1,14 +0,0 @@
-TTD to OpenTTD
-Transition Guide
-This guide gives you pointers in making the transition from TTD to OpenTTD.  Once OpenTTD matures more, this guide will grow.  For now, here are the major differences that I<>ve seen.
-* Being able to resize the window so that "full-screen" can also show so much more of the land
-* Command Line switches to make things easier
-* Generate Random Land in the scenario editor also builds small towns, forests, and industries
-* A configuration screen that lets you turn on / off TTD Patch features
-Some day, OpenTTD will contain the features of TTD Patch.
-
-Created by RaggieSoft <20> TallwoodBand@cox.net
-Guide Version: 0.1.1
-Supports OpenTTD Version: 0.2.1
-
-Send your ideas for this document to my email address.  I also maintain an accunt with tt-forums.net.  It's RaggieSoft.

os/win32/installer/cdfinder.ini

@@ -5,22 +5,22 @@ NumFields=3
 [Field 1]
 Type=Groupbox
 Text=Transport Tycoon Deluxe Installation location
-Left=0
-Right=288
+Left=6
+Right=294
 Top=68
 Bottom=100
 
 [Field 2]
 Type=DirRequest
-Left=4
-Right=282
+Left=10
+Right=290
 Top=80
 Bottom=92
 
 [Field 3]
 Type=Label
-Left=13
-Right=278
+Left=17
+Right=282
 Top=6
 Bottom=64
 

os/win32/installer/gpl.txt

@@ -1,340 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

os/win32/installer/install.nsi

@@ -1,8 +1,11 @@
-; Define your application name
-!define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.5.0.0"
-!define APPVERSION "0.5.0.0"
-!define INSTALLERVERSION 27 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPNAME "OpenTTD"   ; Define application name
+!define APPVERSION "0.5.0"  ; Define application version
+!define INSTALLERVERSION 28 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+
+!define APPURLLINK "http://www.openttd.org"
+!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
+!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
+
 !define MUI_ICON "..\..\..\openttd.ico"
 !define MUI_UNICON "..\..\..\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
@@ -14,7 +17,7 @@ SetCompressor LZMA
 
 ; Version Info
 Var AddWinPrePopulate
-VIProductVersion "${APPVERSION}"
+VIProductVersion "${APPVERSIONINTERNAL}"
 VIAddVersionKey "ProductName" "OpenTTD Installer"
 VIAddVersionKey "Comments" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "CompanyName" "OpenTTD Developers"
@@ -44,18 +47,17 @@ Var CDDRIVE
 !define MUI_ABORTWARNING
 
 !insertmacro MUI_PAGE_WELCOME
-LicenseForceSelection radiobuttons "I &accept this Agreement" "I &do not accept this agreement"
 
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT "I &accept this agreement"
+!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE "I &do not accept this agreement"
 !insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING"
 
-;--------------------------------
-; Rest of pages
 !insertmacro MUI_PAGE_COMPONENTS
 
-
-;--------------------------------
-; New custom page for finding CD
-Page custom SelectCD SelectCD2 ": TTD folder"
+;---------------------------------
+; Custom page for finding TTDLX CD
+Page custom SelectCDEnter SelectCDExit ": TTD folder"
 
 !insertmacro MUI_PAGE_DIRECTORY
 
@@ -69,9 +71,13 @@ Page custom SelectCD SelectCD2 ": TTD folder"
 
 !insertmacro MUI_PAGE_INSTFILES
 
-!define MUI_FINISHPAGE_RUN "$INSTDIR\OpenTTD.exe"
+;-----------------------------------------------------
+; New custom page to show UNICODE and MSLU information
+Page custom ShowWarningsPage
+
+!define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
 !define MUI_FINISHPAGE_LINK "Visit OpenTTD's homepage"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openttd.org/"
+!define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -84,64 +90,63 @@ Page custom SelectCD SelectCD2 ": TTD folder"
 !insertmacro MUI_LANGUAGE "English"
 !insertmacro MUI_RESERVEFILE_LANGDLL
 
-;--------------------------------
-; Sections
+;--------------------------------------------------------------
+; (Core) OpenTTD install section. Copies all internal game data
 Section "!OpenTTD" Section1
-
-	; Set Section properties
+	; Overwrite files by default, but don't complain on failure
 	SetOverwrite try
 
 	; Make savegame folder
 	SetOutPath "$INSTDIR\save"
-	; define root variable relative to installer
+	; Define root variable relative to installer
 	!define PATH_ROOT "..\..\..\"
 
 	; Copy language files
-  SetOutPath "$INSTDIR\lang\"
-  File ${PATH_ROOT}lang\*.lng
-  File ${PATH_ROOT}lang\english.txt
+	SetOutPath "$INSTDIR\lang\"
+	File ${PATH_ROOT}lang\*.lng
+	File ${PATH_ROOT}lang\english.txt
 
 	; Copy data files
 	SetOutPath "$INSTDIR\data\"
 	File ${PATH_ROOT}data\*.grf
 	File ${PATH_ROOT}data\opntitle.dat
-  ; Copy scenario files
+	; Copy scenario files (don't choke if they don't exist)
 	SetOutPath "$INSTDIR\scenario\"
-  File ${PATH_ROOT}scenario\*.scn
+	File /nonfatal ${PATH_ROOT}scenario\*.scn
 
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
 
-	;Copy text files
-  File ${PATH_ROOT}changelog.txt
-  File ${PATH_ROOT}COPYING
-  File ${PATH_ROOT}readme.txt
-  File ${PATH_ROOT}known-bugs.txt
+	; Copy text files
+	File ${PATH_ROOT}changelog.txt
+	File ${PATH_ROOT}COPYING
+	File ${PATH_ROOT}readme.txt
+	File ${PATH_ROOT}known-bugs.txt
 
 	; Copy executable
-	File /oname=OpenTTD.exe        ${PATH_ROOT}Release\openttd.exe
+	File /oname=openttd.exe ${PATH_ROOT}Release\openttd.exe
 	File ${PATH_ROOT}strgen\Debug\strgen.exe
 
 
-  ; Delete old files from the main dir. they are now placed in data/ and lang/
+	; Delete old files from the main dir. they are now placed in data/ and lang/
 	Delete "$INSTDIR\*.lng"
 	Delete "$INSTDIR\*.grf"
 	Delete "$INSTDIR\sample.cat"
 	Delete "$INSTDIR\ttd.exe"
 
 
-	;Creates the Registry Entries
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Comments" "Visit http://www.openttd.org"
+	; Create the Registry Entries
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Comments" "Visit ${APPURLLINK}"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayIcon" "$INSTDIR\openttd.exe,0"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayName" "OpenTTD ${APPVERSION}"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion" "${APPVERSION}"
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "HelpLink" "http://www.openttd.org"
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "HelpLink" "${APPURLLINK}"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder" "$INSTDIR"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Publisher" "OpenTTD"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Shortcut Folder" "$SHORTCUTS"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString" "$INSTDIR\uninstall.exe"
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "URLInfoAbout" "http://www.openttd.org"
-	;This key sets the Version DWORD that patches will check against
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "URLInfoAbout" "${APPURLLINK}"
+	; This key sets the Version DWORD that new installers will check against
 	WriteRegDWORD HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Version" ${INSTALLERVERSION}
 
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN "OpenTTD"
@@ -155,13 +160,15 @@ Section "!OpenTTD" Section1
 	!insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
+;----------------------------------------------------------------------------------
+; TTDLX files install section. Copies all needed TTDLX files from CD or install dir
 Section "Copy Game Graphics" Section2
-	; Include files from CD
-	;Let's copy the files from the CD
+	; Let's copy the files with size approximation
 	SetOutPath "$INSTDIR\gm"
-	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\gm\"
+	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\gm\" 1028
 	SetOutPath "$INSTDIR\data\"
 	CopyFiles "$CDDRIVE\sample.cat" "$INSTDIR\data\sample.cat" 1566
+	; Copy Windows files
 	CopyFiles "$CDDRIVE\trg1r.grf" "$INSTDIR\data\trg1r.grf" 2365
 	CopyFiles "$CDDRIVE\trgcr.grf" "$INSTDIR\data\trgcr.grf" 260
 	CopyFiles "$CDDRIVE\trghr.grf" "$INSTDIR\data\trghr.grf" 400
@@ -176,7 +183,8 @@ Section "Copy Game Graphics" Section2
 	SetOutPath "$INSTDIR\"
 SectionEnd
 
-;----------------------
+;-------------------------------------------
+; Install the uninstaller (option is hidden)
 Section -FinishSection
 	WriteUninstaller "$INSTDIR\uninstall.exe"
 SectionEnd
@@ -184,28 +192,33 @@ SectionEnd
 ; Modern install component descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "OpenTTD is a fully functional clone of TTD and is very playable."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics. Requires TTD for Windows."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics. Requires TTD (for Windows)."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
-;!undef SHORTCUTS
-;Uninstall section
-
-Section Uninstall
-	MessageBox MB_YESNOCANCEL|MB_ICONQUESTION "Would you like to remove the Saved Game Folders located at '$INSTDIR\Save?'  If you choose Yes, your Saved Games will be removed." IDYES RemoveSavedGames IDNO NoRemoveSavedGames
+;-----------------------------------------------
+; Uninstall section, deletes all installed files
+Section "Uninstall"
+	MessageBox MB_YESNO|MB_ICONQUESTION \
+		"Remove the save game folders located at $\"$INSTDIR\save?$\"$\n \
+		If you choose Yes, your saved games will be deleted." \
+		IDYES RemoveSavedGames IDNO NoRemoveSavedGames
 	RemoveSavedGames:
-		Delete "$INSTDIR\Save\AutoSave\*"
-		RMDir "$INSTDIR\Save\AutoSave"
-		Delete "$INSTDIR\Save\*"
-		RMDir "$INSTDIR\Save"
+		Delete "$INSTDIR\save\autosave\*"
+		RMDir "$INSTDIR\save\autosave"
+		Delete "$INSTDIR\save\*"
+		RMDir "$INSTDIR\save"
 	NoRemoveSavedGames:
 
-	MessageBox MB_YESNOCANCEL|MB_ICONQUESTION "Would you like to remove the Scenario Folders located at '$INSTDIR\Scenario?'  If you choose Yes, your Scenarios will be removed." IDYES RemoveScen IDNO NoRemoveScen
+	MessageBox MB_YESNO|MB_ICONQUESTION \
+		"Remove the scenario folders located at $\"$INSTDIR\scenario?$\"$\n \
+		If you choose Yes, your scenarios will be deleted." \
+		IDYES RemoveScen IDNO NoRemoveScen
 	RemoveScen:
-		Delete "$INSTDIR\Scenario\*"
-		RMDir "$INSTDIR\Scenario"
+		Delete "$INSTDIR\scenario\*"
+		RMDir "$INSTDIR\scenario"
 	NoRemoveScen:
 
-	;Remove from registry...
+	; Remove from registry...
 	!insertmacro MUI_STARTMENU_GETFOLDER "OpenTTD" $SHORTCUTS
 	ReadRegStr $SHORTCUTS HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Shortcut Folder"
 
@@ -238,13 +251,19 @@ Section Uninstall
 
 	; Data files
 	Delete "$INSTDIR\data\opntitle.dat"
+
+	Delete "$INSTDIR\data\2ccmap.grf"
+	Delete "$INSTDIR\data\airports.grf"
+	Delete "$INSTDIR\data\autorail.grf"
+	Delete "$INSTDIR\data\canalsw.grf"
+	Delete "$INSTDIR\data\dosdummy.grf"
+	Delete "$INSTDIR\data\elrailsw.grf"
 	Delete "$INSTDIR\data\nsignalsw.grf"
 	Delete "$INSTDIR\data\openttd.grf"
-	Delete "$INSTDIR\data\canalsw.grf"
 	Delete "$INSTDIR\data\trkfoundw.grf"
-	Delete "$INSTDIR\data\autorail.grf"
-	Delete "$INSTDIR\data\dosdummy.grf"
+
 	Delete "$INSTDIR\data\sample.cat"
+	; Windows Data files
 	Delete "$INSTDIR\data\trg1r.grf"
 	Delete "$INSTDIR\data\trghr.grf"
 	Delete "$INSTDIR\data\trgtr.grf"
@@ -257,10 +276,10 @@ Section Uninstall
 	Delete "$INSTDIR\data\trgc.grf"
 	Delete "$INSTDIR\data\trgi.grf"
 
-	;Music
+	; Music
 	Delete "$INSTDIR\gm\*.gm"
 
-	;Language files
+	; Language files
 	Delete "$INSTDIR\lang\*.lng"
 	Delete "$INSTDIR\lang\english.txt"
 
@@ -271,104 +290,148 @@ Section Uninstall
 	RMDir "$INSTDIR\lang"
 	RMDir "$INSTDIR\data"
 	RMDir "$INSTDIR"
+
 SectionEnd
 
-Function SelectCD
+;------------------------------------------------------------
+; Custom page function to find the TTDLX CD/install location
+Function SelectCDEnter
 	SectionGetFlags ${Section2} $0
 	IntOp $1 $0 & 0x80 ; bit 7 set by upgrade, no need to copy files
-	IntCmp $1 1 DoneCD ;upgrade doesn't need copy files
+	IntCmp $1 1 DoneCD ; Upgrade doesn't need copy files
 
 	IntOp $0 $0 & 1
 	IntCmp $0 1 NoAbort
-		Abort
+	Abort
 NoAbort:
 
 	GetTempFileName $R0
 	!insertmacro MUI_HEADER_TEXT "Locate TTD" "Setup needs the location of Transport Tycoon Deluxe in order to continue."
-	File /oname=$R0 CDFinder.ini
+	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "CDFinder.ini" "CDFinder"
+
 	ClearErrors
-	;Now, let's populate $CDDRIVE
-	ReadRegStr $CDDRIVE HKLM "SOFTWARE\Fish Technology Group\Transport Tycoon Deluxe" "HDPath"
+	; Now, let's populate $CDDRIVE
+	ReadRegStr $R0 HKLM "SOFTWARE\Fish Technology Group\Transport Tycoon Deluxe" "HDPath"
 	IfErrors NoTTD
-	StrCpy $AddWinPrePopulate "Setup has detected your TTD folder.  Don't change the folder.  Simply press Next."
+	StrCmp $CDDRIVE "" 0 Populated
+	StrCpy $CDDRIVE $R0
+Populated:
+	StrCpy $AddWinPrePopulate "Setup has detected your TTD folder. Don't change the folder. Simply press Next."
 	Goto TruFinish
 NoTTD:
-	StrCpy $CDDRIVE ""
-	StrCpy $AddWinPrePopulate "Setup couldn't find TTD.  Please enter the path where the graphics files from TTD are stored and press Next to continue."
+	StrCpy $AddWinPrePopulate "Setup couldn't find TTD. Please enter the path where the graphics files from TTD are stored and press Next to continue."
 TruFinish:
 	ClearErrors
-	WriteINIStr $R0 "Field 2" "State" $CDDRIVE
-	WriteINIStr $R0 "Field 3" "Text" $AddWinPrePopulate
+	!insertmacro MUI_INSTALLOPTIONS_WRITE "CDFinder" "Field 2" "State" $CDDRIVE          ; TTDLX path
+	!insertmacro MUI_INSTALLOPTIONS_WRITE "CDFinder" "Field 3" "Text" $AddWinPrePopulate ; Caption
 DoneCD:
-	InstallOptions::dialog $R0
-	Pop $R1
+	; Initialize the dialog *AFTER* we've changed the text otherwise we won't see the changes
+	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "CDFinder"
+	!insertmacro MUI_INSTALLOPTIONS_SHOW
 FunctionEnd
 
-; Exit from page function
-Function SelectCD2
-	ReadINIStr $CDDRIVE $R0 "Field 2" "State"
-	IfFileExists $CDDRIVE\trg1r.grf "" NoCD
-	IfFileExists $CDDRIVE\sample.cat "" NoCD
-	IfFileExists $CDDRIVE\trgir.grf hasCD ""
+;----------------------------------------------------------------
+; Custom page function when 'next' is selected for the TTDLX path
+Function SelectCDExit
+	!insertmacro MUI_INSTALLOPTIONS_READ $CDDRIVE "CDFinder" "Field 2" "State"
+	; If trg1r.grf does not exist at the path, retry with DOS version
+	IfFileExists $CDDRIVE\trg1r.grf "" DosCD
+	IfFileExists $CDDRIVE\trgir.grf "" NoCD
+	IfFileExists $CDDRIVE\sample.cat hasCD NoCD
+DosCD:
+	IfFileExists $CDDRIVE\TRG1.GRF "" NoCD
+	IfFileExists $CDDRIVE\TRGI.GRF "" NoCD
+	IfFileExists $CDDRIVE\SAMPLE.CAT hasCD NoCD
 NoCD:
-  MessageBox MB_OK "Setup cannot continue without the Transport Tycoon Deluxe Location!"
-  Abort
+	MessageBox MB_OK "Setup cannot continue without the Transport Tycoon Deluxe Location!"
+	Abort
 hasCD:
 FunctionEnd
 
+;---------------------------------------------------------------------
+; Custom page function to show notices for running OpenTTD
+; We have extracted this custom page as Notice in the .onInit function
+Function ShowWarningsPage
+	!insertmacro MUI_HEADER_TEXT "Installation Complete" "Important notices for OpenTTD usage."
+	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "notice.ini" "Notice"
+	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "Notice"
+
+	Call GetWindowsVersion
+	Pop $R0
+
+	; Hide the MSLU text if the installer is not run on Win9x systems
+	StrCmp $R0 "winnt" 0 Win9x
+	!insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 1" "HWND" ; MSLU groupbox
+	ShowWindow $R1 0
+	!insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 2" "HWND" ; MSLU text
+	ShowWindow $R1 0
+	!insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 3" "HWND" ; MSLU link
+	ShowWindow $R1 0
+Win9x:
+	ClearErrors
+	!insertmacro MUI_INSTALLOPTIONS_SHOW
+FunctionEnd
+
+;-------------------------------------------------------------------------------
+; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
+Function GetWindowsVersion
+	ClearErrors
+	StrCpy $R0 "winnt"
+
+	ReadRegStr $R1 HKLM "SOFTWARE\MICROSOFT\WINDOWS NT\CurrentVersion" CurrentVersion
+	IfErrors 0 WinNT
+	StrCpy $R0 "win9x"
+WinNT:
+	ClearErrors
+	Push $R0
+FunctionEnd
 
 Var OLDVERSION
 Var UninstallString
 
+;-----------------------------------------------------------------------------------
+; NSIS Initialize function, determin if we are going to install/upgrade or uninstall
 Function .onInit
 	StrCpy $SHORTCUTS "OpenTTD"
 
 	SectionSetFlags 0 17
 
-	;Want to have a splash BMP?  Uncomment these lines - CAREFUL WITH FILE SIZE
-
-;	        # the plugins dir is automatically deleted when the installer exits
-;        InitPluginsDir
-;				File /oname=$PLUGINSDIR\splash.bmp "C:\Documents and Settings\Administrator\My Documents\My Pictures\OpenTTD Splash.bmp"
-;        #optional
-;        #File /oname=$PLUGINSDIR\splash.wav "C:\myprog\sound.wav"
-;
-;        ;MessageBox MB_OK "Fading"
-;
-;       advsplash::show 3000 600 400 -1 $PLUGINSDIR\splash
-;
-;      Pop $0          ; $0 has '1' if the user closed the splash screen early,
-;                        ; '0' if everything closed normal, and '-1' if some error occured.
-;End Splash Area
-		;Starts Setup - let's look for an older version of OpenTTD
+	; Starts Setup - let's look for an older version of OpenTTD
 	ReadRegDWORD $R8 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Version"
 
 	IfErrors ShowWelcomeMessage ShowUpgradeMessage
 ShowWelcomeMessage:
 	ReadRegStr $R8 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Version"
-	;In the event someone still has OpenTTD 0.1, this will detect that (that installer used a string instead of dword entry)
+	; In the event someone still has OpenTTD 0.1, this will detect that (that installer used a string instead of dword entry)
 	IfErrors FinishCallback
 
 ShowUpgradeMessage:
 	IntCmp ${INSTALLERVERSION} $R8 VersionsAreEqual InstallerIsOlder  WelcomeToSetup
 WelcomeToSetup:
-	;An older version was found.  Let's let the user know there's an upgrade that will take plce.
+	; An older version was found.  Let's let the user know there's an upgrade that will take place.
 	ReadRegStr $OLDVERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion"
-	;Gets the older version then displays it in a message box
-	MessageBox MB_OK|MB_ICONINFORMATION "Welcome to ${APPNAMEANDVERSION} Setup.$\n$\nThis will allow you to upgrade from version $OLDVERSION."
+	; Gets the older version then displays it in a message box
+	MessageBox MB_OK|MB_ICONINFORMATION \
+		"Welcome to ${APPNAMEANDVERSION} Setup.$\n \
+		This will allow you to upgrade from version $OLDVERSION."
 	SectionSetFlags ${Section2} 0x80 ; set bit 7
 	Goto FinishCallback
 
 VersionsAreEqual:
 	ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString"
 	IfFileExists "$UninstallString" "" FinishCallback
-	MessageBox MB_YESNO|MB_ICONQUESTION "Setup detected ${APPNAMEANDVERSION} on your system. That's the version this program will install.$\n$\nAre you trying to uninstall it?" IDYES DoUninstall IDNO FinishCallback
-DoUninstall: ;You have the same version as this installer.  This allows you to uninstall.
+	MessageBox MB_YESNO|MB_ICONQUESTION \
+		"Setup detected ${APPNAMEANDVERSION} on your system. That's the version this program will install.$\n \
+		Are you trying to uninstall it?" \
+		IDYES DoUninstall IDNO FinishCallback
+DoUninstall: ; You have the same version as this installer.  This allows you to uninstall.
 	Exec "$UninstallString"
 	Quit
 
 InstallerIsOlder:
-	MessageBox MB_OK|MB_ICONSTOP "You have a newer version of ${APPNAME}.$\n$\nSetup will now exit."
+	MessageBox MB_OK|MB_ICONSTOP \
+		"You have a newer version of ${APPNAME}.$\n \
+		Setup will now exit."
 	Quit
 
 FinishCallback:

os/win32/installer/notice.ini

@@ -0,0 +1,54 @@
+; Ini file generated by the HM NIS Edit IO designer.
+[Settings]
+NumFields=6
+
+[Field 1]
+Type=Groupbox
+Text=Notice for Windows 9x/ME users!
+Left=8
+Right=292
+Top=80
+Bottom=138
+
+[Field 2]
+Type=Label
+Text=OpenTTD will not work without the Microsoft Layer for Unicode installed.\r\nDue to licensing issues we cannot bundle this file with the installer. Please download MSLU from the Microsoft website and extract UnicoWS.dll to the same directory as the openttd executabe.
+Left=13
+Right=284
+Top=91
+Bottom=127
+
+[Field 3]
+Type=Link
+Text=Microsoft Layer for Unicode
+State=http://www.microsoft.com/downloads/details.aspx?FamilyId=73BA7BD7-ED06-4F0D-80A4-2A7EEAEE17E2&displaylang=en
+Left=197
+Right=284
+Top=127
+Bottom=135
+
+[Field 4]
+Type=Groupbox
+Text=UNICODE support
+Left=8
+Right=292
+Top=0
+Bottom=75
+
+[Field 5]
+Type=Label
+Text=This version of OpenTTD has support for UNICODE, allowing users to use non-ASCII character sets such as Russian or Japanese.\r\nSelecting such a language will result in an unusable and garbled interface. You will need to specify a font that has support for these characters in openttd.cfg, or alternatively use an appropiate grf file.\r\n\r\nFor more information please refer to the readme or the wiki.
+Left=13
+Right=284
+Top=9
+Bottom=65
+
+[Field 6]
+Type=Link
+Text=OpenTTD wiki
+Left=238
+Right=284
+Top=64
+Bottom=72
+State=http://wiki.openttd.org/index.php/Unicode
+

ottdres.rc

@@ -84,7 +84,7 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "Development Version\0"
+            VALUE "FileVersion", "0.5.0 (r8924)\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright <20> OpenTTD Developers 2002-2007. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2007-02-08
-Release version: 0.5.0-RC5
+Last updated:    2007-02-27
+Release version: 0.5.0
 ------------------------------------------------------------------------
 
 

settings.c

@@ -958,7 +958,7 @@ static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list
 	SDTG_CONDVAR(name, type, flags, guiflags, var, def, min, max, interval, str, proc, 0, SL_MAX_VERSION)
 
 #define SDTG_CONDBOOL(name, flags, guiflags, var, def, str, proc, from, to)\
-	SDTG_GENERAL(name, SDT_BOOLX, SL_VAR, SLE_UINT8, flags, guiflags, var, 0, def, 0, 1, 0, NULL, str, proc, from, to)
+	SDTG_GENERAL(name, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, var, 0, def, 0, 1, 0, NULL, str, proc, from, to)
 #define SDTG_BOOL(name, flags, guiflags, var, def, str, proc)\
 	SDTG_CONDBOOL(name, flags, guiflags, var, def, str, proc, 0, SL_MAX_VERSION)
 

station_cmd.c

@@ -42,7 +42,7 @@ typedef enum StationRectModes
 
 static void StationRect_Init(Station *st);
 static bool StationRect_IsEmpty(Station *st);
-static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, StationRectMode mode);
+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);
@@ -231,12 +231,6 @@ static Station* GetStationAround(TileIndex tile, int w, int h, StationID closest
 	BEGIN_TILE_LOOP(tile_cur, w + 2, h + 2, tile - TileDiffXY(1, 1))
 		if (IsTileType(tile_cur, MP_STATION)) {
 			StationID t = GetStationIndex(tile_cur);
-			{
-				Station *st = GetStation(t);
-				// you cannot take control of an oilrig!!
-				if (st->airport_type == AT_OILRIG && st->facilities == (FACIL_AIRPORT|FACIL_DOCK))
-					continue;
-			}
 
 			if (closest_station == INVALID_STATION) {
 				closest_station = t;
@@ -1016,7 +1010,7 @@ int32 CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1, uint3
 
 	if (st != NULL) {
 		// Reuse an existing station.
-		if (st->owner != OWNER_NONE && st->owner != _current_player)
+		if (st->owner != _current_player)
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
 
 		if (st->train_tile != 0) {
@@ -1249,14 +1243,14 @@ uint GetStationPlatforms(const Station *st, TileIndex tile)
 	do {
 		t -= delta;
 		len++;
-	} while (TileBelongsToRailStation(st, t) && GetRailStationAxis(t) == axis);
+	} while (IsCompatibleTrainStationTile(t, tile));
 
 	// find ending tile
 	t = tile;
 	do {
 		t += delta;
 		len++;
-	} while (TileBelongsToRailStation(st, t) && GetRailStationAxis(t) == axis);
+	} while (IsCompatibleTrainStationTile(t, tile));
 
 	return len - 1;
 }
@@ -1451,7 +1445,7 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	}
 
 	if (st != NULL) {
-		if (st->owner != OWNER_NONE && st->owner != _current_player) {
+		if (st->owner != _current_player) {
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
 		}
 
@@ -1706,7 +1700,7 @@ int32 CmdBuildAirport(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	}
 
 	if (st != NULL) {
-		if (st->owner != OWNER_NONE && st->owner != _current_player)
+		if (st->owner != _current_player)
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
 
 		if (!StationRect_BeforeAddRect(st, tile, w, h, RECT_MODE_TEST)) return CMD_ERROR;
@@ -1987,7 +1981,7 @@ int32 CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	}
 
 	if (st != NULL) {
-		if (st->owner != OWNER_NONE && st->owner != _current_player)
+		if (st->owner != _current_player)
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
 
 		if (!StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], RECT_MODE_TEST)) return CMD_ERROR;
@@ -2929,7 +2923,6 @@ 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) {
@@ -2939,12 +2932,6 @@ 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);
-	}
 }
 
 
@@ -3188,7 +3175,7 @@ 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)
+bool StationRect_BeforeAddTile(Station *st, TileIndex tile, StationRectMode mode)
 {
 	Rect *r = &st->rect;
 	int x = TileX(tile);

strings.c

@@ -23,13 +23,8 @@
 #include "date.h"
 #include "industry.h"
 
-#ifdef WIN32
 /* for opendir/readdir/closedir */
 # include "fios.h"
-#else
-# include <sys/types.h>
-# include <dirent.h>
-#endif /* WIN32 */
 
 char _userstring[128];
 
@@ -1225,7 +1220,7 @@ static int GetLanguageList(char **languages, int max)
 	struct dirent *dirent;
 	int num = 0;
 
-	dir = opendir(_paths.lang_dir);
+	dir = ttd_opendir(_paths.lang_dir);
 	if (dir != NULL) {
 		while ((dirent = readdir(dir)) != NULL) {
 			const char *d_name = FS2OTTD(dirent->d_name);

table/namegen.h

@@ -709,17 +709,17 @@ static const char *name_french_real[] = {
 	"Bordeaux",
 	"Bayonne",
 	"Montpellier",
-	"Montelimar",
+	"Montélimar",
 	"Valence",
 	"Digne",
 	"Nice",
 	"Cannes",
 	"St. Tropez",
-	"Marseilles",
+	"Marseille",
 	"Narbonne",
 	"Sète",
 	"Aurillac",
-	"Gueret",
+	"Guéret",
 	"Le Creusot",
 	"Nevers",
 	"Auxerre",
@@ -731,7 +731,7 @@ static const char *name_french_real[] = {
 	"Chaumont",
 	"Langres",
 	"Bourg",
-	"Lyons",
+	"Lyon",
 	"Vienne",
 	"Grenoble",
 	"Toulon",
@@ -763,7 +763,7 @@ static const char *name_french_real[] = {
 	"Beaujolais",
 	"Narbonne",
 	"Albi",
-	"St. Valery",
+	"Paris",
 	"Biarritz",
 	"Béziers",
 	"Nîmes",

train_cmd.c

@@ -1004,13 +1004,15 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 
 	src = GetVehicle(s);
 
-	if (src->type != VEH_Train) return CMD_ERROR;
+	if (src->type != VEH_Train || !CheckOwnership(src->owner)) return CMD_ERROR;
 
 	// if nothing is selected as destination, try and find a matching vehicle to drag to.
 	if (d == INVALID_VEHICLE) {
 		dst = IsTrainEngine(src) ? NULL : FindGoodVehiclePos(src);
 	} else {
+		if (!IsValidVehicleID(d)) return CMD_ERROR;
 		dst = GetVehicle(d);
+		if (dst->type != VEH_Train || !CheckOwnership(dst->owner)) return CMD_ERROR;
 	}
 
 	// if an articulated part is being handled, deal with its parent vehicle
@@ -1022,17 +1024,15 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	// don't move the same vehicle..
 	if (src == dst) return 0;
 
-	/* the player must be the owner */
-	if (!CheckOwnership(src->owner) || (dst != NULL && !CheckOwnership(dst->owner)))
-		return CMD_ERROR;
-
 	/* locate the head of the two chains */
 	src_head = GetFirstVehicleInChain(src);
-	dst_head = NULL;
 	if (dst != NULL) {
 		dst_head = GetFirstVehicleInChain(dst);
+		if (dst_head->tile != src_head->tile) return CMD_ERROR;
 		// Now deal with articulated part of destination wagon
 		dst = GetLastEnginePart(dst);
+	} else {
+		dst_head = NULL;
 	}
 
 	if (dst != NULL && IsMultiheaded(dst) && !IsTrainEngine(dst) && IsTrainWagon(src)) {
@@ -1089,8 +1089,6 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 				// check if all vehicles in the dest train are stopped.
 				dst_len = CheckTrainStoppedInDepot(dst_head);
 				if (dst_len < 0) return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED);
-
-				assert(dst_head->tile == src_head->tile);
 			}
 
 			// We are moving between rows, so only count the wagons from the source

tunnelbridge_cmd.c

@@ -611,7 +611,7 @@ static int32 DoClearTunnel(TileIndex tile, uint32 flags)
 }
 
 
-static uint GetBridgeHeightRamp(TileIndex t)
+uint GetBridgeHeightRamp(TileIndex t)
 {
 	uint h;
 	uint tileh = GetTileSlope(t, &h);

vehicle.c

@@ -514,6 +514,7 @@ Vehicle *GetFirstVehicleInChain(const Vehicle *v)
 	Vehicle* u;
 
 	assert(v != NULL);
+	assert(v->type == VEH_Train);
 
 	if (v->first != NULL) {
 		if (IsFrontEngine(v->first) || IsFreeWagon(v->first)) return v->first;
@@ -1839,13 +1840,22 @@ int32 CmdCloneVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		total_cost += cost;
 
 		if (flags & DC_EXEC) {
+			Vehicle *v2, *w2;
 			w = GetVehicle(_new_vehicle_id);
+			w2 = w;
+			v2 = v;
+
+			do {
+				if (v->cargo_type != w->cargo_type || v->cargo_subtype != w->cargo_subtype) {
+					/* We can't pay for refitting because we can't estimate refitting costs for a vehicle before it's build.
+					 * If we pay for it anyway, the cost and the estimated cost will not be the same and we will have an assert.
+					 * We need to check the whole chain if it is a train because some newgrf articulated engines can refit some
+					 * units only (and not the front) */
+					DoCommand(0, w->index, v2->cargo_type | (v2->cargo_subtype << 8), flags, CMD_REFIT_VEH(v->type));
+					break; // We learned that the engine in question needed a refit. No need to check anymore
+				}
+			} while (v->type == VEH_Train && (w2 = w2->next) != NULL && (v2 = v2->next) != NULL);
 
-			if (v->cargo_type != w->cargo_type || v->cargo_subtype != w->cargo_subtype) {
-				// we can't pay for refitting because we can't estimate refitting costs for a vehicle before it's build
-				// if we pay for it anyway, the cost and the estimated cost will not be the same and we will have an assert
-				DoCommand(0, w->index, v->cargo_type | (v->cargo_subtype << 8), flags, CMD_REFIT_VEH(v->type));
-			}
 			if (v->type == VEH_Train && HASBIT(v->u.rail.flags, VRF_REVERSE_DIRECTION)) {
 				SETBIT(w->u.rail.flags, VRF_REVERSE_DIRECTION);
 			}

video/cocoa_v.m

@@ -503,12 +503,12 @@ static bool QZ_PollEvent(void)
 			break;
 
 		case NSLeftMouseDown:
+			pt = QZ_GetMouseLocation(event);
 			if (!([ event modifierFlags ] & NSCommandKeyMask) ||
 					!QZ_MouseIsInsideView(&pt)) {
 				[NSApp sendEvent:event];
 			}
 
-			pt = QZ_GetMouseLocation(event);
 			if (!QZ_MouseIsInsideView(&pt)) {
 				QZ_ShowMouse();
 				break;

viewport.c

@@ -1617,7 +1617,7 @@ static bool CheckClickOnSign(const ViewPort *vp, int x, int y)
 {
 	const Sign *si;
 
-	if (!(_display_opt & DO_SHOW_SIGNS)) return false;
+	if (!(_display_opt & DO_SHOW_SIGNS) || _current_player == PLAYER_SPECTATOR) return false;
 
 	switch (vp->zoom) {
 		case 0:

water_cmd.c

@@ -20,6 +20,7 @@
 #include "train.h"
 #include "water_map.h"
 #include "newgrf.h"
+#include "bridge.h"
 
 const SpriteID _water_shore_sprites[15] = {
 	0,
@@ -617,10 +618,10 @@ static Vehicle *FindFloodableVehicleOnTile(TileIndex tile)
 	byte z;
 	Vehicle *v;
 
-	if (!IsBridgeTile(tile)) return FindVehicleOnTileZ(tile, 0);
+	if (!IsBridgeTile(tile) || !IsBridgeRamp(tile)) return FindVehicleOnTileZ(tile, 0);
 
 	end = GetOtherBridgeEnd(tile);
-	z = GetBridgeHeight(tile);
+	z = GetBridgeHeightRamp(tile);
 
 	/* check the start tile first since as this is closest to the water */
 	v = FindVehicleOnTileZ(tile, z);

win32.c

@@ -652,19 +652,23 @@ static inline void dir_free(DIR *d)
 	}
 }
 
-DIR *opendir(const char *path)
+DIR *opendir(const wchar_t *path)
 {
 	DIR *d;
 	UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS); // disable 'no-disk' message box
-	DWORD fa = GetFileAttributesW(OTTD2FS(path));
+	DWORD fa = GetFileAttributesW(path);
 
 	if ((fa != INVALID_FILE_ATTRIBUTES) && (fa & FILE_ATTRIBUTE_DIRECTORY)) {
 		d = dir_calloc();
 		if (d != NULL) {
-			char search_path[MAX_PATH];
-			/* build search path for FindFirstFile */
-			snprintf(search_path, lengthof(search_path), "%s" PATHSEP "*", path);
-			d->hFind = FindFirstFileW(OTTD2FS(search_path), &d->fd);
+			wchar_t search_path[MAX_PATH];
+			bool slash = path[wcslen(path) - 1] == L'\\';
+
+			/* build search path for FindFirstFile, try not to append additional slashes
+			 * as it throws Win9x off its groove for root directories */
+			_snwprintf(search_path, lengthof(search_path), L"%s%s*", path, slash ? L"" : L"\\");
+			*lastof(search_path) = '\0';
+			d->hFind = FindFirstFileW(search_path, &d->fd);
 
 			if (d->hFind != INVALID_HANDLE_VALUE ||
 					GetLastError() == ERROR_NO_MORE_FILES) { // the directory is empty

yapf/yapf.hpp

@@ -82,10 +82,10 @@ typedef CPerfStartFake CPerfStart;
 #include "hashtable.hpp"
 #include "binaryheap.hpp"
 #include "nodelist.hpp"
+#include "follow_track.hpp"
 #include "yapf_base.hpp"
 #include "yapf_node.hpp"
 #include "yapf_common.hpp"
-#include "follow_track.hpp"
 #include "yapf_costbase.hpp"
 #include "yapf_costcache.hpp"
 

yapf/yapf_base.hpp

@@ -7,10 +7,6 @@ EXTERN_C_BEGIN
 #include "../debug.h"
 EXTERN_C_END
 
-#include "fixedsizearray.hpp"
-#include "blob.hpp"
-#include "nodelist.hpp"
-
 extern int _total_pf_time_us;
 
 /** CYapfBaseT - A-star type path finder base class.
@@ -46,6 +42,7 @@ template <class Types>
 class CYapfBaseT {
 public:
 	typedef typename Types::Tpf Tpf;           ///< the pathfinder class (derived from THIS class)
+	typedef typename Types::TrackFollower TrackFollower;
 	typedef typename Types::NodeList NodeList; ///< our node list
 	typedef typename NodeList::Titem Node;     ///< this will be our node type
 	typedef typename Node::Key Key;            ///< key to hash tables
@@ -135,7 +132,7 @@ public:
 				break;
 			}
 		}
-		bool bDestFound = (m_pBestDestNode != NULL);
+		bool bDestFound = (m_pBestDestNode != NULL) && (m_pBestDestNode != m_pBestIntermediateNode);
 
 #ifndef NO_DEBUG_MESSAGES
 		perf.Stop();
@@ -191,20 +188,20 @@ public:
 	}
 
 	/** add multiple nodes - direct children of the given node */
-	FORCEINLINE void AddMultipleNodes(Node* parent, TileIndex tile, TrackdirBits td_bits)
+	FORCEINLINE void AddMultipleNodes(Node* parent, const TrackFollower &tf)
 	{
-		bool is_choice = (KillFirstBit2x64(td_bits) != 0);
-		for (TrackdirBits rtds = td_bits; rtds != TRACKDIR_BIT_NONE; rtds = (TrackdirBits)KillFirstBit2x64(rtds)) {
+		bool is_choice = (KillFirstBit2x64(tf.m_new_td_bits) != 0);
+		for (TrackdirBits rtds = tf.m_new_td_bits; rtds != TRACKDIR_BIT_NONE; rtds = (TrackdirBits)KillFirstBit2x64(rtds)) {
 			Trackdir td = (Trackdir)FindFirstBit2x64(rtds);
 			Node& n = Yapf().CreateNewNode();
-			n.Set(parent, tile, td, is_choice);
-			Yapf().AddNewNode(n);
+			n.Set(parent, tf.m_new_tile, td, is_choice);
+			Yapf().AddNewNode(n, tf);
 		}
 	}
 
 	/** AddNewNode() - called by Tderived::PfFollowNode() for each child node.
 	 *  Nodes are evaluated here and added into open list */
-	void AddNewNode(Node& n)
+	void AddNewNode(Node &n, const TrackFollower &tf)
 	{
 		// evaluate the node
 		bool bCached = Yapf().PfNodeCacheFetch(n);
@@ -214,7 +211,7 @@ public:
 			m_stats_cache_hits++;
 		}
 
-		bool bValid = Yapf().PfCalcCost(n);
+		bool bValid = Yapf().PfCalcCost(n, tf);
 
 		if (bCached) {
 			Yapf().PfNodeCacheFlush(n);

yapf/yapf_costrail.hpp

@@ -64,7 +64,7 @@ public:
 	}
 
 	/** return one tile cost. If tile is a tunnel entry, it is moved to the end of tunnel */
-	FORCEINLINE int OneTileCost(TileIndex& tile, Trackdir trackdir)
+	FORCEINLINE int OneTileCost(TileIndex prev_tile, TileIndex& tile, Trackdir trackdir)
 	{
 		int cost = 0;
 		// set base cost
@@ -77,11 +77,6 @@ public:
 						cost += Yapf().PfGetSettings().rail_crossing_penalty;
 					break;
 
-				case MP_STATION:
-					// penalty for passing station tiles
-					cost += Yapf().PfGetSettings().rail_station_penalty;
-					break;
-
 				default:
 					break;
 			}
@@ -176,7 +171,7 @@ public:
 	/** Called by YAPF to calculate the cost from the origin to the given node.
 	 *  Calculates only the cost of given node, adds it to the parent node cost
 	 *  and stores the result into Node::m_cost member */
-	FORCEINLINE bool PfCalcCost(Node& n)
+	FORCEINLINE bool PfCalcCost(Node &n, const TrackFollower &tf)
 	{
 		assert(!n.flags_u.flags_s.m_targed_seen);
 		CPerfStart perf_cost(Yapf().m_perf_cost);
@@ -199,8 +194,13 @@ public:
 
 		bool target_seen = Yapf().PfDetectDestination(tile, trackdir);
 
+		if (tf.m_is_station) {
+			// station tiles have an extra penalty
+			segment_cost += Yapf().PfGetSettings().rail_station_penalty * (tf.m_tiles_skipped + 1);
+		}
+
 		while (true) {
-			segment_cost += Yapf().OneTileCost(tile, trackdir);
+			segment_cost += Yapf().OneTileCost(prev_tile, tile, trackdir);
 			segment_cost += Yapf().CurveCost(prev_trackdir, trackdir);
 			segment_cost += Yapf().SlopeCost(tile, trackdir);
 			segment_cost += Yapf().SignalCost(n, tile, trackdir);
@@ -282,13 +282,13 @@ public:
 			// add penalty for skipped station tiles
 			if (F.m_is_station)
 			{
+				uint platform_length = F.m_tiles_skipped + 1;
 				if (target_seen) {
 					// it is our destination station
-					uint platform_length = F.m_tiles_skipped + 1;
 					segment_cost += PlatformLengthPenalty(platform_length);
 				} else {
 					// station is not our destination station, apply penalty for skipped platform tiles
-					segment_cost += Yapf().PfGetSettings().rail_station_penalty * F.m_tiles_skipped;
+					segment_cost += Yapf().PfGetSettings().rail_station_penalty * platform_length;
 				}
 			}
 

yapf/yapf_rail.cpp

@@ -34,7 +34,7 @@ public:
 	{
 		TrackFollower F(Yapf().GetVehicle());
 		if (F.Follow(old_node.GetLastTile(), old_node.GetLastTrackdir()))
-			Yapf().AddMultipleNodes(&old_node, F.m_new_tile, F.m_new_td_bits);
+			Yapf().AddMultipleNodes(&old_node, F);
 	}
 
 	/// return debug report character to identify the transportation type
@@ -97,7 +97,7 @@ public:
 	{
 		TrackFollower F(Yapf().GetVehicle());
 		if (F.Follow(old_node.GetLastTile(), old_node.GetLastTrackdir()))
-			Yapf().AddMultipleNodes(&old_node, F.m_new_tile, F.m_new_td_bits);
+			Yapf().AddMultipleNodes(&old_node, F);
 	}
 
 	/// return debug report character to identify the transportation type

yapf/yapf_road.cpp

@@ -66,7 +66,7 @@ public:
 	/** Called by YAPF to calculate the cost from the origin to the given node.
 	 *  Calculates only the cost of given node, adds it to the parent node cost
 	 *  and stores the result into Node::m_cost member */
-	FORCEINLINE bool PfCalcCost(Node& n)
+	FORCEINLINE bool PfCalcCost(Node& n, const TrackFollower &tf)
 	{
 		int segment_cost = 0;
 		// start at n.m_key.m_tile / n.m_key.m_td and walk to the end of segment
@@ -237,7 +237,7 @@ public:
 	{
 		TrackFollower F(Yapf().GetVehicle());
 		if (F.Follow(old_node.m_segment_last_tile, old_node.m_segment_last_td))
-			Yapf().AddMultipleNodes(&old_node, F.m_new_tile, F.m_new_td_bits);
+			Yapf().AddMultipleNodes(&old_node, F);
 	}
 
 	/// return debug report character to identify the transportation type

yapf/yapf_ship.cpp

@@ -26,7 +26,7 @@ public:
 	{
 		TrackFollower F;
 		if (F.Follow(old_node.m_key.m_tile, old_node.m_key.m_td))
-			Yapf().AddMultipleNodes(&old_node, F.m_new_tile, F.m_new_td_bits);
+			Yapf().AddMultipleNodes(&old_node, F);
 	}
 
 	/// return debug report character to identify the transportation type
@@ -86,6 +86,7 @@ class CYapfCostShipT
 {
 public:
 	typedef typename Types::Tpf Tpf;              ///< the pathfinder class (derived from THIS class)
+	typedef typename Types::TrackFollower TrackFollower;
 	typedef typename Types::NodeList::Titem Node; ///< this will be our node type
 	typedef typename Node::Key Key;               ///< key to hash tables
 
@@ -97,7 +98,7 @@ public:
 	/** Called by YAPF to calculate the cost from the origin to the given node.
 	 *  Calculates only the cost of given node, adds it to the parent node cost
 	 *  and stores the result into Node::m_cost member */
-	FORCEINLINE bool PfCalcCost(Node& n)
+	FORCEINLINE bool PfCalcCost(Node& n, const TrackFollower &tf)
 	{
 		// base tile cost depending on distance
 		int c = IsDiagonalTrackdir(n.GetTrackdir()) ? 10 : 7;