(svn r22938) -Release: 1.1.3

2026-07-19 09:09:42 +00:00 · 2011-09-15 19:12:16 +00:00
130 changed files with 2294 additions and 3435 deletions
@@ -60,9 +60,6 @@ ifdef OSXAPP
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
 	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
-endif
-ifeq ($(OS),UNIX)
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(DATA_DIR)/"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
@@ -248,10 +248,7 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(Q)$(WINDRES) -o $@ -I `basename $<` $<

 $(BIN_DIR)/$(TTD): $(TTD)
-	$(Q)cp $(TTD) $(BIN_DIR)/$(TTD)
-ifeq ($(OS), UNIX)
-	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/data/
-endif
+	$(Q)cp $< $@

 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'
@@ -8456,7 +8456,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetNumWagons():       3
  GetLength():          24
  GetWagonEngineType(): 9
-  GetWagonAge():        1
+  GetWagonAge():        0
  GetWagonEngineType(): 27
  GetWagonAge():        0
  GetWagonEngineType(): 27
@@ -8492,11 +8492,11 @@ ERROR: IsEnd() is invalid as Begin() is never called
    14 => 1
    12 => 1
  Age ListDump:
-    17 => 1
-    16 => 1
    14 => 1
    13 => 1
    12 => 1
+    17 => 0
+    16 => 0
  MaxAge ListDump:
    16 => 10980
    14 => 10980
@@ -8504,9 +8504,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
    13 => 5490
    12 => 5490
  AgeLeft ListDump:
-    16 => 10979
+    16 => 10980
    14 => 10979
-    17 => 7319
+    17 => 7320
    13 => 5489
    12 => 5489
  CurrentSpeed ListDump:
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 245e2125cecfe7e0b6c5e85d32459f86
+OPENTTD.GRF  = f99b8f65d32a8883a2b0979eb2f6729f

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 245e2125cecfe7e0b6c5e85d32459f86
+OPENTTD.GRF  = f99b8f65d32a8883a2b0979eb2f6729f

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 245e2125cecfe7e0b6c5e85d32459f86
+OPENTTD.GRF  = f99b8f65d32a8883a2b0979eb2f6729f

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -1,61 +1,3 @@
-1.1.4 (2011-12-05)
------------------------------------------------------------------------
- Fix: Savegames made with the Catalan town name generator would trigger a 'savegame corrupt' exception [FS#4866] (r23418)
- Fix: [Network] Do not send chat messages to clients that have not joined yet [FS#4826] (r23337)
- Fix: Assertion could be triggered in case a station was removed just after a vehicle delivered cargo to it [FS#4849] (r23312)
- Fix: Pathfinders go haywire when you build a lock over a ship going perpendicular to the axis of the new lock [FS#4845] (r23284)
- Fix: [NewGRF] Prevent against writing data for unknown fonts (r23283)
-
-
-1.1.4-RC1 (2011-11-20)
------------------------------------------------------------------------
- Fix: 3-column view of NewGRF GUI had too much space for certain font sizes (r23251)
- Fix: Ignore special characters, such as the train 'character', when determining a fallback font (r23237)
- Fix: [NewGRF] Make train var 0xF3 consistent with TTDPatch (r23231)
- Fix: Invalidate build vehicle window when changing the setting for wagon speed limits (r23211)
- Fix: [NoAI] Hide AIObject from the documentation as it cannot be used (r23204, r23201)
- Fix: [Network] Unstable sorting in the network list when two servers had the exact same name [FS#4829] (r23202)
- Fix: Oil rigs that 'expired' did not get removed from the station list [FS#4822] (r23199)
- Fix: [Squirrel] replace custom qsort by std::sort to fix stack overflow [FS#4830] (r23190, r23187, r23186)
- Fix: Do not display railway fences between track and waypoints [FS#4627] (r23163)
- Fix: [NoAI] AIOrder did not handle implicit orders correctly in all cases [FS#4823] (r23135, r23133)
- Fix: When any keys on the on-screen keyboard were pressed the text cursor disappeared (r23132)
- Fix: [NoAI] AIOrder::IsCurrentOrderPartOfOrderList return false for valid vehicles and crashed for invalid ones (r23131)
- Fix: [NoAI] calling require() to include a file gave you 100.000 opcodes for free (r23117)
- Fix: Allow accessing the server's client info as well in the admin network [FS#4813] (r23115)
- Fix: [NewGRF] Run StartupEngines() if NewGRFs changed during loading a savegame, just like it is running when NewGRFs are changed during a game (r23083)
- Fix: Account for snow line table when determining the snow line for building houses (r23082)
- Fix: [NewGRF] If a NewGRF overrides a default house the minimum start year for that house was set to 1930 [FS#4794] (r23059)
- Fix: [NoAI] AIOrder::GetOrderCount() did not hide implicit orders (r23057)
- Fix: [NewGRF] When vehicles break down, update the image cache after changing the vehicle state (r23050)
- Fix: Use the same forest-check for the vegetation-map colour as for nearby station names [FS#4810] (r23049)
- Fix: Check that the selected font size is valid the font face in use and choose the nearest size to that selected if not. Font metrics should then just work (r23038)
- Fix: [NewGRF] Strip newlines from NewGRF strings that should not have newlines, e.g. the NewGRF's name [FS#4769] (r23036, r22970)
- Fix: The last custom playlist items went lost when the files in the .obm are not contiguous [FS#4776] (r23035, r23034, r23033)
- Fix: Palette conversion windows to DOS for light house / stadium animated colour was mixed up (r23032)
- Fix: For the admin 'bots' there was no distinction between bankruptcy and manual removal of companies even though the API suggested that [FS#4804] (r23031)
- Fix: Always show a chat message and send an admin packet when a new company is made [FS#4796] (r23030)
- Fix: Pass bottom of dropdown item rather than bottom of dropdown window, so the dropdown gets drawn better with different font sizes (r23018)
- Fix: AI backlog was to short to fully display the backtrace of some AI crashes [FS#4798] (r23012)
- Fix: When the last used server is deleted from the list also clear the last used server if it is the same [FS#4791] (r23011)
- Fix: [NewGRF] Make sure temporary storage is cleared before test and exec runs for DoCommands so NewGRF callbacks cannot change the result between the runs (r22996)
- Fix: [NewGRF] Tile was cleared before the object-placement callback was run, resulting in possible differences in test and exec run [FS#4775] (r22994)
- Fix: [NoAI] Do not return ERR_UNKNOWN when the vehicle would become too long (r22988)
- Fix: Draw buoy sprite without outline on the map, fix minor issues with original graphics (r22974, r22973, r22971, r22962)
- Fix: The savegame description and loading of savegames would crash with savegames from a patched stable (which did not bump the savegame version) [FS#4778] (r22958, r22957)
- Fix: Guard from reading outside the silly name list (r22955)
- Fix: [NewGRF] Properly limit the length of strings in a choice list (r22952)
- Fix: [NewGRF] Do not call CB 32 for disaster, effect vehicles or aircraft shadows/rotors (r22947)
- Fix: [NewGRF] Crash when accessing vehicle var 44 for a non-front aircraft [FS#4781] (r22946)
- Fix: Calculate the size of the start/stop vehicle button correctly (r22941)
- Fix: [OSX] Various MacOSX 10.7 issues causing OpenTTD to not work [FS#4751] (r22921, r22895, r22893, r22889)
- Fix: [NewGRF] Properties for feature 0x05 were not zeroed for each NewGRF, thus waterfeatures could glitch when the properties were set by a previous NewGRF and the NewGRF assumed the properties to be unmodified (r22918)
- Fix: Old TTO/TTD savegames could get non-stop via orders upon savegame loading, even when those orders did not exist back then. This 'conversion' feature is something for TTDPatch and old OpenTTD savegames [FS#4716] (r22914)
- Fix: The icon would (almost) never be shown for SDL builds [FS#4617] (r22910)
- Fix: The name of the heightmap glitches in the 'play heightmap' window (r22902)
- Fix: Locks would be incorrectly assembled (r22108)
-
-
 1.1.3 (2011-09-15)
 ------------------------------------------------------------------------
 - Fix: Prevent authentication bypass for the admin port when a new game is started [FS#4771] (r22934)
@@ -78,7 +20,7 @@
 - Fix: Harden savegame load against too many AI config settings [CVE-2011-3342] [FS#4748] (r22843)
 - Fix: Compilation with GCC 4.7 (r22832, r22728, r22719)
 - Fix: Allow to demolish aqueducts built in the scenario editor [FS#4741] (r22821)
- Fix: Towns expanding from the 'wrong' side of a tunnel or bridge [FS#4731] (r22810, r22809)
+- Fix: Towns expanding from the "wrong" side of a tunnel or bridge [FS#4731] (r22810, r22809)
 - Fix: [NewGRF] String codes for dates should use unsigned words, like old OpenTTD did before it learned dates before 1920 (r22774)
 - Fix: [NoAI] Clarify the meaning of AIStation::IsWithinTownInfluence(), AITile::IsWithinTownInfluence() and AITown::IsWithinTownInfluence() [FS#4702] (r22763)
 - Fix: [NewGRF] Also free allocated depot tables of NewGRF airports (r22760)
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-12-05
-Release version: 1.1.4
+Last updated:    2011-09-15
+Release version: 1.1.3
 ------------------------------------------------------------------------


@@ -6,26 +6,13 @@
 // OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Aqueduct graphics by Jonathan G. Rennison / PaulC"
-// temperate aqueduct
-   -1 * 6	 07 83 01 \7! 00 09
+   -1 * 0	 0C "Aqueduct graphics by Jonathan G. Rennison"
   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354  8 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434  8 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514  8 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562  8 09 23 33   0  1
-// non-temperate aqueduct
-   -1 * 6	 07 83 01 \7= 00 09
-   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354 48 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434 48 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514 48 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562 48 09 23 33   0  1
+   -1 sprites/aqueduct.png 34 8 09 33 64 -34 -10
+   -1 sprites/aqueduct.png 114 8 09 33 66 -37 -9
+   -1 sprites/aqueduct.png 194 8 09 33 64 -34 -10
+   -1 sprites/aqueduct.png 274 8 09 33 66 -37 -9
+   -1 sprites/aqueduct.png 354 8 09 33 64 -34 -5
+   -1 sprites/aqueduct.png 434 8 09 33 66 -37 -4
+   -1 sprites/aqueduct.png 514 8 09 23 33 -31 0
+   -1 sprites/aqueduct.png 562 8 09 23 33 0 1
@@ -6,166 +6,70 @@
 // OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Canal graphics by George / PaulC"
+   -1 * 0	 0C "Canal graphics by George"
   -1 * 3	 05 08 41
-// Canal slopes
-   -1 sprites/canal_locks.png 66 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 146 8 09 39 64 -31 -8
-   -1 sprites/canal_locks.png 226 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 306 8 09 39 64 -31 -8
-// Lock sides
-   -1 sprites/canal_locks.png 386 8 09 59 64 -31 -36
-   -1 sprites/canal_locks.png 466 8 09 65 64 -31 -34
-   -1 sprites/canal_locks.png 546 8 09 59 64 -31 -36
-   -1 sprites/canal_locks.png 626 8 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 706 8 09 62 64 -1 -51
-   -1 sprites/canal_locks.png 2 88 09 62 64 -61 -43
-   -1 sprites/canal_locks.png 82 88 09 62 64 -61 -51
-   -1 sprites/canal_locks.png 162 88 09 62 64 -1 -43
-   -1 sprites/canal_locks.png 242 88 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 322 88 09 65 66 -33 -34
-   -1 sprites/canal_locks.png 402 88 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 482 88 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 562 88 09 62 64 -1 -43
-   -1 sprites/canal_locks.png 642 88 09 60 64 -61 -43
-   -1 sprites/canal_locks.png 722 88 09 62 66 -61 -43
-   -1 sprites/canal_locks.png 2 168 09 60 64 -1 -43
-   -1 sprites/canal_locks.png 82 168 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 162 168 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 242 168 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 322 168 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 402 168 09 60 64 -1 -43
-   -1 sprites/canal_locks.png 482 168 09 62 68 -61 -43
-   -1 sprites/canal_locks.png 562 168 09 60 64 -61 -43
-   -1 sprites/canal_locks.png 642 168 09 62 64 -1 -43
-   -1 sprites/canal_locks.png 722 168 09 59 64 -31 -36
-   -1 sprites/canal_locks.png 2 248 09 65 64 -31 -34
-   -1 sprites/canal_locks.png 82 248 09 59 64 -31 -36
-   -1 sprites/canal_locks.png 162 248 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 242 248 09 62 64 -1 -51
-   -1 sprites/canal_locks.png 322 248 09 62 64 -61 -43
-   -1 sprites/canal_locks.png 402 248 09 62 64 -61 -51
-   -1 sprites/canal_locks.png 482 248 09 62 64 -1 -43
-   -1 sprites/canal_locks.png 562 248 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 642 248 09 65 66 -33 -34
-   -1 sprites/canal_locks.png 722 248 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 2 328 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 82 328 09 62 64 -1 -43
-   -1 sprites/canal_locks.png 162 328 09 60 64 -61 -43
-   -1 sprites/canal_locks.png 242 328 09 62 66 -61 -43
-   -1 sprites/canal_locks.png 322 328 09 60 64 -1 -43
-   -1 sprites/canal_locks.png 402 328 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 482 328 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 562 328 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 642 328 09 59 64 -31 -28
-   -1 sprites/canal_locks.png 722 328 09 60 64 -1 -43
-   -1 sprites/canal_locks.png 2 408 09 62 68 -61 -43
-   -1 sprites/canal_locks.png 82 408 09 60 64 -61 -43
-   -1 sprites/canal_locks.png 162 408 09 62 64 -1 -43
-// Canal edges (temperate)
-   -1 sprites/canals.png  30  10 09 22 45 -11 -1
-   -1 sprites/canals.png  94  10 09 21 41  -8 10
-   -1 sprites/canals.png 142  10 09 21 42 -31 10
-   -1 sprites/canals.png 190  10 09 22 43 -31 -1
-   -1 sprites/canals.png 238  10 09 22 22  11  4
-   -1 sprites/canals.png 270  10 09 16 24 -11 15
-   -1 sprites/canals.png 302  10 09 23 23 -31  4
-   -1 sprites/canals.png 334  10 09 18 24 -11 -1
-   -1 sprites/canals.png 366  10 09 11 12  21 10
-   -1 sprites/canals.png 398  10 09 10 19  -8 21
-   -1 sprites/canals.png 430  10 09 10 11 -31 10
-   -1 sprites/canals.png 446  10 09 16 24 -11 -6
-// Canal icon
-   -1 sprites/canal_locks.png 242 408 09 20 20 0 0
-
-// Differentiation for the climates starts here
-
-// Canal edges (arctic snowy)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  40 09 22 45 -11 -1
-   -1 sprites/canals.png  94  40 09 21 41  -8 10
-   -1 sprites/canals.png 142  40 09 21 42 -31 10
-   -1 sprites/canals.png 190  40 09 22 43 -31 -1
-   -1 sprites/canals.png 238  40 09 22 22  11  4
-   -1 sprites/canals.png 270  40 09 16 24 -11 15
-   -1 sprites/canals.png 302  40 09 23 23 -31  4
-   -1 sprites/canals.png 334  40 09 18 24 -11 -1
-   -1 sprites/canals.png 366  40 09 11 12  21 10
-   -1 sprites/canals.png 398  40 09 10 19  -8 21
-   -1 sprites/canals.png 430  40 09 10 11 -31 10
-   -1 sprites/canals.png 446  40 09 16 24 -11 -6
-   -1 * 7        02 05 10 01 00 00 00
-
-// Canal edges (arctic normal)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  70 09 22 45 -11 -1
-   -1 sprites/canals.png  94  70 09 21 41  -8 10
-   -1 sprites/canals.png 142  70 09 21 42 -31 10
-   -1 sprites/canals.png 190  70 09 22 43 -31 -1
-   -1 sprites/canals.png 238  70 09 22 22  11  4
-   -1 sprites/canals.png 270  70 09 16 24 -11 15
-   -1 sprites/canals.png 302  70 09 23 23 -31  4
-   -1 sprites/canals.png 334  70 09 18 24 -11 -1
-   -1 sprites/canals.png 366  70 09 11 12  21 10
-   -1 sprites/canals.png 398  70 09 10 19  -8 21
-   -1 sprites/canals.png 430  70 09 10 11 -31 10
-   -1 sprites/canals.png 446  70 09 16 24 -11 -6
-   -1 * 7        02 05 11 01 00 00 00
-// Choose the right arctic canal edges
-   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
-   -1 * 6        07 83 01 \7! 01 01
-   -1 * 7        03 05 01 02 00 12 00
-
-// Canal edges (tropic desert)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 100 09 22 45 -11 -1
-   -1 sprites/canals.png  94 100 09 21 41  -8 10
-   -1 sprites/canals.png 142 100 09 21 42 -31 10
-   -1 sprites/canals.png 190 100 09 22 43 -31 -1
-   -1 sprites/canals.png 238 100 09 22 22  11  4
-   -1 sprites/canals.png 270 100 09 16 24 -11 15
-   -1 sprites/canals.png 302 100 09 23 23 -31  4
-   -1 sprites/canals.png 334 100 09 18 24 -11 -1
-   -1 sprites/canals.png 366 100 09 11 12  21 10
-   -1 sprites/canals.png 398 100 09 10 19  -8 21
-   -1 sprites/canals.png 430 100 09 10 11 -31 10
-   -1 sprites/canals.png 446 100 09 16 24 -11 -6
-   -1 * 7        02 05 13 01 00 00 00
-
-// Canal edges (tropic rainforest)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 130 09 22 45 -11 -1
-   -1 sprites/canals.png  94 130 09 21 41  -8 10
-   -1 sprites/canals.png 142 130 09 21 42 -31 10
-   -1 sprites/canals.png 190 130 09 22 43 -31 -1
-   -1 sprites/canals.png 238 130 09 22 22  11  4
-   -1 sprites/canals.png 270 130 09 16 24 -11 15
-   -1 sprites/canals.png 302 130 09 23 23 -31  4
-   -1 sprites/canals.png 334 130 09 18 24 -11 -1
-   -1 sprites/canals.png 366 130 09 11 12  21 10
-   -1 sprites/canals.png 398 130 09 10 19  -8 21
-   -1 sprites/canals.png 430 130 09 10 11 -31 10
-   -1 sprites/canals.png 446 130 09 16 24 -11 -6
-   -1 * 7        02 05 14 01 00 00 00
-// Choose the right tropic canal edges
-   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
-   -1 * 6        07 83 01 \7! 02 01
-   -1 * 7        03 05 01 02 00 15 00
-
-// Canal edges (toyland)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 160 09 22 45 -11 -1
-   -1 sprites/canals.png  94 160 09 21 41  -8 10
-   -1 sprites/canals.png 142 160 09 21 42 -31 10
-   -1 sprites/canals.png 190 160 09 22 43 -31 -1
-   -1 sprites/canals.png 238 160 09 22 22  11  4
-   -1 sprites/canals.png 270 160 09 16 24 -11 15
-   -1 sprites/canals.png 302 160 09 23 23 -31  4
-   -1 sprites/canals.png 334 160 09 18 24 -11 -1
-   -1 sprites/canals.png 366 160 09 11 12  21 10
-   -1 sprites/canals.png 398 160 09 10 19  -8 21
-   -1 sprites/canals.png 430 160 09 10 11 -31 10
-   -1 sprites/canals.png 446 160 09 16 24 -11 -6
-   -1 * 7        02 05 16 01 00 00 00
-   -1 * 6        07 83 01 \7! 03 01
-   -1 * 7        03 05 01 02 00 16 00
+   -1 sprites/canals.png 66 8 09 23 64 -31 0
+   -1 sprites/canals.png 146 8 09 39 64 -31 -8
+   -1 sprites/canals.png 226 8 09 23 64 -31 0
+   -1 sprites/canals.png 306 8 09 39 64 -31 -8
+   -1 sprites/canals.png 386 8 09 59 64 -31 -36
+   -1 sprites/canals.png 466 8 09 65 64 -31 -34
+   -1 sprites/canals.png 546 8 09 59 64 -31 -36
+   -1 sprites/canals.png 626 8 09 59 64 -31 -28
+   -1 sprites/canals.png 706 8 09 62 64 -1 -51
+   -1 sprites/canals.png 2 88 09 62 64 -61 -43
+   -1 sprites/canals.png 82 88 09 62 64 -61 -51
+   -1 sprites/canals.png 162 88 09 62 64 -1 -43
+   -1 sprites/canals.png 242 88 09 59 64 -31 -28
+   -1 sprites/canals.png 322 88 09 65 66 -33 -34
+   -1 sprites/canals.png 402 88 09 59 64 -31 -28
+   -1 sprites/canals.png 482 88 09 59 64 -31 -28
+   -1 sprites/canals.png 562 88 09 62 64 -1 -43
+   -1 sprites/canals.png 642 88 09 60 64 -61 -43
+   -1 sprites/canals.png 722 88 09 62 66 -61 -43
+   -1 sprites/canals.png 2 168 09 60 64 -1 -43
+   -1 sprites/canals.png 82 168 09 59 64 -31 -28
+   -1 sprites/canals.png 162 168 09 59 64 -31 -28
+   -1 sprites/canals.png 242 168 09 59 64 -31 -28
+   -1 sprites/canals.png 322 168 09 59 64 -31 -28
+   -1 sprites/canals.png 402 168 09 60 64 -1 -43
+   -1 sprites/canals.png 482 168 09 62 68 -61 -43
+   -1 sprites/canals.png 562 168 09 60 64 -61 -43
+   -1 sprites/canals.png 642 168 09 62 64 -1 -43
+   -1 sprites/canals.png 722 168 09 59 64 -31 -36
+   -1 sprites/canals.png 2 248 09 65 64 -31 -34
+   -1 sprites/canals.png 82 248 09 59 64 -31 -36
+   -1 sprites/canals.png 162 248 09 59 64 -31 -28
+   -1 sprites/canals.png 242 248 09 62 64 -1 -51
+   -1 sprites/canals.png 322 248 09 62 64 -61 -43
+   -1 sprites/canals.png 402 248 09 62 64 -61 -51
+   -1 sprites/canals.png 482 248 09 62 64 -1 -43
+   -1 sprites/canals.png 562 248 09 59 64 -31 -28
+   -1 sprites/canals.png 642 248 09 65 66 -33 -34
+   -1 sprites/canals.png 722 248 09 59 64 -31 -28
+   -1 sprites/canals.png 2 328 09 59 64 -31 -28
+   -1 sprites/canals.png 82 328 09 62 64 -1 -43
+   -1 sprites/canals.png 162 328 09 60 64 -61 -43
+   -1 sprites/canals.png 242 328 09 62 66 -61 -43
+   -1 sprites/canals.png 322 328 09 60 64 -1 -43
+   -1 sprites/canals.png 402 328 09 59 64 -31 -28
+   -1 sprites/canals.png 482 328 09 59 64 -31 -28
+   -1 sprites/canals.png 562 328 09 59 64 -31 -28
+   -1 sprites/canals.png 642 328 09 59 64 -31 -28
+   -1 sprites/canals.png 722 328 09 60 64 -1 -43
+   -1 sprites/canals.png 2 408 09 62 68 -61 -43
+   -1 sprites/canals.png 82 408 09 60 64 -61 -43
+   -1 sprites/canals.png 162 408 09 62 64 -1 -43
+   -1 sprites/canals.png 242 408 09 37 70 -31 -6
+   -1 sprites/canals.png 322 408 09 37 70 -31 0
+   -1 sprites/canals.png 402 408 09 37 70 -37 0
+   -1 sprites/canals.png 482 408 09 37 70 -37 -6
+   -1 sprites/canals.png 562 408 09 31 64 -31 0
+   -1 sprites/canals.png 642 408 09 31 64 -31 0
+   -1 sprites/canals.png 722 408 09 31 64 -31 0
+   -1 sprites/canals.png 2 488 09 37 64 -31 -6
+   -1 sprites/canals.png 82 488 09 31 64 -31 0
+   -1 sprites/canals.png 162 488 09 31 64 -31 0
+   -1 sprites/canals.png 242 488 09 31 64 -31 0
+   -1 sprites/canals.png 322 488 09 37 64 -31 -6
+   -1 sprites/canals.png 402 488 09 20 20 0 0
@@ -6,8 +6,8 @@
 // OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Fixing (alignment) bugs in the original graphics. By Addi and PaulC."
-   -1 * 6	 07 83 01 \7= 03 7D
+   -1 * 0	 0C "Fixing (alignment) bugs in the orignal graphics. By Addi."
+   -1 * 6	 07 83 01 \7= 03 69
 // Different graphics for same wood truck
   -1 * 14	 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
   -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
@@ -79,11 +79,6 @@
   -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
   -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
   -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
-// Misaligned maglev bridge heads
-   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 450 486 09 21 49 -24 3
 // Improperly cut cinema
   -1 * 5	 0A 01 02 34 11
   -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
@@ -203,132 +198,3 @@
 // GUI sprite
   -1 * 5	 0A 01 01 \w2600
   -1 sprites/fix_graphics.png 433 298 09 15 40 0 5
-// Make level crossings in tropical climate look normal
-   -1 * 6	 07 83 01 \7! 02 19
-   -1 * 14	 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
-   -1 sprites/fix_graphics.png 2 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 486 09 31 64 -31 0
-// Fix transparency of steel mill
-   -1 * 6	 07 83 01 \7! 00 0A
-   -1 * 5	 0A 01 04 4D 08
-   -1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
-   -1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
-   -1 * 5	 0A 01 04 58 08
-   -1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
-   -1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15
-// Fix transparency of oil well
-   -1 * 6	 07 83 01 \7= 03 10
-   -1 * 5	 0A 01 06 7E 08
-   -1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
-   -1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
-   -1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
-   -1 * 6	 07 83 01 \7! 00 02
-   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
-   -1 * 6	 07 83 01 \7! 01 02
-   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
-   -1 * 6	 07 83 01 \7! 02 02
-   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 226 630 09 31 64 -31 0
-   -1 * 6	 07 83 01 \7! 03 0F
-   -1 * 5	 0A 01 06 91 04
-// Fix toyland overlay for PBS on maglev
-   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
-   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
-   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
-   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
-// Fix toyland monorail bridge alignment
-   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
-// Fix toyland maglev bridge alignment
-   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
-// Fix city airport's grass for temperate
-   -1 * 6	 07 83 01 \7! 00 0A
-   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 242 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 726 09 31 64 -31 0
-// Fix city airport's grass for arctic
-   -1 * 6	 07 83 01 \7! 01 0A
-   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 774 09 31 64 -31 0
-// Fix city airport's grass for tropical
-   -1 * 6	 07 83 01 \7! 02 0A
-   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 822 09 31 64 -31 0
-// Fix city airport's grass for toyland
-   -1 * 6	 07 83 01 \7! 03 0A
-   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 870 09 31 64 -31 0
-// Fix buoy in-game; don't show black outline
-   -1 * 4        01 05 01 \b1
-   -1 sprites/fix_graphics.png 575 490 09 11 7 7 4
-   -1 * 7        02 05 17 01 00 00 00
-   -1 * 7        03 05 01 08 00 17 00
@@ -1,15 +1,3 @@
-openttd (1.1.4) unstable; urgency=low
-
-  * New upstream release 1.1.4
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 05 Dec 2011 00:00:00 +0400
-
-openttd (1.1.4-RC1) unstable; urgency=low
-
-  * New upstream release 1.1.4-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 20 Nov 2011 17:00:00 +0100
-
 openttd (1.1.3) unstable; urgency=low

  * New upstream release 1.1.3
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.1.4
+set OPENTTD_VERSION=1.1.3
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
@@ -2,7 +2,7 @@

 %define binname         openttd

-%define srcver          1.1.4
+%define srcver          1.1.3

 %if %{dedicated}
 Name:           %{binname}-dedicated
@@ -1,7 +1,7 @@
 # Version numbers to update
 !define APPV_MAJOR 1
 !define APPV_MINOR 1
-!define APPV_MAINT 4
+!define APPV_MAINT 3
 !define APPV_BUILD 1
 !define APPV_EXTRA ""

@@ -86,7 +86,7 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 !define MUI_FINISHPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
-!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for more information"
+!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for the latest news, FAQs and downloads"
 !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2011-12-05
-Release version: 1.1.4
+Last updated:    2011-09-15
+Release version: 1.1.3
 ------------------------------------------------------------------------


@@ -1,9 +1,6 @@
 /*
 	see copyright notice in squirrel.h
 */
-/* Needs to be first due to a squirrel header defining type() and type()
- * being used in some versions of the headers included by algorithm. */
-#include <algorithm>
 #include "sqpcheader.h"
 #include "sqvm.h"
 #include "sqstring.h"
@@ -487,7 +484,7 @@ static SQInteger array_resize(HSQUIRRELVM v)


 //QSORT ala Sedgewick
-bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,const SQObjectPtr &a,const SQObjectPtr &b,SQInteger func,SQInteger &ret)
+bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,SQObjectPtr &a,SQObjectPtr &b,SQInteger func,SQInteger &ret)
 {
 	if(func < 0) {
 		if(!v->ObjCmp(a,b,ret)) return false;
@@ -509,26 +506,40 @@ bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,const SQObjectPtr &a,const SQ
 	}
 	return true;
 }
-struct qsort_cmp
-{
-	HSQUIRRELVM v;
-	SQInteger func;
-	bool operator() (const SQObjectPtr &a, const SQObjectPtr &b) const
-	{
-		SQInteger res;
-		SQObjectPtr dummy;
-		if (!_qsort_compare(v, dummy, a, b, func, res)) return false;
-		return res < 0;
-	}
-};
-
-bool _qsort(HSQUIRRELVM v,SQObjectPtr &arr, SQInteger func)
+//QSORT ala Sedgewick
+bool _qsort(HSQUIRRELVM v,SQObjectPtr &arr, SQInteger l, SQInteger r,SQInteger func)
 {
+	SQInteger i, j;
 	SQArray *a=_array(arr);
-	qsort_cmp cur_cmp;
-	cur_cmp.v = v;
-	cur_cmp.func = func;
-	std::sort(a->_values._vals, a->_values._vals + a->Size(), cur_cmp);
+	SQObjectPtr pivot,t;
+	if( l < r ){
+		pivot = a->_values[l];
+		i = l; j = r+1;
+		while(1){
+			SQInteger ret;
+			do {
+				++i;
+				if(i > r) break;
+				if(!_qsort_compare(v,arr,a->_values[i],pivot,func,ret))
+					return false;
+			} while( ret <= 0);
+			do {
+				--j;
+				if ( j < 0 ) {
+					v->Raise_Error( _SC("Invalid qsort, probably compare function defect") );
+					return false;
+				}
+				if(!_qsort_compare(v,arr,a->_values[j],pivot,func,ret))
+					return false;
+			}
+			while( ret > 0 );
+			if( i >= j ) break;
+			t = a->_values[i]; a->_values[i] = a->_values[j]; a->_values[j] = t;
+		}
+		t = a->_values[l]; a->_values[l] = a->_values[j]; a->_values[j] = t;
+		if(!_qsort( v, arr, l, j-1,func)) return false;
+		if(!_qsort( v, arr, j+1, r,func)) return false;
+	}
 	return true;
 }

@@ -539,7 +550,7 @@ static SQInteger array_sort(HSQUIRRELVM v)
 	SQObject &funcobj = stack_get(v,2);
 	if(_array(o)->Size() > 1) {
 		if(type(funcobj) == OT_CLOSURE || type(funcobj) == OT_NATIVECLOSURE) func = 2;
-		if(!_qsort(v, o, func))
+		if(!_qsort(v, o, 0, _array(o)->Size()-1, func))
 			return SQ_ERROR;

 	}
@@ -1002,7 +1002,7 @@ struct AIDebugWindow : public QueryStringBaseWindow {
 		switch (widget) {
 			case AID_WIDGET_RELOAD_TOGGLE:
 				/* First kill the company of the AI, then start a new one. This should start the current AI again */
-				DoCommandP(0, 2 | ai_debug_company << 16, CRR_MANUAL, CMD_COMPANY_CTRL);
+				DoCommandP(0, 2 | ai_debug_company << 16, 0, CMD_COMPANY_CTRL);
 				DoCommandP(0, 1 | ai_debug_company << 16, 0, CMD_COMPANY_CTRL);
 				break;

@@ -206,7 +206,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = DOXYGEN_AI_DOCS
+PREDEFINED             = DOXYGEN_SKIP
 EXPAND_AS_DEFINED      = DEF_COMMAND
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
@@ -109,7 +109,7 @@ public:
 	 */
 	static int32 GetMinLength(BridgeID bridge_id);

-#ifndef DOXYGEN_AI_DOCS
+#ifndef DOXYGEN_SKIP
 	/**
 	 * Internal function to help BuildBridge in case of road.
 	 */
@@ -15,11 +15,6 @@
 * functions may still be available if you return an older API version
 * in GetAPIVersion() in info.nut.
 *
- * \b 1.1.4
- *
- * API additions:
- * \li AIVehicle::ERR_VEHICLE_TOO_LONG in case vehicle length limit is reached.
- *
 * \b 1.1.3
 *
 * No changes
@@ -278,7 +278,7 @@ public:
 	 */
 	Money GetRunningCost();

-#ifdef DOXYGEN_AI_DOCS
+#ifdef DOXYGEN_SKIP
 	/**
 	 * Get the type of the offered engine.
 	 * @return The type the engine has.
@@ -10,7 +10,7 @@
 /** @file ai_info_docs.hpp Description of the functions an AI can/must provide in AIInfo. */

 /* This file exists purely for doxygen purposes. */
-#ifdef DOXYGEN_AI_DOCS
+#ifdef DOXYGEN_SKIP
 /**
 * 'Abstract' class of the class AIs/AI libraries use to register themselves.
 *
@@ -239,7 +239,7 @@ public:
 	 */
 	void KeepList(AIList *list);

-#ifndef DOXYGEN_AI_DOCS
+#ifndef DOXYGEN_SKIP
 	/**
 	 * Used for 'foreach()' and [] get from Squirrel.
 	 */
@@ -280,7 +280,7 @@ public:
 	 *  list.Valuate(MyVal, 12);
 	 */
 	void Valuate(void *valuator_function, int params, ...);
-#endif /* DOXYGEN_AI_DOCS */
+#endif /* DOXYGEN_SKIP */
 };

 #endif /* AI_LIST_HPP */
@@ -37,9 +37,9 @@
 		AIObject::GetLogPointer() = new LogData();
 		LogData *log = (LogData *)AIObject::GetLogPointer();

-		log->lines = CallocT<char *>(400);
-		log->type = CallocT<AILog::AILogType>(400);
-		log->count = 400;
+		log->lines = CallocT<char *>(80);
+		log->type = CallocT<AILog::AILogType>(80);
+		log->count = 80;
 		log->pos = log->count - 1;
 		log->used = 0;
 	}
@@ -37,8 +37,6 @@ typedef bool (AIModeProc)();
 class AIObject : public SimpleCountedObject {
 friend void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2);
 friend class AIInstance;
-friend class AIController;
-#ifndef DOXYGEN_AI_DOCS
 protected:
 	/**
 	 * Executes a raw DoCommand for the AI.
@@ -181,45 +179,51 @@ protected:
 public:
 	/**
 	 * Store the latest result of a DoCommand per company.
+	 * @note NEVER use this yourself in your AI!
 	 * @param res The result of the last command.
 	 */
 	static void SetLastCommandRes(bool res);

 	/**
 	 * Store a new_vehicle_id per company.
+	 * @note NEVER use this yourself in your AI!
 	 * @param vehicle_id The new VehicleID.
 	 */
 	static void SetNewVehicleID(VehicleID vehicle_id);

 	/**
 	 * Store a new_sign_id per company.
+	 * @note NEVER use this yourself in your AI!
 	 * @param sign_id The new SignID.
 	 */
 	static void SetNewSignID(SignID sign_id);

 	/**
 	 * Store a new_tunnel_endtile per company.
+	 * @note NEVER use this yourself in your AI!
 	 * @param tile The new TileIndex.
 	 */
 	static void SetNewTunnelEndtile(TileIndex tile);

 	/**
 	 * Store a new_group_id per company.
+	 * @note NEVER use this yourself in your AI!
 	 * @param group_id The new GroupID.
 	 */
 	static void SetNewGroupID(GroupID group_id);

 	/**
 	 * Store a allow_do_command per company.
+	 * @note NEVER use this yourself in your AI!
 	 * @param allow The new allow.
 	 */
 	static void SetAllowDoCommand(bool allow);

 	/**
 	 * Get the pointer to store log message in.
+	 * @note NEVER use this yourself in your AI!
 	 */
 	static void *&GetLogPointer();
-#endif /* DOXYGEN_AI_DOCS */
 };

 #endif /* AI_OBJECT_HPP */
@@ -75,31 +75,6 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
 	return order;
 }

-/**
- * Convert an AIOrder::OrderPosition (which is the manual order index) to an order index
- * as expected by the OpenTTD commands.
- * @param order_position The OrderPosition to convert.
- * @return An OpenTTD-internal index for the same order.
- */
-static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::OrderPosition order_position)
-{
-	const Vehicle *v = ::Vehicle::Get(vehicle_id);
-	if (order_position == v->GetNumManualOrders()) return v->GetNumOrders();
-
-	assert(AIOrder::IsValidVehicleOrder(vehicle_id, order_position));
-
-	int res = (int)order_position;
-	const Order *order = v->orders.list->GetFirstOrder();
-	for (; order->GetType() == OT_IMPLICIT; order = order->next) res++;
-	while (order_position > 0) {
-		order_position = (AIOrder::OrderPosition)(order_position - 1);
-		order = order->next;
-		for (; order->GetType() == OT_IMPLICIT; order = order->next) res++;
-	}
-
-	return res;
-}
-
 /* static */ bool AIOrder::IsGotoStationOrder(VehicleID vehicle_id, OrderPosition order_position)
 {
 	if (!IsValidVehicleOrder(vehicle_id, order_position)) return false;
@@ -129,7 +104,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	if (order_position == ORDER_CURRENT) return false;
 	if (!IsValidVehicleOrder(vehicle_id, order_position)) return false;

-	const Order *order = ::Vehicle::Get(vehicle_id)->GetOrder(AIOrderPositionToRealOrderPosition(vehicle_id, order_position));
+	const Order *order = Vehicle::Get(vehicle_id)->GetOrder(order_position);
 	return order->GetType() == OT_CONDITIONAL;
 }

@@ -138,13 +113,13 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	if (order_position == ORDER_CURRENT) return false;
 	if (!IsValidVehicleOrder(vehicle_id, order_position)) return false;

-	const Order *order = ::ResolveOrder(vehicle_id, order_position);
+	const Order *order = Vehicle::Get(vehicle_id)->GetOrder(order_position);
 	return order->GetType() == OT_DUMMY;
 }

 /* static */ bool AIOrder::IsCurrentOrderPartOfOrderList(VehicleID vehicle_id)
 {
-	if (!AIVehicle::IsValidVehicle(vehicle_id)) return false;
+	if (AIVehicle::IsValidVehicle(vehicle_id)) return false;
 	if (GetOrderCount(vehicle_id) == 0) return false;

 	const Order *order = &::Vehicle::Get(vehicle_id)->current_order;
@@ -215,7 +190,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord

 /* static */ int32 AIOrder::GetOrderCount(VehicleID vehicle_id)
 {
-	return AIVehicle::IsValidVehicle(vehicle_id) ? ::Vehicle::Get(vehicle_id)->GetNumManualOrders() : -1;
+	return AIVehicle::IsValidVehicle(vehicle_id) ? ::Vehicle::Get(vehicle_id)->GetNumOrders() : -1;
 }

 /* static */ TileIndex AIOrder::GetOrderDestination(VehicleID vehicle_id, OrderPosition order_position)
@@ -362,8 +337,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	EnforcePrecondition(false, order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position));
 	EnforcePrecondition(false, condition >= OC_LOAD_PERCENTAGE && condition <= OC_UNCONDITIONALLY);

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), MOF_COND_VARIABLE | (condition << 4), CMD_MODIFY_ORDER);
+	return AIObject::DoCommand(0, vehicle_id | (order_position << 20), MOF_COND_VARIABLE | (condition << 4), CMD_MODIFY_ORDER);
 }

 /* static */ bool AIOrder::SetOrderCompareFunction(VehicleID vehicle_id, OrderPosition order_position, CompareFunction compare)
@@ -372,8 +346,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	EnforcePrecondition(false, order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position));
 	EnforcePrecondition(false, compare >= CF_EQUALS && compare <= CF_IS_FALSE);

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), MOF_COND_COMPARATOR | (compare << 4), CMD_MODIFY_ORDER);
+	return AIObject::DoCommand(0, vehicle_id | (order_position << 20), MOF_COND_COMPARATOR | (compare << 4), CMD_MODIFY_ORDER);
 }

 /* static */ bool AIOrder::SetOrderCompareValue(VehicleID vehicle_id, OrderPosition order_position, int32 value)
@@ -383,8 +356,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	EnforcePrecondition(false, value >= 0 && value < 2048);
 	if (GetOrderCondition(vehicle_id, order_position) == OC_MAX_SPEED) value = value * 10 / 16;

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), MOF_COND_VALUE | (value << 4), CMD_MODIFY_ORDER);
+	return AIObject::DoCommand(0, vehicle_id | (order_position << 20), MOF_COND_VALUE | (value << 4), CMD_MODIFY_ORDER);
 }

 /* static */ bool AIOrder::SetStopLocation(VehicleID vehicle_id, OrderPosition order_position, StopLocation stop_location)
@@ -394,10 +366,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	EnforcePrecondition(false, IsGotoStationOrder(vehicle_id, order_position));
 	EnforcePrecondition(false, stop_location >= STOPLOCATION_NEAR && stop_location <= STOPLOCATION_FAR);

-	order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position);
-
-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	uint32 p1 = vehicle_id | (order_pos << 20);
+	uint32 p1 = vehicle_id | (order_position << 20);
 	uint32 p2 = MOF_STOP_LOCATION | (stop_location << 4);
 	return AIObject::DoCommand(0, p1, p2, CMD_MODIFY_ORDER);
 }
@@ -407,7 +376,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
 	EnforcePrecondition(false, AreOrderFlagsValid(destination, order_flags));

-	return InsertOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumManualOrders(), destination, order_flags);
+	return InsertOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumOrders(), destination, order_flags);
 }

 /* static */ bool AIOrder::AppendConditionalOrder(VehicleID vehicle_id, OrderPosition jump_to)
@@ -415,7 +384,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
 	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to));

-	return InsertConditionalOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumManualOrders(), jump_to);
+	return InsertConditionalOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumOrders(), jump_to);
 }

 /* static */ bool AIOrder::InsertOrder(VehicleID vehicle_id, OrderPosition order_position, TileIndex destination, AIOrder::AIOrderFlags order_flags)
@@ -424,7 +393,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position);

 	EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
-	EnforcePrecondition(false, order_position >= 0 && order_position <= ::Vehicle::Get(vehicle_id)->GetNumManualOrders());
+	EnforcePrecondition(false, order_position >= 0 && order_position <= ::Vehicle::Get(vehicle_id)->GetNumOrders());
 	EnforcePrecondition(false, AreOrderFlagsValid(destination, order_flags));

 	Order order;
@@ -468,8 +437,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord

 	order.SetNonStopType((OrderNonStopFlags)GB(order_flags, 0, 2));

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), order.Pack(), CMD_INSERT_ORDER);
+	return AIObject::DoCommand(0, vehicle_id | (order_position << 20), order.Pack(), CMD_INSERT_ORDER);
 }

 /* static */ bool AIOrder::InsertConditionalOrder(VehicleID vehicle_id, OrderPosition order_position, OrderPosition jump_to)
@@ -478,14 +446,12 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
 	if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position);

 	EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
-	EnforcePrecondition(false, order_position >= 0 && order_position <= ::Vehicle::Get(vehicle_id)->GetNumManualOrders());
-	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to) && jump_to != ORDER_CURRENT);
+	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to));

 	Order order;
 	order.MakeConditional(jump_to);

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), order.Pack(), CMD_INSERT_ORDER);
+	return AIObject::DoCommand(0, vehicle_id | (order_position << 20), order.Pack(), CMD_INSERT_ORDER);
 }

 /* static */ bool AIOrder::RemoveOrder(VehicleID vehicle_id, OrderPosition order_position)
@@ -494,8 +460,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord

 	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position));

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
-	return AIObject::DoCommand(0, vehicle_id, order_pos, CMD_DELETE_ORDER);
+	return AIObject::DoCommand(0, vehicle_id, order_position, CMD_DELETE_ORDER);
 }

 /* static */ bool AIOrder::SkipToOrder(VehicleID vehicle_id, OrderPosition next_order)
@@ -504,8 +469,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord

 	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, next_order));

-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, next_order);
-	return AIObject::DoCommand(0, vehicle_id, order_pos, CMD_SKIP_TO_ORDER);
+	return AIObject::DoCommand(0, vehicle_id, next_order, CMD_SKIP_TO_ORDER);
 }

 /**
@@ -542,14 +506,13 @@ static void _DoCommandReturnSetOrderFlags(class AIInstance *instance)
 	EnforcePrecondition(false, AreOrderFlagsValid(GetOrderDestination(vehicle_id, order_position), order_flags));

 	const Order *order = ::ResolveOrder(vehicle_id, order_position);
-	int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);

 	AIOrderFlags current = GetOrderFlags(vehicle_id, order_position);

 	EnforcePrecondition(false, (order_flags & AIOF_GOTO_NEAREST_DEPOT) == (current & AIOF_GOTO_NEAREST_DEPOT));

 	if ((current & AIOF_NON_STOP_FLAGS) != (order_flags & AIOF_NON_STOP_FLAGS)) {
-		return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (order_flags & AIOF_NON_STOP_FLAGS) << 4 | MOF_NON_STOP, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags);
+		return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_NON_STOP_FLAGS) << 4 | MOF_NON_STOP, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
 	}

 	switch (order->GetType()) {
@@ -558,16 +521,16 @@ static void _DoCommandReturnSetOrderFlags(class AIInstance *instance)
 				uint data = DA_ALWAYS_GO;
 				if (order_flags & AIOF_SERVICE_IF_NEEDED) data = DA_SERVICE;
 				if (order_flags & AIOF_STOP_IN_DEPOT) data = DA_STOP;
-				return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (data << 4) | MOF_DEPOT_ACTION, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags);
+				return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (data << 4) | MOF_DEPOT_ACTION, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
 			}
 			break;

 		case OT_GOTO_STATION:
 			if ((current & AIOF_UNLOAD_FLAGS) != (order_flags & AIOF_UNLOAD_FLAGS)) {
-				return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (order_flags & AIOF_UNLOAD_FLAGS) << 2 | MOF_UNLOAD, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags);
+				return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_UNLOAD_FLAGS) << 2 | MOF_UNLOAD, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
 			}
 			if ((current & AIOF_LOAD_FLAGS) != (order_flags & AIOF_LOAD_FLAGS)) {
-				return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (order_flags & AIOF_LOAD_FLAGS) >> 1 | MOF_LOAD, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags);
+				return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_LOAD_FLAGS) >> 1 | MOF_LOAD, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
 			}
 			break;

@@ -598,9 +561,7 @@ static void _DoCommandReturnSetOrderFlags(class AIInstance *instance)
 	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position_move));
 	EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position_target));

-	int order_pos_move = AIOrderPositionToRealOrderPosition(vehicle_id, order_position_move);
-	int order_pos_target = AIOrderPositionToRealOrderPosition(vehicle_id, order_position_target);
-	return AIObject::DoCommand(0, vehicle_id, order_pos_move | (order_pos_target << 16), CMD_MOVE_ORDER);
+	return AIObject::DoCommand(0, vehicle_id, order_position_move | (order_position_target << 16), CMD_MOVE_ORDER);
 }

 /* static */ bool AIOrder::CopyOrders(VehicleID vehicle_id, VehicleID main_vehicle_id)
@@ -443,12 +443,12 @@ public:
 	 */
 	static bool RemoveOrder(VehicleID vehicle_id, OrderPosition order_position);

-#ifndef DOXYGEN_AI_DOCS
+#ifndef DOXYGEN_SKIP
 	/**
 	 * Internal function to help SetOrderFlags.
 	 */
 	static bool _SetOrderFlags();
-#endif /* DOXYGEN_AI_DOCS */
+#endif /* DOXYGEN_SKIP */

 	/**
 	 * Changes the order flags of the given order.
@@ -65,7 +65,7 @@ public:
 	 */
 	static TileIndex GetOtherTunnelEnd(TileIndex tile);

-#ifndef DOXYGEN_AI_DOCS
+#ifndef DOXYGEN_SKIP
 	/**
 	 * Internal function to help BuildTunnel in case of road.
 	 */
@@ -75,7 +75,7 @@ public:
 	 * Internal function to help BuildTunnel in case of road.
 	 */
 	static bool _BuildTunnelRoad2();
-#endif /* DOXYGEN_AI_DOCS */
+#endif /* DOXYGEN_SKIP */

 	/**
 	 * Builds a tunnel starting at start. The direction of the tunnel depends
@@ -65,8 +65,6 @@ public:
 		/** Vehicle is without power */
 		ERR_VEHICLE_NO_POWER,                   // [STR_ERROR_TRAIN_START_NO_CATENARY]

-		/** Vehicle would get too long during construction. */
-		ERR_VEHICLE_TOO_LONG,                   // [STR_ERROR_TRAIN_TOO_LONG]
 	};

 	/**
@@ -47,7 +47,6 @@ void SQAIVehicle_Register(Squirrel *engine)
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT,         "ERR_VEHICLE_NOT_IN_DEPOT");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IN_FLIGHT,            "ERR_VEHICLE_IN_FLIGHT");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NO_POWER,             "ERR_VEHICLE_NO_POWER");
-	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_TOO_LONG,             "ERR_VEHICLE_TOO_LONG");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_RAIL,                          "VT_RAIL");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_ROAD,                          "VT_ROAD");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_WATER,                         "VT_WATER");
@@ -96,7 +95,6 @@ void SQAIVehicle_Register(Squirrel *engine)
 	AIError::RegisterErrorMap(STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT,                   AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_AIRCRAFT_IS_IN_FLIGHT,                               AIVehicle::ERR_VEHICLE_IN_FLIGHT);
 	AIError::RegisterErrorMap(STR_ERROR_TRAIN_START_NO_CATENARY,                             AIVehicle::ERR_VEHICLE_NO_POWER);
-	AIError::RegisterErrorMap(STR_ERROR_TRAIN_TOO_LONG,                                      AIVehicle::ERR_VEHICLE_TOO_LONG);

 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_MANY,             "ERR_VEHICLE_TOO_MANY");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_AVAILABLE,        "ERR_VEHICLE_NOT_AVAILABLE");
@@ -110,7 +108,6 @@ void SQAIVehicle_Register(Squirrel *engine)
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT,         "ERR_VEHICLE_NOT_IN_DEPOT");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IN_FLIGHT,            "ERR_VEHICLE_IN_FLIGHT");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NO_POWER,             "ERR_VEHICLE_NO_POWER");
-	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_LONG,             "ERR_VEHICLE_TOO_LONG");

 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::IsValidVehicle,                 "IsValidVehicle",                 2, ".i");
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetNumWagons,                   "GetNumWagons",                   2, ".i");
@@ -102,9 +102,9 @@ BEGIN {
 /^(	*)private/   { if (cls_level == 1) public = "false"; next; }

 # Ignore special doxygen blocks
-/^#ifndef DOXYGEN_AI_DOCS/          { doxygen_skip = "next"; next; }
-/^#ifdef DOXYGEN_AI_DOCS/           { doxygen_skip = "true"; next; }
-/^#endif \/\* DOXYGEN_AI_DOCS \*\// { doxygen_skip = "false"; next; }
+/^#ifndef DOXYGEN_SKIP/          { doxygen_skip = "next"; next; }
+/^#ifdef DOXYGEN_SKIP/           { doxygen_skip = "true"; next; }
+/^#endif \/\* DOXYGEN_SKIP \*\// { doxygen_skip = "false"; next; }
 /^#else/                         {
 	if (doxygen_skip == "next") {
 		doxygen_skip = "true";
@@ -633,7 +633,6 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 		/* Test the command. */
 		_cleared_object_areas.Clear();
 		SetTownRatingTestMode(true);
-		ClearStorageChanges(false);
 		res = proc(tile, flags, p1, p2, text);
 		SetTownRatingTestMode(false);

@@ -673,7 +672,6 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 	/* Actually try and execute the command. If no cost-type is given
 	 * use the construction one */
 	_cleared_object_areas.Clear();
-	ClearStorageChanges(false);
 	CommandCost res2 = proc(tile, flags | DC_EXEC, p1, p2, text);

 	if (cmd_id == CMD_COMPANY_CTRL) {
@@ -349,7 +349,7 @@ static void GenerateCompanyName(Company *c)
 	StringID str;
 	uint32 strp;
 	if (t->name == NULL && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) {
-		str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_COMPANY_NAME_START;
+		str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_PLAYERNAME_START;
 		strp = t->townnameparts;

 verify_name:;
@@ -773,14 +773,13 @@ void CompanyAdminUpdate(const Company *company)
 }

 /**
- * Called whenever a company is removed in order to notify admins.
- * @param company_id The company that was removed.
- * @param reason     The reason the company was removed.
+ * Called whenever a company goes bankrupt in order to notify admins.
+ * @param company_id The company that went bankrupt.
 */
-void CompanyAdminRemove(CompanyID company_id, CompanyRemoveReason reason)
+void CompanyAdminBankrupt(CompanyID company_id)
 {
 #ifdef ENABLE_NETWORK
-	if (_network_server) NetworkAdminCompanyRemove(company_id, (AdminCompanyRemoveReason)reason);
+	if (_network_server) NetworkAdminCompanyRemove(company_id, ADMIN_CRR_BANKRUPT);
 #endif /* ENABLE_NETWORK */
 }

@@ -847,6 +846,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			}

 			if (_network_server) {
+				CompanyID old_playas = ci->client_playas;
 				ci->client_playas = c->index;
 				NetworkUpdateClientInfo(ci->client_id);

@@ -869,9 +869,11 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 					NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, ci->client_playas);
 				}

-				/* Announce new company on network. */
-				NetworkAdminCompanyInfo(c, true);
-				NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, ci->client_playas + 1);
+				/* Announce new company on network, if the client was a SPECTATOR before */
+				if (old_playas == COMPANY_SPECTATOR) {
+					NetworkAdminCompanyInfo(c, true);
+					NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, ci->client_playas + 1);
+				}
 			}
 #endif /* ENABLE_NETWORK */
 			break;
@@ -885,9 +887,6 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			break;

 		case 2: { // Delete a company
-			CompanyRemoveReason reason = (CompanyRemoveReason)GB(p2, 0, 2);
-			if (reason >= CRR_END) return CMD_ERROR;
-
 			Company *c = Company::GetIfValid(company_id);
 			if (c == NULL) return CMD_ERROR;

@@ -911,7 +910,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			CompanyID c_index = c->index;
 			delete c;
 			AI::BroadcastNewEvent(new AIEventCompanyBankrupt(c_index));
-			CompanyAdminRemove(c_index, (CompanyRemoveReason)reason);
+			CompanyAdminBankrupt(c_index);
 			break;
 		}

@@ -56,13 +56,4 @@ typedef uint16 CompanyMask;
 struct Company;
 typedef uint32 CompanyManagerFace; ///< Company manager face bits, info see in company_manager_face.h

-/** The reason why the company was removed. */
-enum CompanyRemoveReason {
-	CRR_MANUAL,    ///< The company is manually removed.
-	CRR_AUTOCLEAN, ///< The company is removed due to autoclean.
-	CRR_BANKRUPT,  ///< The company went belly-up.
-
-	CRR_END        ///< Sentinel for end.
-};
-
 #endif /* COMPANY_TYPE_H */
@@ -836,7 +836,7 @@ DEF_CONSOLE_CMD(ConResetCompany)
 	}

 	/* It is safe to remove this company */
-	DoCommandP(0, 2 | index << 16, CRR_MANUAL, CMD_COMPANY_CTRL);
+	DoCommandP(0, 2 | index << 16, 0, CMD_COMPANY_CTRL);
 	IConsolePrint(CC_DEFAULT, "Company deleted.");

 	return true;
@@ -1196,7 +1196,7 @@ DEF_CONSOLE_CMD(ConReloadAI)
 	}

 	/* First kill the company of the AI, then start a new one. This should start the current AI again */
-	DoCommandP(0, 2 | company_id << 16, CRR_MANUAL, CMD_COMPANY_CTRL);
+	DoCommandP(0, 2 | company_id << 16, 0, CMD_COMPANY_CTRL);
 	DoCommandP(0, 1 | company_id << 16, 0, CMD_COMPANY_CTRL);
 	IConsolePrint(CC_DEFAULT, "AI reloaded.");

@@ -1233,7 +1233,7 @@ DEF_CONSOLE_CMD(ConStopAI)
 	}

 	/* Now kill the company of the AI. */
-	DoCommandP(0, 2 | company_id << 16, CRR_MANUAL, CMD_COMPANY_CTRL);
+	DoCommandP(0, 2 | company_id << 16, 0, CMD_COMPANY_CTRL);
 	IConsolePrint(CC_DEFAULT, "AI stopped, company deleted.");

 	return true;
@@ -546,7 +546,7 @@ static void CompanyCheckBankrupt(Company *c)
 			 * that changing the current company is okay. In case of single
 			 * player we are sure (the above check) that we are not the local
 			 * company and thus we won't be moved. */
-			if (!_networking || _network_server) DoCommandP(0, 2 | (c->index << 16), CRR_BANKRUPT, CMD_COMPANY_CTRL);
+			if (!_networking || _network_server) DoCommandP(0, 2 | (c->index << 16), 0, CMD_COMPANY_CTRL);
 			break;
 	}
 }
@@ -650,10 +650,6 @@ void StartupOneEngine(Engine *e, Date aging_date)
 	}
 }

-/**
- * Start/initialise all our engines. Must be called whenever there are changes
- * to the NewGRF config.
- */
 void StartupEngines()
 {
 	Engine *e;
@@ -746,25 +746,18 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i

 static void SetFontGeometry(FT_Face face, FontSize size, int pixels)
 {
-	FT_Error err = FT_Set_Pixel_Sizes(face, 0, pixels);
-	if (err == FT_Err_Invalid_Pixel_Size) {
+	FT_Set_Pixel_Sizes(face, 0, pixels);

-		/* Find nearest size to that requested */
-		FT_Bitmap_Size *bs = face->available_sizes;
-		int i = face->num_fixed_sizes;
-		int n = bs->height;
-		for (; --i; bs++) {
-			if (abs(pixels - bs->height) < abs(pixels - n)) n = bs->height;
-		}
+	if (FT_IS_SCALABLE(face)) {
+		int asc = face->ascender * pixels / face->units_per_EM;
+		int dec = face->descender * pixels / face->units_per_EM;

-		FT_Set_Pixel_Sizes(face, 0, n);
+		_ascender[size] = asc;
+		_font_height[size] = asc - dec;
+	} else {
+		_ascender[size] = pixels;
+		_font_height[size] = pixels;
 	}
-
-	int asc = face->size->metrics.ascender >> 6;
-	int dec = face->size->metrics.descender >> 6;
-
-	_ascender[size] = asc;
-	_font_height[size] = asc - dec;
 }

 /**
@@ -86,6 +86,7 @@ enum GenerateLandscapeWindowWidgets {
 	GLAND_LANDSCAPE_PULLDOWN, ///< Dropdown 'Land generator'

 	GLAND_HEIGHTMAP_NAME_TEXT,         ///< Heightmap name
+	GLAND_HEIGHTMAP_NAME_SPACER,       ///< Spacer used for aligning items in the second column nicely
 	GLAND_HEIGHTMAP_SIZE_TEXT,         ///< Size of heightmap
 	GLAND_HEIGHTMAP_ROTATION_PULLDOWN, ///< Dropdown 'Heightmap rotation'

@@ -248,47 +249,45 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 				NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL), SetFill(1, 1),
 			EndContainer(),
 			/* Widgets at the right of the labels. */
-			NWidget(NWID_VERTICAL), SetPIP(0, 4, 0),
+			NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
 				NWidget(WWT_EMPTY, COLOUR_ORANGE, GLAND_HEIGHTMAP_NAME_TEXT), SetFill(1, 0),
-				NWidget(NWID_HORIZONTAL), SetPIP(0, 5, 0),
+				/* Mapsize X * Y. */
+				NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0),
+					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
+					NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(1, 1),
+					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
+				EndContainer(),
+				NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+				NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+				NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP), SetFill(1, 1),
+				NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+				NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+			EndContainer(),
+			NWidget(NWID_VERTICAL), SetPIP(0, 4, 0),
+				NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0),
 					NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
-						/* Mapsize X * Y. */
-						NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0),
-							NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
-							NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(1, 1),
-							NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
-						EndContainer(),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
-						NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP), SetFill(1, 1),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+						NWidget(WWT_EMPTY, INVALID_COLOUR, GLAND_HEIGHTMAP_NAME_SPACER), SetFill(1, 0),
+						NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE_LABEL, STR_NULL), SetFill(1, 1),
+						NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(1, 1),
+						NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetFill(1, 1),
 					EndContainer(),
-					NWidget(NWID_VERTICAL), SetPIP(0, 4, 0),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0),
-							NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
-								NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE_LABEL, STR_NULL), SetFill(1, 1),
-								NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(1, 1),
-								NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetFill(1, 1),
-							EndContainer(),
-							NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
-								NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_SIZE_TEXT), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE, STR_NULL), SetFill(1, 0),
-								NWidget(NWID_HORIZONTAL),
-									NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1),
-									NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0),
-									NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1),
-								EndContainer(),
-								NWidget(NWID_HORIZONTAL),
-									NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN), SetFill(0, 1),
-									NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetDataTip(STR_BLACK_INT, STR_NULL), SetFill(1, 0),
-									NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP), SetFill(0, 1),
-								EndContainer(),
-							EndContainer(),
+					NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+						NWidget(WWT_EMPTY, INVALID_COLOUR, GLAND_HEIGHTMAP_NAME_SPACER), SetFill(1, 0),
+						NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_SIZE_TEXT), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE, STR_NULL), SetFill(1, 0),
+						NWidget(NWID_HORIZONTAL),
+							NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1),
+							NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0),
+							NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1),
+						EndContainer(),
+						NWidget(NWID_HORIZONTAL),
+							NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN), SetFill(0, 1),
+							NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetDataTip(STR_BLACK_INT, STR_NULL), SetFill(1, 0),
+							NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP), SetFill(0, 1),
 						EndContainer(),
-						NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP), SetFill(1, 0),
-						NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1),
 					EndContainer(),
 				EndContainer(),
+				NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP), SetFill(1, 0),
+				NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1),
 			EndContainer(),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 9), SetFill(1, 1),
@@ -532,6 +531,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 				*size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOM), maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_WATER), GetStringBoundingBox(STR_MAPGEN_BORDER_FREEFORM)));
 				break;

+			case GLAND_HEIGHTMAP_NAME_SPACER:
 			case GLAND_HEIGHTMAP_NAME_TEXT:
 				size->width = 0;
 				break;
@@ -552,7 +552,12 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 	{
 		switch (widget) {
 			case GLAND_HEIGHTMAP_NAME_TEXT: {
-				DrawString(r.left, r.right, r.top, this->name, TC_ORANGE);
+				/* Little bit of a hack going on here; just to get the widgets
+				 * spaced without doing much magic. The space we can draw on is
+				 * covered by both the spacer and text widgets, so take their
+				 * outer most boundaries (left and right) as draw locations. */
+				const NWidgetBase *nwi_spacer = this->GetWidget<NWidgetBase>(GLAND_HEIGHTMAP_NAME_SPACER);
+				DrawString(min(r.left, nwi_spacer->pos_x), max<int>(r.right, nwi_spacer->pos_x + nwi_spacer->current_x), r.top, this->name, TC_ORANGE);
 				break;
 			}
 		}
@@ -140,8 +140,6 @@ void PlantRandomFarmField(const Industry *i);

 void ReleaseDisastersTargetingIndustry(IndustryID);

-bool IsTileForestIndustry(TileIndex tile);
-
 #define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start)
 #define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0)

@@ -908,30 +908,6 @@ static void ChangeTileOwner_Industry(TileIndex tile, Owner old_owner, Owner new_
 	if (i->founder == old_owner) i->founder = (new_owner == INVALID_OWNER) ? OWNER_NONE : new_owner;
 }

-/**
- * Check whether the tile is a forest.
- * @param tile the tile to investigate.
- * @return true if and only if the tile is a forest
- */
-bool IsTileForestIndustry(TileIndex tile)
-{
-	/* Check for industry tile */
-	if (!IsTileType(tile, MP_INDUSTRY)) return false;
-
-	const Industry *ind = Industry::GetByTile(tile);
-
-	/* Check for organic industry (i.e. not processing or extractive) */
-	if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
-
-	/* Check for wood production */
-	for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
-		/* The industry produces wood. */
-		if (ind->produced_cargo[i] != CT_INVALID && CargoSpec::Get(ind->produced_cargo[i])->label == 'WOOD') return true;
-	}
-
-	return false;
-}
-
 static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6};

 static bool IsBadFarmFieldTile(TileIndex tile)
@@ -545,11 +545,11 @@ STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Зага
 STR_TOOLTIP_SHADE                                               :{BLACK}Згарнуць вакно, пакінуўшы загаловак
 STR_TOOLTIP_DEBUG                                               :{BLACK}Паказаць наладачную iнфармацыю NewGRF
 STR_TOOLTIP_STICKY                                              :{BLACK}Ігнараваць націск клявішы «Закрыць усе вокны»
-STR_TOOLTIP_RESIZE                                              :{BLACK}Націсьніце ды цягнiце для зьмяненьня памеру вакна
+STR_TOOLTIP_RESIZE                                              :{BLACK}Націсьніце ды цягнiце для змяненьня памеру вакна
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Вялікае/маленькае вакно
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Пракрутка ўверх/уніз
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Пракрутка налева/направа
-STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Поўная ачыстка прамавугольнага ўчастку зямлі. Ctrl - выбар вобласьці па дыяганалі. Пры націснутым Shift - ацэнка кошту ачысткі.
+STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Поўная ачыстка прамавугольнага ўчастку зямлі. Ctrl - выбар вобласці па дыяганалі. Пры націснутым Shift - ацэнка кошту ачысткі.

 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Па змоўчаньнi
@@ -564,7 +564,7 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_MEASURE_LENGTH                                              :{BLACK}Даўжыня: {NUM}
 STR_MEASURE_AREA                                                :{BLACK}Плошча: {NUM} x {NUM}
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Даўжыня: {NUM}{}Розніца вышыняў: {HEIGHT}
-STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Плошча: {NUM} x {NUM}{}Розьнiца вышыняў: {HEIGHT}
+STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Плошча: {NUM} x {NUM}{}Рознiца вышыняў: {HEIGHT}


 # These are used in buttons
@@ -581,9 +581,9 @@ STR_SORT_BY_NUMBER                                              :Нумар
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Прыбытак летась
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Прыбытак у бягучым годзе
 STR_SORT_BY_AGE                                                 :Узрост
-STR_SORT_BY_RELIABILITY                                         :Надзейнасьць
+STR_SORT_BY_RELIABILITY                                         :Надзейнасць
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Умяшчальнасьць грузу
-STR_SORT_BY_MAX_SPEED                                           :Максымальная хуткасьць
+STR_SORT_BY_MAX_SPEED                                           :Максымальная хуткасць
 STR_SORT_BY_MODEL                                               :Мадэль
 STR_SORT_BY_VALUE                                               :Кошт
 STR_SORT_BY_LENGTH                                              :Даўжыня
@@ -599,7 +599,7 @@ STR_SORT_BY_POWER                                               :Магутна
 STR_SORT_BY_TRACTIVE_EFFORT                                     :Цягавае намаганьне
 STR_SORT_BY_INTRO_DATE                                          :Пачатак вытворчасьцi
 STR_SORT_BY_RUNNING_COST                                        :Кошт абслугоўваньня
-STR_SORT_BY_POWER_VS_RUNNING_COST                               :Магутнасьць/кошт абслуг.
+STR_SORT_BY_POWER_VS_RUNNING_COST                               :Магутнасць/кошт абслуг.
 STR_SORT_BY_CARGO_CAPACITY                                      :Ёмiстасьць

 # Tooltips for the main toolbar
@@ -626,7 +626,7 @@ STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Буда
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Будаўніцтва аўтамабільных дарог
 STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Будаўніцтва водных камунікацыяў
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Будаўніцтва аэрапортаў
-STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Адкрыць панэль ляндшафту для зьмяненьня рэльефу, пасадкi дрэваў i г.д.
+STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Адкрыць панэль ляндшафту для змяненьня рэльефу, пасадкi дрэваў i г.д.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Наладка гуку й музыкі
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Паказаць апошнiя паведамленьнi/навiны, паказаць наладкi паведамленьняў
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Iнфармацыя аб зямлi; кансоль; наладка штучнага інтэлекту (AI/ШI); здымкi экрана; аб гульні
@@ -659,7 +659,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Выхад

 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Наладкі гульні
-STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Наладкі складанасьцi
+STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Наладкі складанасцi
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Пашыраныя наладкі
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Наладки ШI (AI)
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Наладкі NewGRF
@@ -760,7 +760,7 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Здымак э
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Здымак усёй мапы (Ctrl+G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Аб гульні OpenTTD
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Выраўноўваньне спрайтаў
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Пераключыць абмежавальныя рамкі
+STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Пераключыць абмяжоўвальныя рамкі
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -1184,7 +1184,7 @@ STR_GAME_OPTIONS_CURRENCY_DEM                                   :Нямецка
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Дацкая крона (DKK)
 STR_GAME_OPTIONS_CURRENCY_ESP                                   :Гішпанская пэсэта (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Фінская марка (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Францускі франк (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Французскі франк (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Грэцкая драхма (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Вугорскі форынт (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Ісьляндзкая крона (ISK)
@@ -1309,7 +1309,7 @@ STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 б
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Зьмяніць парамэтр уласнай валюты

 # Difficulty level window
-STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Узровень складанасьцi
+STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Узровень складанасцi

 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Лёгкі
@@ -1351,7 +1351,7 @@ STR_NUM_VERY_LOW                                                :Вельмі м
 STR_NUM_LOW                                                     :Мала
 STR_NUM_NORMAL                                                  :Звычайна
 STR_NUM_HIGH                                                    :Шмат
-STR_NUM_CUSTOM                                                  :Уласны
+STR_NUM_CUSTOM                                                  :Уласная
 STR_NUM_CUSTOM_NUMBER                                           :Зададзены ({NUM})

 STR_VARIETY_NONE                                                :Няма
@@ -1419,7 +1419,7 @@ STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Даз
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Зона пакрыцьця залежыць ад тыпу станцыі: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Дазволіць знос амаль усіх гарадзкіх аб'ектаў: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Макс. даўжыня цягнiкоў: {ORANGE}{STRING} клет{P 0:1 ка кi ак}
-STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Колькасьць дыму/іскраў у лакаматываў: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Колькасць дыму/іскраў у лакаматываў: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMOKE_AMOUNT_NONE                            :няма
 STR_CONFIG_SETTING_SMOKE_AMOUNT_ORIGINAL                        :арыгiнальная
 STR_CONFIG_SETTING_SMOKE_AMOUNT_REALISTIC                       :рэалістычная
@@ -1442,8 +1442,8 @@ STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Мак
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Мэтад стварэньня сыравінных прадпрыемстваў: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :не ствараць
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :як i iншыя
-STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :геалягiчная разьведка
-STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :{LTBLUE}Пляскаты рэльеф вакол прадпрыемстваў: {ORANGE}{STRING} клет{P 0:1 ка кi ак}
+STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :геолагаразьведка
+STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :{LTBLUE}Плоскi рэльеф вакол прадпрыемстваў: {ORANGE}{STRING} клет{P 0:1 ка кi ак}
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Дазволіць некалькі прадпрыемстваў аднаго тыпу на горад: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Паказваць сыгналы на баку руху: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Паказваць фінансавую статыстыку напрыканцы года: {ORANGE}{STRING}
@@ -1468,7 +1468,7 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Даз
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Дазволіць будаўніцтва прыпынкаў Ro-Ro на дарогах канкурэнтаў: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Дазволіць будаўніцтва сумежных станцыяў: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Уключыць падтрымку некалькіх транспартных набораў NewGRF: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Зьмена гэтага парамэтру немагчыма, калі ў гульні ёсьць транспартныя сродкі.
+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Зьмена гэтага парамэтру немагчыма, калі ў гульні ёсць транспартныя сродкі.

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Малыя аэрапорты ніколі не састарэюць: {ORANGE}{STRING}

@@ -1635,7 +1635,7 @@ STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}Раз
 STR_CONFIG_SETTING_TOOLBAR_POS_LEFT                             :леваруч
 STR_CONFIG_SETTING_TOOLBAR_POS_CENTER                           :ў цэнтры
 STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT                            :праваруч
-STR_CONFIG_SETTING_STATUSBAR_POS                                :{LTBLUE}Разьмяшчэньне радка стану: {ORANGE}{STRING}
+STR_CONFIG_SETTING_STATUSBAR_POS                                :{LTBLUE}Размяшчэньне радка стану: {ORANGE}{STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS_LEFT                           :Зьлева
 STR_CONFIG_SETTING_STATUSBAR_POS_CENTER                         :Пасярэдзiне
 STR_CONFIG_SETTING_STATUSBAR_POS_RIGHT                          :Зправа
@@ -1670,7 +1670,7 @@ STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Абс
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Маршруты
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Цягнікі
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Населеныя пункты
-STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Прамысловасьць
+STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Прамысловасць


 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Альгарытм пошуку шляху для цягнікоў: {ORANGE}{STRING}
@@ -1764,7 +1764,7 @@ STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :субаркт
 STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :субтрапічны ляндшафт
 STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :цацачны ляндшафт
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Зьмяненьне даты: {ORANGE}{DATE_SHORT}
-STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Зьмянiць бягучы год
+STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Змянiць бягучы год
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Дазволіць зьмяненьне прадукцыйнасьці: {ORANGE}{STRING}

 # Livery window
@@ -1925,7 +1925,7 @@ STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Уста
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Абараніце вашу гульню паролем, калі ня хочаце рабіць яе публічна даступнай

 STR_NETWORK_START_SERVER_LAN_INTERNET                           :Лакальная сетка / Інтэрнэт
-STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Інтэрнэт (зьмясьціць у агульны сьпіс)
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Інтэрнэт (зьмясціць у агульны сьпіс)
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} клiент{P "" ы аў}
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Макс. клiентаў:
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Выбар максымальнай колькасьці кліентаў. Ня ўсе месцы павінны быць занятыя
@@ -1955,7 +1955,7 @@ STR_NETWORK_LANG_DUTCH                                          :Нідэрля
 STR_NETWORK_LANG_ESPERANTO                                      :Эспэранта
 STR_NETWORK_LANG_FINNISH                                        :Фінская
 STR_NETWORK_LANG_HUNGARIAN                                      :Вугорская
-STR_NETWORK_LANG_ICELANDIC                                      :Ісьляндзкая
+STR_NETWORK_LANG_ICELANDIC                                      :Ісляндзкая
 STR_NETWORK_LANG_ITALIAN                                        :Італьянская
 STR_NETWORK_LANG_JAPANESE                                       :Японская
 STR_NETWORK_LANG_KOREAN                                         :Карэйская
@@ -2263,7 +2263,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Буда
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Пераключэньне паміж будаўніцтвам і выдаленьнем чыгуначных рэйкаў, сыгналаў, станцыяў. Пры націснутым Ctrl станцыі ліквідуюцца разам з рэйкамі.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Канвэртаваць/мадэрнізаваць тып каляінаў. Пры націснутым Shift - ацэнка кошту будаўніцтва.

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Кірунак дэпо
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Выберыце кірунак дэпо
@@ -2295,14 +2294,14 @@ STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Звыч
 STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Уваходны сэмафор (прэсыгнал).{}Адкрыты, калі хаця б адзін з выхадных сыгналаў на наступнай сэкцыі каляіны адкрыты. У астатніх выпадках закрыты.
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Выхадны сэмафор (прэсыгнал).{}Працуе як звычайны сэмафор, але яго стан улічваецца ў працы ўваходных і камбінаваных сыгналаў.
 STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Камбінаваны сэмафор (прэсыгнал).{}Працуе адначасова як уваходны і выхадны сэмафор. Гэта дазваляе будаваць вялікія «дрэвы» каляінаў з прэсыгналамі.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Аднабаковы маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Аднабаковы маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку.
 STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Звычайны сьветлафор.{}Не дазваляе некалькім цягнікам адначасова знаходзіцца на адным блёк-участку.
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Уваходны сьветлафор (прэсыгнал).{}Адкрыты, калі хаця б адзін з выхадных сыгналаў на наступнай сэкцыі каляіны адкрыты. У астатніх выпадках закрыты.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Выхадны сьветлафор (прэсыгнал).{}Працуе як звычайны сьветлафор, але яго стан улічваецца ў працы ўваходных і камбінаваных сыгналаў.
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Камбінаваны сьветлафор (прэсыгнал).{}Працуе адначасова як уваходны і выхадны сьветлафор. Гэта дазваляе будаваць вялікія «дрэвы» каляінаў з прэсыгналамі.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Аднабаковы маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Аднабаковы маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку.
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Зьмяненьне тыпаў сыгналаў.{}Калі кнопка націснута, пстрыкніце для пераўтварэньня існуючага сыгнала ў сыгнал выбранага тыпу й віду, або пстрыкніце з націснутым Ctrl для перабіраньня існуючых варыянтаў. Shift+пстрычка - ацэнка кошту пераўтварэньня.
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Шчыльнасьць аўтаматычнай расстаноўкі сыгналаў пры цягненьні
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Паменшыць шчыльнасьць расстаноўкі сыгналаў
@@ -2371,7 +2370,7 @@ STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Буда
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Разьмясьціць буй, які можа быць выкарыстаны як пункт шляху. Пры націснутым Shift - ацэнка кошту будаўніцтва.
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Будаўніцтва аквэдукаў Пры націснутым Shift - ацэнка кошту будаўніцтва.
 STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Пазначыць, дзе будзе вада.{}Пабудаваць канал, а пры націснутым Ctrl клетка на ўзроўні мора запаўняецца вадой.
-STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Разьмясьціць рэкі
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Разьмясціць рэкі

 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Кірунак дока
@@ -2413,7 +2412,7 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Узро

 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Земляныя работы
-STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Апусьціць кут зямлі. Перацягваньне апускае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва.
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Апусціць кут зямлі. Перацягваньне апускае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва.
 STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Падняць кут зямлі. Перацягваньне падымае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва.
 STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Выраўнаваць зямлю да вышыні першага абранага кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту выраўноўваньня.
 STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Набыцьцё зямлі. Пры націснутым Shift - ацэнка кошту набыцьця.
@@ -2421,7 +2420,7 @@ STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Набы
 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Выбар аб'екта
 STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Абярыце ствараны аб'ект. Пры націснутым Shift - ацэнка кошту пабудовы.
-STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Абярыце клясу аб'екта для будаўніцтва
+STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Абярыце клас аб'екта для будаўніцтва
 STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}Прагляд аб'екта
 STR_OBJECT_BUILD_SIZE                                           :{BLACK}Памер: {GOLD}{NUM} x {NUM} клетак

@@ -2438,10 +2437,10 @@ STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Паса

 # Land generation window (SE)
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Стварэньне ляндшафту
-STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Разьмясьціць камяні па мапе
-STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Разьмясьціць пустэльню.{}Націсьніце Ctrl, каб выдаліць яе.
-STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Павялічыць плошчу зьмяненьня рэльефу
-STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Паменшыць плошчу зьмяненьня рэльефу
+STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Разьмясціць камяні па мапе
+STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Разьмясціць пустэльню.{}Націсьніце Ctrl, каб выдаліць яе.
+STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Павялічыць плошчу змяненьня рэльефу
+STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Паменшыць плошчу змяненьня рэльефу
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Стварыць выпадковую мапу
 STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Стварыць новы сцэнар
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Ачысьціць ляндшафт
@@ -2699,7 +2698,7 @@ STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Ства
 STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Выпадковы рэльеф
 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Вышыня над узроўнем мора:
 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Падняць ўзровень роўнай зямлі на 1
-STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Апусьціць ўзровень роўнай зямлі на 1
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Апусціць ўзровень роўнай зямлі на 1

 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Зьмяніць вышыню роўнай зямлі

@@ -2742,6 +2741,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Пера
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Унiз
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Перамясьціць выбраны файл NewGRF ніжэй
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Сьпіс устаноўленых файлаў NewGRF. Выберыце файл для зьмяненьня парамэтраў
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Усталяваць парамэтры
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Пераключыць палітру
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Пераключыць палітру для выбраных NewGRF файлаў.{}Выкарыстоўвайце пераключэньне, калі графіка ў гульні малюецца ружовым колерам.
@@ -2761,7 +2761,7 @@ STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Пара
 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Няма даступнай інфармацыі
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Файл ня знойдзены
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Адключана
-STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Несумяшчальна з дадзенай вэрсіяй OpenTTD
+STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Несумяшчальна з дадзенай версіяй OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Увядзіце парамэтры файла NewGRF

@@ -2772,14 +2772,12 @@ STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Ськi
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Ськінуць значэньнi ўсіх парамэтраў
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамэтр {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
-STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Колькасьць парамэтраў: {ORANGE}{NUM}
-
-# NewGRF readme window
+STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Колькасць параметраў: {ORANGE}{NUM}

 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Прагляд - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Бацька (parent)
-STR_NEWGRF_INSPECT_PARENT_TOOLTIP                               :{BLACK}Прагляд аб'екта ў кантэксьце бацькі
+STR_NEWGRF_INSPECT_PARENT_TOOLTIP                               :{BLACK}Прагляд аб'екта ў кантэксце бацькі

 STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT                            :{STRING} у {HEX}
 STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT                     :Аб'ект
@@ -2790,7 +2788,7 @@ STR_NEWGRF_INSPECT_QUERY_CAPTION                                :{WHITE}Пара
 # Sprite aligner window
 STR_SPRITE_ALIGNER_CAPTION                                      :{WHITE}Выраўноўваньне спрайта {COMMA} ({STRING})
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Наступны спрайт
-STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Перайсьці да наступнага нармальнага спрайта, прапускаючы псэўдаспрайты, а таксама зьмяненьнi колеру/шрыфтавыя.
+STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Перайсьці да наступнага нармальнага спрайта, прапускаючы псэўдаспрайты, а таксама змяненьнi колеру/шрыфтавыя.
 STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Перайсьці да спрайта
 STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Перайсьці да зададзеных спрайту. Калі спрайт не нармальны, пераход адбудзецца да наступнага нармальнага.
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Папярэдні спрайт
@@ -2823,7 +2821,7 @@ STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Нечакан
 STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Невядомая ўласьцівасьць для Action 0.
 STR_NEWGRF_ERROR_INVALID_ID                                     :Выкарыстоўваецца няправільны ID.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} утрымлiвае пашкоджаны спрайт. Усе пашкоджаныя спрайты будуць паказаны чырвоным знакам пытаньня (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Зьмяшчае некалькі Action 8 дзеяньняў.
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Змяшчае некалькі Action 8 дзеяньняў.
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Дадзеныя раптоўна скончыліся.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}У бягучым наборы базавай графікі адсутнічаюць выявы некаторых аб'ектаў.{}Калі ласка, абнавіце модуль базавай графікі.
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Запрошаныя рэсурсы GRF недаступныя
@@ -2854,7 +2852,7 @@ STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Мяня
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Цягнік «{VEHICLE}», які належыць «{COMPANY}», мае няправільную даўжыню. Верагодна, гэта выклікана праблемамі ў файле новай графікі. Гульня можа рассынхранізавацца або «выляцець».

 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF «{0:STRING}» падае няправільную інфармацыю.
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Інфармацыя аб умяшчальнасьці/пераабсталяваньнi для лякаматыва «{1:ENGINE}» пасьля пабудовы адрозніваецца ад зьвестак у сьпісе пакупкі, што можа перашкодзіць функцыі аўтаабнаўленьня/аўтазамены карэктна зрабіць пераабсталяваньне.
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Інфармацыя аб умяшчальнасьці/пераабсталяваньнi для лякаматыва «{1:ENGINE}» пасля пабудовы адрозніваецца ад зьвестак у сьпісе пакупкі, што можа перашкодзіць функцыі аўтаабнаўленьня/аўтазамены карэктна зрабіць пераабсталяваньне.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}«{1:STRING}» выклікаў бясконцы цыкл.

 # 'User removed essential NewGRFs'-placeholders for stuff without specs
@@ -2869,9 +2867,9 @@ STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<невядом
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Сьпіс таблічак - {COMMA} табліч{P ка кi ак}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Рэгiстр
-STR_SIGN_LIST_CLEAR                                             :{BLACK}Ачысьціць фільтр
+STR_SIGN_LIST_CLEAR                                             :{BLACK}Ачысціць фільтр
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Пераключыць праверку рэгістра пры параўнанні назваў таблiчак з фільтрам
-STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Ачысьціць фільтр
+STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Ачысціць фільтр

 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Зьмяніць надпіс на таблічцы
@@ -2986,10 +2984,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Цудоўны
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Паказаць станцыю ў асноўным вакне. Ctrl+клік - паказаць у дадатковым вакне.
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Перайменаваць станцыю

-STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Паказаць усе цягнiкi, у раскладзе якіх ёсьць гэтая станцыя
-STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Паказаць усе аўтамабiлi, у раскладзе якіх ёсьць гэты тэрмiнал/прыпынак
-STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Паказаць увесь авiятранспарт, у раскладзе якога ёсьць гэты аэрапорт
-STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Паказаць усе караблі, у раскладзе якіх ёсьць гэтая прыстань
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Паказаць усе цягнiкi, у раскладзе якіх ёсць гэтая станцыя
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Паказаць усе аўтамабiлi, у раскладзе якіх ёсць гэты тэрмiнал/прыпынак
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Паказаць увесь авiятранспарт, у раскладзе якога ёсць гэты аэрапорт
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Паказаць усе караблі, у раскладзе якіх ёсць гэтая прыстань

 STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Перайменаваць станцыю

@@ -3029,7 +3027,7 @@ STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENC
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Пазычыць {CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Павелічыць памер пазыкі. Ctrl+клiк - пазычыць да максымальнай сумы.
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Аддаць {CURRENCY}
-STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Вярнуць частку пазыкі. Ctrl+клiк - вярнуць усё, па магчымасьці.
+STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Вярнуць частку пазыкі. Ctrl+клiк - вярнуць усё, па магчымасці.

 # Company view
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
@@ -3053,8 +3051,8 @@ STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Агле
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Перамясьціць
 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Перамясьціць штаб-кватэру кампаніі ў іншае месца за 1% ацэнкавага кошту капіталу кампаніі. Shift+пстрычка - ацэнка кошту пераносу.

-STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Зьнешнасьць
-STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Зьмяніць зьнешнасьць дырэктара
+STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Знешнасьць
+STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Зьмяніць знешнасьць дырэктара
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Колер
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Зьмяніць колер транспартных сродкаў кампаніі
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Назва кампаніі
@@ -3491,7 +3489,7 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Ёміс
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Пераабсталяваньне)
 STR_REFIT_TITLE                                                 :{GOLD}Выберыце тып грузу для перавозкі:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Новая ёмістасьць: {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Новая ёмістасьць: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Новая ёмістасць: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Абярыце вагоны для пераабсталяваньня. Можна абвесьці мышшу некалькі вагонаў. Пстрычка па-за межамі састава абярэ ўвесь састаў. Ctrl+пстрычка абярэ вагоны да канца састава.

 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Выберыце тып грузу для перавозкі
@@ -3550,7 +3548,7 @@ STR_ORDER_SERVICE                                               :{BLACK}Абсл
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ісьці заўсёды
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Абслужыць, калі неабходна
 STR_ORDER_DROP_HALT_DEPOT                                       :Стоп
-STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Прапусьціць гэтае заданьне, калі абслугоўваньне не патрабуецца
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Прапусціць гэтае заданьне, калі абслугоўваньне не патрабуецца

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Парамэтр транспарту для параўнаньня

@@ -3633,8 +3631,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Не разг
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Не разгружацца й чакаць поўнай загрузкі любым грузам)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Не разгружацца й не грузiцца)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[пачатак станцыi]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[сярэдзiна станцыi]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[канец станцыі]
@@ -3797,7 +3793,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<недасту
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Гульня была захавана ў вэрсіі без падтрымкі трамваяў. Усе трамваі былі адключаны.

 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Генэрацыя мапы спынена...{}... няма прыдатных месцаў для разьмяшчэньня гарадоў
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Генэрацыя карты спынена...{}... няма прыдатных месцаў для разьмяшчэньня гарадоў
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... у гэтым сцэнары няма гарадоў

 STR_ERROR_PNGMAP                                                :{WHITE}Не атрымалася загрузіць ляндшафт з PNG...
@@ -3811,7 +3807,7 @@ STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... не
 STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... выява занадта вялiкая

 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Выхад за межы даступных значэньняў
-STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Зьмяненьне памераў зыходнай мапы да такіх значэньняў не рэкамэндуецца. Працягваць?
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Змяненьне памераў зыходнай карты да такіх значэньняў не рэкамендуецца. Працягваць?

 # Soundset messages
 STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Бягучая гукавая схэма абрана сістэмай аўтаматычна. Дадатковыя наборы гукаў можна загрузіць праз сістэму анлайн-кантэнту.
@@ -3838,7 +3834,7 @@ STR_ERROR_ALREADY_BUILT                                         :{WHITE}... уж
 STR_ERROR_OWNED_BY                                              :{WHITE}... належыць {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... участак належыць іншай кампаніі
 STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... дасягнуты лiмiт ляндшафтных зьменаў
-STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... дасягнута абмежаваньне па колькасьці ачышчаных клетак
+STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... дасягнута абмежаваньне па колькасці ачышчаных клетак
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Імя павінна быць унікальным
 STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRING} на шляху
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Забаронена падчас паўзы
@@ -3848,7 +3844,7 @@ STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}... ад
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Адміністрацыя г. {NBSP}{TOWN} забараняе пабудову яшчэ аднаго аэрапорта ў горадзе
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}Адміністрацыя г. {NBSP}{TOWN} не дазваляе будаўніцтва аэрапорта з-за высокага ўзроўню шуму.
 STR_ERROR_BRIBE_FAILED                                          :{WHITE}Ваша спроба даць хабар была
-STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}выяўлена рэгіянальным сьледчым
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}выяўлена рэгіянальным следчым

 # Levelling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Тут немагчыма падвысіць узровень зямлі...
@@ -3880,7 +3876,7 @@ STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Нема
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Немагчыма перайменаваць горад...
 STR_ERROR_CAN_T_FOUND_TOWN_HERE                                 :{WHITE}Тут немагчыма пабудаваць горад...
 STR_ERROR_CAN_T_EXPAND_TOWN                                     :{WHITE}Немагчыма пашырыць горад...
-STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... занадта блізка да краю мапы
+STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... занадта блізка да краю карты
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... занадта блізка да іншага горада
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... занадта шмат гарадоў
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... няма месца на мапе
@@ -841,9 +841,9 @@ STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Subsídio removido:{}{} Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Subsídio de serviço oferecido:{}{} Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá subsídio de um ano da autoridade local!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará 50% extra durante o próximo ano ano!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o dobro de tarifas durante o próximo ano!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o triplo de tarifas durante o próximo ano!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o quadruplo de tarifas durante o próximo ano!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o dobro de impostos durante o próximo ano!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o triplo de impostos durante o próximo ano!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o quadruplo de impostos durante o próximo ano!

 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{} Programa de reconstrução rodoviária financiado por {STRING} provoca 6 meses de miséria aos condutores!

@@ -3448,7 +3448,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... algu
 STR_ERROR_BMPMAP                                                :{WHITE}Impossível carregar terreno a partir de BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... não foi possível converter o tipo de imagem

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Aviso de Escala
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Alterar muito o tamanho do mapa original não é recomendado. Continuar com a geração?

@@ -2026,7 +2026,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Izgradi
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Aktiviraj izgradnju/uklanjanje željezničke pruge, signala, čvorišta i postaja. Držanjem tipke Ctrl također se uklanjaju tračnice na čvorištima i postajama.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Pretvori/nadogradi vrstu pruge. Shift mijenja prikaz građenje/procjena troškova.

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Smjer spremišta vlakova
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Odaberi smjer željezničkog spremišta
@@ -2501,6 +2500,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Pomakni
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK} Pomakni dolje
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Popis instaliranih NewGRF datoteka. Kliknite na datoteku da bi promijenili njene parametre
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Postavi parametre
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Aktiviraj paletu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Prilagodi paletu izabranog NewGRF-a.{}Učini ovo kada grafike iz ovog NewGRF-a izgledaju ljubičasto tijekom igre.
@@ -2533,8 +2533,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametar {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Broj parametara: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Pregledaj - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Matični
@@ -3372,8 +3370,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Čekaj puni uk
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Čekaj bilo koji puni ukrcaj bez iskrcavanja)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Bez iskrcaja i bez ukrcaja)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[početak]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[sredina]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[kraj]
@@ -1057,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Højt
 STR_SEA_LEVEL_CUSTOM                                            :Brugerdefineret
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Brugerdefineret ({NUM}%)

-
 STR_DISASTER_NONE                                               :Ingen
 STR_DISASTER_REDUCED                                            :Reduceret
 STR_DISASTER_NORMAL                                             :Normal
@@ -1084,7 +1083,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Passiv
 STR_CITY_APPROVAL_TOLERANT                                      :Tolerant
 STR_CITY_APPROVAL_HOSTILE                                       :Fjendtlig

-STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Der blev ikke fundet en egnet computer-spiller...{}Du kan downloade flere forskellige computer-spillere gennem 'Online Indhold'.
+STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Der blev ikke fundet en egnet computer-spiller...{}Du kan downloade flere forskellige computer-spillere genem'Online Indhold'.
 STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Denne handling ændrer sværhedsgraden til speciel

 # Advanced settings window
@@ -1408,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tjek for
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Vis indstillinger for computerstyrede spillere
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Afslut 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Afslut
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {STRING}?
@@ -2525,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} af <ikk
 STR_NEWGRF_INVALID_ENGINE                                       :<ugyldig køretøjsmodel>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<ikke gyldig industri type>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste over skilte - {COMMA} Skilt{P "" e}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Match store og små bogstaver
@@ -3194,8 +3190,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stop
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Spring denne ordre over medmindre der er behov for service

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Data som ordrespring baseres på
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Last-procentdel
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Pålidelighed
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Tophastighed
@@ -3362,7 +3356,7 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Se debug
 STR_ERROR_NO_AI                                                 :{WHITE}OpenTTD er kompileret uden understøttelse for kunstig intelligens...
 STR_ERROR_NO_AI_SUB                                             :{WHITE}... ingen kunstig intelligens er tilgængeligt!

-STR_ERROR_AI_NO_AI_FOUND                                        :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Indhold'-systemet.
+STR_ERROR_AI_NO_AI_FOUND                                        :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Contet' systemet.
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Computerspiller-debugvindue er kun tilgængeligt på serveren

@@ -3447,7 +3441,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... noge
 STR_ERROR_BMPMAP                                                :{WHITE}Kan ikke hente landskab fra BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kunne ikke konvertere billedtypen.

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalerings advarsel
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}At ændre størrelsen på kildebilledet anbefales ikke. Fortsæt genereringen?

@@ -1930,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Graaf sp
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Kies tussen bouwen en verwijderen van sporen, seinen, controleposten en stations. Houd Ctrl ingedrukt om ook het spoor van controleposten en stations te verwijderen
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Verander spoortype. Shift schakelt tussen bouwen/inschatting van de kosten

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Richting van treindepot
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecteer richting van treindepot
@@ -2405,6 +2404,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Verplaat
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naar beneden
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar beneden in de lijst
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Een lijst van de NewGRF-bestanden die zijn geïnstalleerd. Klik op een bestand om de parameters te wijzigen
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stel parameters in
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palet omzetten
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Verander het palet van het geselecteerde NewGRF-bestand.{}Gebruik deze mogelijkheid als de afbeeldingen van dit NewGRF-bestand er paars uit zien in het spel
@@ -2437,8 +2437,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Aantal parameters: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspecteer - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Huidig
@@ -3276,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Niet lossen en
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Niet lossen en één soort vracht volledig laden)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Niet lossen en niet laden)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[begin]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[midden]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[einde]
@@ -1884,7 +1884,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... conn
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... file not writable
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Could not decompress the downloaded file

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
@@ -1931,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Build ra
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toggle build/remove for railway track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convert/Upgrade the type of rail. Shift toggles building/showing cost estimate

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Train Depot Orientation
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Select railway depot orientation
@@ -2407,8 +2405,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Dow
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
@@ -2431,6 +2427,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabled
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Incompatible with this version of OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enter NewGRF parameters
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Change NewGRF parameters
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Close
@@ -2440,8 +2437,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING1}: {ORANGE}{STRING1}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Number of parameters: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspect - {STRING5}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Parent
@@ -3279,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(No unloading a
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(No unloading and wait for any full load)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(No unloading and no loading)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[near end]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[middle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[far end]
@@ -1262,7 +1262,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}Disable
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING}

-STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Allow AIs in multiplayer: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Allow AIs in multiplayer (experimental): {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes before AI is suspended: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Maintenance intervals are in percents: {ORANGE}{STRING}
@@ -1884,7 +1884,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... conn
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... file not writable
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Could not decompress the downloaded file

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
@@ -1931,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Build ra
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toggle build/remove for railroad track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convert/Upgrade the type of rail. Shift toggles building/showing cost estimate

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Train Depot Orientation
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Select railroad depot orientation
@@ -2407,8 +2405,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Dow
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
@@ -2431,6 +2427,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabled
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Incompatible with this version of OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enter NewGRF parameters
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Change NewGRF parameters
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Close
@@ -2440,8 +2437,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Number of parameters: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspect - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Parent
@@ -3279,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(No unloading a
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(No unloading and wait for any full load)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(No unloading and no loading)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[near end]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[middle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[far end]
@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED                                           :Maksimuma rapid
 STR_SORT_BY_MODEL                                               :Tipo
 STR_SORT_BY_VALUE                                               :Valoro
 STR_SORT_BY_LENGTH                                              :Longo
-STR_SORT_BY_LIFE_TIME                                           :Resta vivo
+STR_SORT_BY_LIFE_TIME                                           :Restanta vivdaŭro
 STR_SORT_BY_TIMETABLE_DELAY                                     :Horara malfruo
 STR_SORT_BY_FACILITY                                            :Stacidoma tipo
 STR_SORT_BY_WAITING                                             :Valoro de atendanta ŝarĝo
@@ -446,7 +446,6 @@ STR_ABOUT_MENU_SCREENSHOT                                       :Ekranfoto
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Pligrandiga ekranfoto
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Tuta karto ekranfoto
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Pri 'OpenTTD'
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Montri/ne montri limigujo
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -1107,8 +1106,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realisme
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Modelo de stratveturilakcelado: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Originale
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Realisme
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Dekliva kruteco por vagonaroj: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Dekliva kruteco por stratveturiloj: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Kruteco de deklivo por vagonaroj {ORANGE}{STRING}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Kruteco de deklivo por stratveturiloj {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Vagonaroj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Permesu ligi staciojn ne rekte najbarajn: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING}
@@ -1873,7 +1872,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... neko
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... dosiero ne skribebla
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Ne povis malkompaktigi la elŝutitan dosieron

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Ebloj por travidebleco
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Baskuligi travideblecon de staciosignoj. Stir+Klak por ŝlosi.
@@ -1919,7 +1917,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Konstruu
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Elekti inter konstruado/forigado de trako, signaliloj, vojpunktoj kaj stacidomoj. Tenu Stir-klavon por forigi relojn de vojpunktoj kaj stacioj.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Transigu reltipon

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Direkto de la trajngaraĝo
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Elekti direkton de la trajngaraĝo
@@ -2375,8 +2372,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Malsupre
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por ŝanĝi la parametrojn

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Agordu parametrojn
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Baskuligi paletron
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Apliku ŝanĝojn
@@ -2398,6 +2393,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Malaktiva
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Malkongrua ĉe ĉi tio versio de OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enigu NewGRF-parametrojn
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Ŝanĝu parametroj de la NewGRF
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Fermu
@@ -2407,8 +2403,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametro {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Nombro da parametroj: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspektu - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Magistro
@@ -2436,14 +2430,14 @@ STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Eraro: {SI
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatalo: {SILVER}{STRING}
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Neriparebla NewGRF-eraro okazis: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} ne funkcios kun la versio de TTDPatch menciata de OpenTTD.
-STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} estas por la {STRING} versio de TTD.
+STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} estas por versio {STRING} de TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} estas intencita por uzo kun {STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Nevalida parametro por {1:STRING}: parametro{STRING} ({NUM})
-STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING} devi esti ŝarĝata antaŭ {STRING}.
-STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} devi esti ŝarĝata post {STRING}.
-STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} bezonas OpenTTD versio {STRING} aŭ pli bona
+STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING} estu ŝarĝata antaŭ {STRING}.
+STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} estu ŝarĝata post {STRING}.
+STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} bezonas almenaŭ version {STRING} de OpenTTD
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :la GRF-dosiero estas farita por traduki
-STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Tro da NewGRF-oj estas ŝarĝataj
+STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Tro da novaj grafikaĵoj estas ŝarĝataj
 STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neatendita bildeto.
 STR_NEWGRF_ERROR_INVALID_ID                                     :Atenco uzi nevalida ID.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} enhavas rompitan bildeton. Ĉiuj rompitaj bildetoj aspektos kiel ruĝaj demandsignoj (?).
@@ -2971,7 +2965,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Sendi av
 STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Aĉeti kopion de la trajno kun ĉiuj vagonoj. Stir+Klak por kunhavigi la itineron.
 STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Aĉeti kopion de la stratveturilo. Stir+Klak por kunhavigi la itineron.
 STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Aĉeti kopion de la ŝipo. Stir+Klak por kunhavigi la itineron.
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Aĉeti kopion de la aviadilo. Stir+Klak por kunhavigi la itinero. Maj+klak montros la antaŭvidatan koston sen jam aĉetin.
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Aĉeti kopion de la aviadilo. Stir+Klak por kunhavigi la itineron.

 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Igu trajnon iri malgraŭ signalo

@@ -3151,7 +3145,7 @@ STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Transsal
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Ŝarĝu procenton
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Fidindo
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maksimuma rapido.
-STR_ORDER_CONDITIONAL_AGE                                       :Aĝo (jaroj)
+STR_ORDER_CONDITIONAL_AGE                                       :Aĝo de la veturilo (jaroj)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Prizorgo necesas.
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Ĉiam

@@ -3224,8 +3218,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ne malŝarĝu
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ne malŝarĝu kaj atendu ajnan plenan ŝarĝon)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ne malŝarĝu kaj ne ŝarĝu)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[near end]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[middle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[far end]
@@ -3396,7 +3388,6 @@ STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skala av
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ne rekomendindas tro ŝanĝi la grandecon de la mapo. Ĉu daŭrigi la generadon?

 # Soundset messages
-STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Sola bakupa sona aro estis trovata. Se vi bezonas sonojn, instalu sonan aron per la enhava elŝulta sistemo

 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekranfoto sukcese konserviĝis kiel '{STRING}'
@@ -3468,7 +3459,6 @@ STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... tro
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... spaco mankas sur la mapo
 STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}La urbo ne konstruos stratojn. Vi povas ebligi stratkonstruadon per Avancitaj Agordoj->Ekonomio->Urboj.
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Aktivas vojprilaborado
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Ne povas forviŝi ĉi tiun urbon...{}Stacidomo aŭ tenejo rilatas al la urbon aŭ urban kahelon ne povas forviŝigi
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... ne jen estas konvenan lokon por statuo en la centro de ĉi tiu urbo

 # Industry related errors
@@ -1987,7 +1987,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Ehita ro
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Vaheta rongitee, signaalide, meldepunktide ja jaamade ehitamise ja lammutamise vahel. Ctrl-klahviga eemaldatakse meldepunktid ja jaamad.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Muuda/uuenda rööpaliiki. Shift valib ehitamise/hinna kuvamise režiimi

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Depoo suund
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Depoole suuna valimine
@@ -2462,6 +2461,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}NewGRF-f
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Liiguta alla
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}NewGRF-faili liigutamine loendis alla
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Nimekiri installeerimata NewGRF failidest. Parameetrite muutmiseks klõpsa failil.
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Vali parameetrid
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Vaheta paletti
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Vaheta valitud NewGRF-i paletti.{}Tee seda, kui NewGRF-i graafika paistab mängus roosa.
@@ -2494,8 +2494,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameeter {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Parameetrite arv: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspekteeri- {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Vanem
@@ -3333,8 +3331,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Maha ei laadit
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Maha ei laadita ja oodatakse suvalist täislaadungit)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Maha ei laadita ja peale ei laadita)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[lõpu lähedal]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[keskel]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[täiesti lõpus]
@@ -1884,7 +1884,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... yhte
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... tiedostoa ei voitu kirjoittaa
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Ei voitu purkaa ladattua tiedostoa

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Läpinäkyvyysasetukset
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Klik lukitaksesi
@@ -1931,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Rakenna
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Rautatien, opastimien, reittipisteiden ja asemien rakentaminen/poisto päälle/pois. Pidä pohjassa Ctrl-näppäintä poistaaksesi myös aseman tai reittipisteen alla olevat raiteet.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Muunna/päivitä raidetyyppi. Shift vaihtaa muuntotilan ja kustannearvion välillä

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Veturitallin suunta
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Valitse veturitallin suunta.
@@ -2407,8 +2405,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Siirrä
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa alaspäin
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista asennetuista NewGRF-tiedostoista. Valitse tiedosto muokataksesi sen parametreja.

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Aseta parametrit
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Käytä eri palettia
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Käytä valitun NewGRF:n kanssa eri palettia.{}Tee näin, jos tämän NewGRF:n grafiikat näkyvät pelissä vaaleanpunaisina.
@@ -2431,6 +2427,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Ei käytö
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Epäyhteensopiva tämän OpenTTD-version kanssa

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Anna NewGRF-parametrit
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Muuta NewGRF-parametrejä
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Sulje
@@ -2440,8 +2437,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametri {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Parametrien määrä: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Tutki - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Vanhempi
@@ -3279,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ei lastin purk
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ei lastin purkua, mutta odota minkä tahansa lastin täyttymistä)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ei purkua eikä lastausta)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[alkupäähän]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[keskelle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[loppupäähän]
@@ -1931,7 +1931,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construi
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Basculer construire/retirer pour les voies, les signaux, les points de contrôle et les stations. Maintenir Ctrl pour retirer également la voie lors du retrait des points de contrôle et des stations
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convertir/Améliorer le type de rail. Shift pour basculer entre construire et afficher le coût estimé

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientation du dépôt
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Choisir l'orientation du dépôt ferroviaire
@@ -2406,6 +2405,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Monter l
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Descendre
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Descendre le fichier NewGRF sélectionné dans la liste
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Liste des fichiers NewGRF installés. Cliquer sur un fichier pour modifier ses paramètres
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Changer les paramètres
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Basculer palette
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Basculer la palette du NewGRF sélectionné.{}Faites ceci quand les graphiques de ce NewGRF sont rose dans le jeu
@@ -2438,8 +2438,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paramètre {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}{NBSP}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Nombre de paramètres{NBSP}: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspection - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Parent
@@ -3277,8 +3275,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ne pas déchar
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ne pas décharger et attendre pleine charge par un seul type)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ne pas décharger et ne pas charger)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[queue]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[milieu]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[tête]
@@ -1885,7 +1885,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... Verb
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... kann Datei nicht schreiben
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kann heruntergeladene Datei nicht entpacken

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparenzeinstellungen
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Transparenz für Stationsschilder einstellen. Strg+Klick, um Umschalten zu verhindern
@@ -1932,7 +1931,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Eisenbah
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Umschalter für Bau/Abriss mit aktuellem Bauwerkzeug. Strg+Klick um die Gleise von Wegpunkten und Bahnhöfen ebenfalls zu entfernen
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Gleistyp in den ausgewählten umwandeln. Shift schaltet zwischen Bauen und Kostenvoranschlag um

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Ausrichtung Zugdepot
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Ausrichtung des Zugdepots auswählen
@@ -2408,8 +2406,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Nach unt
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Die ausgewählte NewGRF-Datei in der Liste nach unten verschieben
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Eine Liste der installierten NewGRF-Dateien. Zum Ändern der Parameter Datei auswählen

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parameter setzen
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Farbpalette ändern
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Farbpalette des ausgewählten NewGRF ändern.{}Nutze dieses, wenn die Grafiken des NewGRF im Spiel pink dargestellt werden
@@ -2432,6 +2428,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Deaktivier
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Nicht mit dieser Version von OpenTTD kompatibel

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF-Parameter eingeben
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF Parameter ändern
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Schließen
@@ -2441,8 +2438,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Anzahl Parameter: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspiziere - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}übergeordnetes Object
@@ -3280,8 +3275,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Nicht entladen
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Nicht entladen, aber voll beladen mit beliebiger Fracht)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Kein Entladen und kein Laden)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[am Anfang]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[in der Mitte]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[am Ende]
@@ -868,7 +868,7 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BIGFONT}{BLACK
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM                      :{BIGFONT}{BLACK}Egy rovaráradat {INDUSTRY} pusztulását okozta!{}A termelés a felére csökkent
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK}{STRING}termelés csökkent! {INDUSTRY} mostantól {COMMA}%-kal kevesebbet termel!

-STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} a fűtőházban vár
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} a járműtelepen vár
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} a garázsban vár
 STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} a dokkban vár
 STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} a hangárban vár
@@ -1351,11 +1351,11 @@ STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Amikor
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Automatikusan alakjelző épüljön {ORANGE}{STRING}-ig.
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Jelzőépítés-kezelő engedélyezése: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Alapértelmezett jelzőtípus: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Normál jelzők
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Normál
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Irányjelzők
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Csak egyirányú irányjelzők
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :{LTBLUE}Jelzők típusa átalakításkor: {ORANGE}{STRING}
-STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Csak normál jelzők
+STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Csak normál
 STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Csak irányjelzők
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :Mind

@@ -1948,7 +1948,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... a ka
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... a fájl nem írható
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nem sikerült kicsomagolni a letöltött fájlt

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Átlátszósági beállítások
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Keret nélküli állomásnevek bekapcsolása. Ctrl+Kattintással zárolható
@@ -1979,14 +1978,14 @@ STR_JOIN_WAYPOINT_CAPTION                                       :{WHITE}Ellenőr
 STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Különálló ellenőrző pont építése

 # Rail construction toolbar
-STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :Vasút építése
+STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :Normál vasút építése
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :Villamosított vasút építése
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :Egysínű vasút építése
 STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :MagLev vasút építése

 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Pályafektetés. A Ctrl billentyűvel válthatsz építés és rombolás között. Shift lenyomásával megmutatja a becsült költséget
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Vasúti pálya építése egyszerűsített módón. A Ctrl billentyű segítségével lehet váltani az építés/rombolás között. Shift lenyomásával megmutatja a becsült költséget
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Vasúti fűtőház építése (vonatok vételére és karbantartására). Shift lenyomásával megmutatja a becsült költséget
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Vasúti járműtelep építése (vonatok vételére és karbantartására). Shift lenyomásával megmutatja a becsült költséget
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Ellenőrző pont építése vágányra. A Ctrl lenyomásával az ellenőrző pontok egyesíthetőek. Shift lenyomásával megmutatja a becsült költséget
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Vasútállomás építése. A Ctrl lenyomásával egyesítheted más állomásokkal. Shift lenyomásával megmutatja a becsült költséget
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Vasúti jelzők építése. Ctrl gombbal váltás az alak- és fényjelzők között{}Húzással a sínek mentén végig jelzők épülnek. Húzva Ctrl gombbal a következő pályakiágazásig épít jelzőket{}Ctrl+Kattintással válthatod a megnyitandó jelzőépítés-kezelő ablakot. Shift lenyomásával megmutatja a becsült költséget
@@ -1995,10 +1994,9 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Vasúti
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Váltás építés/feleszedés között vasúti pályák, jelzők, ellenőrző pontok és vasútállomások esetében. Ctrl nyomvatartásával az ellenőrző pontokon és állomásokon a vasúti pályát is eltávolítja
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Sínek átalakítása a kiválasztott típusra. Shift lenyomásával megmutatja a becsült költséget

-
 # Rail depot construction window
-STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Fűtőház helyzete
-STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Válaszd ki a fűtőház helyzetét
+STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Járműtelep helyzete
+STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Válaszd ki a járműtelep helyzetét

 # Rail waypoint construction window
 STR_WAYPOINT_CAPTION                                            :{WHITE}Ellenőrző pont
@@ -2471,8 +2469,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Le
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}A kiválasztott NewGRF-et lefelé mozgatja a listán
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A feltelepített NewGRF-ek listája. Kattints a fileokra azok paraméterezéséhez

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Paraméterek beállítása
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palettaváltás
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}A kiválasztott NewGRF palettájának váltása.{}Akkor használd, ha a NewGRF-ból származó grafikai elemek rózsaszínként jelennek meg
@@ -2495,6 +2491,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Kikapcsolv
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Nem kompatibilis az OpenTTD ezen verziójával

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Adj meg NewGRF paramétereket
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF paraméterek megváltoztatása
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Bezárás
@@ -2504,8 +2501,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paraméter {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Paraméterek száma: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Megtekintés - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Szülő
@@ -2579,8 +2574,8 @@ STR_NEWGRF_LIST_MISSING                                         :{RED}Hiányzó

 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}A '{0:STRING}' viselkedése valószínűleg ütközést vagy összeomlást okoz
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Megváltoztatta '{1:ENGINE}' meghajtott vagon-állapotát mikor nem volt bent a fűtőházban
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Megváltoztatta '{1:ENGINE}' jármű hosszát mikor nem volt bent a fűtőházban
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Megváltoztatta '{1:ENGINE}' meghajtott vagon-állapotát mikor nem volt bent a járműtelepen
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Megváltoztatta '{1:ENGINE}' jármű hosszát mikor nem volt bent a járműtelepen
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}A '{1:COMPANY}' vállalat '{0:VEHICLE}' jelű vonatának érvénytelen a hossza. Ezt a NewGRF-ek okozhatják. A játék elszállhat vagy lefagyhat

 STR_NEWGRF_BUGGY                                                :{WHITE}A(z) '{0:STRING}' NewGRF helytelen információt tartalmaz
@@ -2857,7 +2852,7 @@ STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}A listá
 STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Járművek lecserélése
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Javításra küld

-STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Elküldi fűtőházba
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Elküldi járműtelepre
 STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Elküldi garázsba
 STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Elküldi dokkba
 STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Elküldi hangárba
@@ -2971,12 +2966,12 @@ STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Dobj ide

 STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Húzd ide a mozdonyt a teljes vonat eladásához

-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Összes fűtőházban tartózkodó vonat eladása
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Összes járműtelepen tartózkodó vonat eladása
 STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Összes garázsban tartózkodó jármű eladása
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Összes dokkban tartózkodó hajó eladása
 STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Összes hangárban tartózkodó repülő eladása

-STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}A fűtőházban tartózkodó összes vonat automatikus cseréje
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}A járműtelepen tartózkodó összes vonat automatikus cseréje
 STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}A garázsban tartózkodó összes jármű automatikus cseréje
 STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}A dokkban tartózkodó összes hajó automatikus cseréje
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}A hangárban tartózkodó összes repülő automatikus cseréje
@@ -3001,17 +2996,17 @@ STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ide katt
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ide kattintva elkészítheted egy hajó másolatát. Kattints ide, majd a másolandó hajóra. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ide kattintva elkészítheted egy repülőgép másolatát. Kattints ide, majd a másolandó repülőgépre. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül

-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}A fő nézetet a fűtőházra állítja. Ctrl+Kattintás esetén új nézetet nyit a fűtőház pozíciójára
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}A fő nézetet a járműtelepre állítja. Ctrl+Kattintás esetén új nézetet nyit a járműtelep pozíciójára
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}A fő nézetet a garázsra állítja. Ctrl+Kattintás esetén új nézetet nyit a garázs pozíciójára
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}A fő nézetet a dokkra állítja. Ctrl+Kattintás esetén új nézetet nyit a dokk pozíciójára
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}A fő nézetet a hangárra állítja. Ctrl+Kattintás esetén új nézetet nyit a hangár pozíciójára

-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Az összes, a fűtőházat menetrendszerüen látogató vonat listájának összeállítása
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Az összes, a járműtelepet menetrendszerüen látogató vonat listájának összeállítása
 STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Az összes, a hangárt menetrendszerüen látogató jármű listájának összeállítása
 STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Az összes, a dokkot menetrendszerüen látogató hajó listájának összeállítása
 STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Az összes, a hangárt menetrendszerüen látogató repülőgép listájának összeállítása

-STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Kattints ide az összes vonat megállításához a fűtőházban
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Kattints ide az összes vonat megállításához a járműtelepen
 STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Kattints ide az összes közúti jármű megállításához a garázsban
 STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Kattints ide az összes hajó leállításához a dokkban
 STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Kattints ide az összes repülőgép leállításához a hangárban
@@ -3078,7 +3073,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Közelí
 STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Közelítés a hajó jelenlegi helyzetére. Ctrl+Kattintással a hajó követése a fő nézetben
 STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Közelítés a repülőgép jelenlegi helyzetére. Ctrl+Kattintással a repülőgép követése a fő nézetben

-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}A fűtőházba küldi a vonatot. Ctrl+Kattintással csak javításra
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}A járműtelepre küldi a vonatot. Ctrl+Kattintással csak javításra
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Garázsba küldi a járművet. Ctrl+Kattintással csak javításra
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Dokkba küldi a hajót. Ctrl+Kattintással csak javításra
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Hangárba küldi a repülőgépet. Ctrl+Kattintással csak javításra
@@ -3313,7 +3308,7 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Javításra meg

 STR_ORDER_NEAREST_DEPOT                                         :a legközelebbi
 STR_ORDER_NEAREST_HANGAR                                        :a legközelebbi hangárba
-STR_ORDER_TRAIN_DEPOT                                           :fűtőházba
+STR_ORDER_TRAIN_DEPOT                                           :járműtelepre
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :garázsba
 STR_ORDER_SHIP_DEPOT                                            :dokkba
 STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
@@ -3343,8 +3338,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ki nem rakodá
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ki nem rakodás és bármiből teljes berakodás)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Nincs ki- és berakodás)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[közeli vég]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[közép]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[távoli vég]
@@ -3672,19 +3665,19 @@ STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... bój
 STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... a bóját más cég használja!

 # Depot related errors
-STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Nem építhetsz ide fűtőházat...
+STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Nem építhetsz ide járműtelepet...
 STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Nem építhetsz ide garázst...
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Ide nem lehet remízt építeni...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nem építhetsz ide dokkot...

 STR_ERROR_CAN_T_RENAME_DEPOT                                    :{WHITE}Nem nevezheted át a járműtelepet...

-STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... fűtőhűzban kellene állnia ehhez
+STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... járműtelepen kellene állnia ehhez
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... garázsban kellene állnia ehhez
 STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT                     :{WHITE}... dokkban kellene állnia ehhez
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... hangárban kellene állnia ehhez

-STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Csak a fűtőházban álló vonatokat lehet megváltoztatni
+STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Csak a járműtelepen álló vonatokat lehet megváltoztatni
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Túl hosszú a vonat
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}A járművet nem lehet megfordítani...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}... több részből álló járművet tartalmaz
@@ -3800,7 +3793,7 @@ STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nem ind
 STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nem indíthatod el vagy állíthatod meg a hajót...
 STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nem indíthatod el vagy állíthatod meg a repülőgépet...

-STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nem küldheted a vonatot a fűtőházba...
+STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Nem küldheted a vonatot a járműtelepre...
 STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nem küldheted a járművet a garázsba...
 STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nem küldheted a hajót a dokkba...
 STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nem küldheted a repülőgépet a hangárba...
@@ -4302,8 +4295,8 @@ STR_FORMAT_WAYPOINT_NAME.ba                                     :{TOWN} Ellenőr
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} {COMMA}. sz. Ellenőrző pont
 STR_FORMAT_WAYPOINT_NAME_SERIAL.ba                              :{TOWN} {COMMA}. sz. Ellenőrző ponton

-STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Fűtőház
-STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. Fűtőház
+STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Vasúti járműtelep
+STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. Vasúti Járműtelep
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} Garázs
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{TOWN} {COMMA}. sz. Garázs
 STR_FORMAT_DEPOT_NAME_SHIP                                      :{TOWN} Dokk
@@ -166,7 +166,7 @@ STR_ABBREV_NONE                                                 :{TINYFONT}EKKER
 STR_ABBREV_ALL                                                  :{TINYFONT}ALLT

 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} farþeg{P i ar}
+STR_PASSENGERS                                                  :{COMMA} farþegar
 STR_BAGS                                                        :{COMMA} pokar
 STR_TONS                                                        :{COMMA} tonn
 STR_LITERS                                                      :{COMMA} lítrar
@@ -1045,7 +1045,6 @@ STR_SEA_LEVEL_LOW                                               :Lítið
 STR_SEA_LEVEL_MEDIUM                                            :Miðlungs
 STR_SEA_LEVEL_HIGH                                              :Mikið

-
 STR_DISASTER_NONE                                               :Ekkert
 STR_DISASTER_REDUCED                                            :Minnkað
 STR_DISASTER_NORMAL                                             :Venjulegt
@@ -1099,7 +1098,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Raunhæf
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Hröðun bifreiða: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Upphafleg
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Raunveruleg
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Halli brekku fyrir lestar {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Brattleiki brekkna fyrir lestar {ORANGE}{STRING}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Halli brekku fyrir bifreiðar {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Banna lestum og skipum að taka 90° beygjur: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Leyfa sameiningu stöðva sem ekki tengjast á korti: {ORANGE}{STRING}
@@ -1208,7 +1207,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :löngu (31. Des
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :stuttu (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Setja leik á bið þegar nýr leikur er hafinn: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Ítarlegur listi yfir farartæki: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF                   :Af
@@ -1380,7 +1378,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skoða v
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Sýna stillingar gervigreindar
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Hætta í OpenTTD

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Hætta
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ertu viss um að þú viljir hætta í OpenTTD og fara aftur í {STRING}?
@@ -2486,8 +2483,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} af <inv
 STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<invalid industry>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Merkjalisti - {COMMA} Merki{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Stemma há-/lágstafi
@@ -3151,12 +3146,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stoppa
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Gögn farartækis sem skilyrði byggja á
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Hleðsluhlutfall
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Áreiðanleiki
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Hámarkshraði
-STR_ORDER_CONDITIONAL_AGE                                       :Aldur (ár)
+STR_ORDER_CONDITIONAL_AGE                                       :Aldur farartækis (í árum)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Þarfnast þjónustu
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Alltaf

@@ -3397,7 +3390,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... eitt
 STR_ERROR_BMPMAP                                                :{WHITE}Get ekki hlaðið landslagi úr BMP skrá...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... gat ekki breytt myndsniði.

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Stærð hæðarlínukorts
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ekki er mælt með því að breyta stærð grunnkorts of mikið. Viltu halda áfram?

@@ -798,9 +798,9 @@ STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Recessione finita!{}{}La ripresa del commercio da fiducia alle industrie e rafforza l'economia!

 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL                   :{BIGFONT}{BLACK}{INDUSTRY} incrementa la produzione!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL                      :{BIGFONT}{BLACK}Trovato nuovo giacimento di carbone alla {INDUSTRY}!{}Atteso un raddoppio della produzione!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL                       :{BIGFONT}{BLACK}Trovato nuovo giacimento di petrolio al {INDUSTRY}!{}Atteso un raddoppio della produzione!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIGFONT}{BLACK}Migliori tecniche di coltivazione alla {INDUSTRY} raddoppieranno la produzione!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL                      :{BIGFONT}{BLACK}Trovato nuovo giacimento di carbone alla {INDUSTRY}!{}Atteso un raddoppiamento della produzione!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL                       :{BIGFONT}{BLACK}Trovato nuovo giacimento di petrolio al {INDUSTRY}!{}Atteso un raddoppiamento della produzione!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIGFONT}{BLACK}Grazie a metodi di coltivazione migliorati alla {INDUSTRY} è atteso un raddoppiamento della produzione!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH                    :{BIGFONT}{BLACK}La produzione di {STRING} a {INDUSTRY} è aumentata del {COMMA}%!
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BIGFONT}{BLACK}La produzione a {INDUSTRY} scende del 50%
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM                      :{BIGFONT}{BLACK}Infestazione di insetti devasta la {INDUSTRY}!{}Produzione scesa del 50%
@@ -1944,7 +1944,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Costruis
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Alterna costruzione/rimozione di binari, segnali, waypoint e stazioni. Tenere premuto CTRL per rimuovere anche i binari.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converte/aggiorna il tipo di rotaie. MAIUSC alterna fra costruzione e stima dei costi

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientamento deposito
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Seleziona l'orientamento del deposito ferroviario
@@ -2419,6 +2418,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Sposta i
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Sposta giù
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Sposta il file NewGRF selezionato più in basso nell'elenco
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Elenco dei file NewGRF installati. Fare clic su un file per cambiarne i parametri
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Imposta parametri
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna tavolozze
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna la tavolozza colori utilizzata dal NewGRF selezionato.{}Utilizzare questa impostazione se la grafica di questo NewGRF durante il gioco appare rosa.
@@ -2451,8 +2451,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametro {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Numero di parametri: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Ispeziona - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Padre
@@ -3277,7 +3275,7 @@ STR_ORDER_IMPLICIT                                              :(Implicito)
 STR_ORDER_FULL_LOAD                                             :(Attendi pieno carico)
 STR_ORDER_FULL_LOAD_ANY                                         :(Attendi carico)
 STR_ORDER_NO_LOAD                                               :(Non caricare)
-STR_ORDER_UNLOAD                                                :(Scarica e carica)
+STR_ORDER_UNLOAD                                                :(Scarica)
 STR_ORDER_UNLOAD_FULL_LOAD                                      :(Scarica e attendi pieno carico)
 STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Scarica e attendi carico)
 STR_ORDER_UNLOAD_NO_LOAD                                        :(Scarica e parti vuoto)
@@ -3290,8 +3288,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Non scaricare
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Non scaricare e attendi carico)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Non scaricare e non caricare)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :(inizio)
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :(centro)
 STR_ORDER_STOP_LOCATION_FAR_END                                 :(fine)
@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED                                           :最大速度
 STR_SORT_BY_MODEL                                               :モデル
 STR_SORT_BY_VALUE                                               :価値
 STR_SORT_BY_LENGTH                                              :長さ
-STR_SORT_BY_LIFE_TIME                                           :寿命までの残期間
+STR_SORT_BY_LIFE_TIME                                           :寿命までの期間
 STR_SORT_BY_TIMETABLE_DELAY                                     :到着時刻の遅れ
 STR_SORT_BY_FACILITY                                            :駅の種類
 STR_SORT_BY_WAITING                                             :積載待ち貨物の価値
@@ -837,11 +837,11 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION

 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}助成金提案の有効期限満了：{}{1:STRING}から{2:STRING}に{0:STRING}を運ぶ便の{}助成金支給案は期限切れになりました。
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}助成金の終止{}{1:STRING}から{2:STRING}に{0:STRING}を運ぶ便の{}助成金は終了しました
-STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}助成金提案の報告{}{1:STRING}から{2:STRING}へ{0:STRING}を運ぶ便の{}先駆一社に一年間助成金を与えます！
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}{0:STRING}が助成金を獲得！{}今後一年間{2:STRING}から{3:STRING}へ{1:STRING}を運ぶ便に{}50％の助成金が支給されます！
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}{0:STRING}が助成金を獲得！{}今後一年間{2:STRING}から{3:STRING}へ{1:STRING}を運ぶ便に{}100％の助成金が支給されます！
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{0:STRING}が助成金を獲得！{}今後一年間{2:STRING}から{3:STRING}へ{1:STRING}を運ぶ便に{}200％の助成金が支給されます！
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{0:STRING}が助成金を獲得！{}今後一年間{2:STRING}から{3:STRING}へ{1:STRING}を運ぶ便に{}300％の助成金が支給されます！
+STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}助成金提案の報告{}{STRING}を運ぶ{STRING}から{STRING}行き{}先駆の一便は一年間助成金を受ける！
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}{STRING}が助成金を受けた！{}今後一年間{STRING}を運ぶ{STRING}から{STRING}行き一便は{}５０％の助成金を受ける！
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}{STRING}が助成金を受けた！{}今後一年間{STRING}を運ぶ{STRING}から{STRING}行き一便は{}１００％の助成金を受ける！
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING}が助成金を受けた！{}今後一年間{STRING}を運ぶ{STRING}から{STRING}行き一便は{}２００％の助成金を受ける！
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING}が助成金を受けた！{}今後一年間{STRING}を運ぶ{STRING}から{STRING}行き一便は{}３００％の助成金を受ける！

 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}{TOWN}で渋滞！{}{}{STRING}が出資した道路工事は６ヶ月間続く！

@@ -868,9 +868,9 @@ STR_GAME_OPTIONS_CURRENCY_CHF                                   :スイスフラ
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :チェココルナ（CZK）
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :ドイツマルク（DEM）
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :デンマーククローネ（DKK）
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :スペインペセタ（₧）
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :スペインペセタ（ESP）
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :フィンランドマーカ（FIM）
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :フランスフラン（₣）
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :フランスフランク（FRF）
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :ギリシアドラクマ（GRD）
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :ハンガリーフォリント（HUF）
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :アイスランドクローナ（ISK）
@@ -1056,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :高い
 STR_SEA_LEVEL_CUSTOM                                            :カスタム
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :カスタム ({NUM}%)

-
 STR_DISASTER_NONE                                               :なし
 STR_DISASTER_REDUCED                                            :軽減
 STR_DISASTER_NORMAL                                             :通常
@@ -1224,7 +1223,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :長
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :短
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO 標準

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}新規ゲームを開始したときに自動的にポーズ：{ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}一時停止（ポース）の時この行動を許可 {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :行動が無い
@@ -1331,10 +1329,10 @@ STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :遅い
 STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :普通
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :早い
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :特に早い
-STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}市に成長する町の割合：{ORANGE}1/{STRING}
+STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}市に展開する町の割合：{ORANGE}{STRING}の１
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :{LTBLUE}市に展開する町の割合：{ORANGE}なし
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :{LTBLUE}初期の市町村のサイズの乗数：{ORANGE}{STRING}
-STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}道路建設時に変な部分を削除：{ORANGE}{STRING}
+STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}道路建設時に変な部分を破壊：{ORANGE}{STRING}

 STR_CONFIG_SETTING_GUI                                          :{ORANGE}インターフェース
 STR_CONFIG_SETTING_CONSTRUCTION                                 :{ORANGE}建設
@@ -1355,10 +1353,10 @@ STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}市町
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}産業


-STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}電車の経路探索アルゴリズム：{ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}電車の経路処理アルゴリズム：{ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF{BLUE}（おすすめ）
-STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}道路車両の経路探索アルゴリズム：{ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}道路車両の経路処理アルゴリズム：{ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF             :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_YAPF            :YAPF{BLUE}（おすすめ）
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}船舶の経路処理アルゴリズム：{ORANGE}{STRING}
@@ -1387,7 +1385,7 @@ STR_INTRO_ONLINE_CONTENT                                        :{BLACK}オン
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI の設定
 STR_INTRO_QUIT                                                  :{BLACK}終了

-STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}新規ゲームを開始します。Ctrl＋クリックで地形生成設定をスキップします
+STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}新規ゲームを開始します。コントロール＋クリックは地図設定をスキップします
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}ゲームを開きます
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}地形をハイトマップに基づいて新規ゲームを開始します
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}カスタムシナリオを使用して新規ゲームを開始します
@@ -1407,7 +1405,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}コン
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}AI の設定を表示します
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}OpenTTD を終了します

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}終了
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}このゲームを終了して、{}{STRING}に戻してもよろしいですか？
@@ -1434,7 +1431,7 @@ STR_ABANDON_SCENARIO_QUERY                                      :{YELLOW}この
 # Cheat window
 STR_CHEATS                                                      :{WHITE}チート
 STR_CHEATS_TOOLTIP                                              :{BLACK}以前にこのチートを使用したことがあることを示します
-STR_CHEATS_WARNING                                              :{BLACK}注意: チートをしたら、競争者に裏切りと見做され、永遠にのろわれる可能性があります。
+STR_CHEATS_WARNING                                              :{BLACK}注意: チートをしたら、競争者の裏切りとして見られていて、永遠にのろわれる可能性があります。
 STR_CHEAT_MONEY                                                 :{LTBLUE}残額に{CURRENCY}を追加
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}会社: {ORANGE}{COMMA}でプレイする
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}魔法のブルドーザー(産業など何でも破壊できる) : {ORANGE}{STRING}
@@ -1463,15 +1460,15 @@ STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}変更

 STR_LIVERY_DEFAULT                                              :通常のカラースキーム
 STR_LIVERY_STEAM                                                :蒸気機関車
-STR_LIVERY_DIESEL                                               :ディーゼル機関車
-STR_LIVERY_ELECTRIC                                             :電気機関車
+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                             :客車(電気)
+STR_LIVERY_EMU                                                  :電動車
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :客車（蒸気動）
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :客車（ディーゼル動）
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :客車（電動）
 STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :客車(モノレール)
 STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :客車(リニア-マグレブ)
 STR_LIVERY_FREIGHT_WAGON                                        :貨車
@@ -1482,7 +1479,7 @@ STR_LIVERY_FREIGHT_SHIP                                         :貨物船
 STR_LIVERY_HELICOPTER                                           :ヘリコプター
 STR_LIVERY_SMALL_PLANE                                          :小型飛行機
 STR_LIVERY_LARGE_PLANE                                          :大型飛行機
-STR_LIVERY_PASSENGER_TRAM                                       :旅客用路面電車
+STR_LIVERY_PASSENGER_TRAM                                       :乗客用路面電車
 STR_LIVERY_FREIGHT_TRAM                                         :貨物用路面電車

 # Face selection window
@@ -1496,7 +1493,7 @@ STR_FACE_FEMALE_BUTTON                                          :{BLACK}女性
 STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}女性顔を表示します
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}新規顔
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}ランダムな顔を作成します
-STR_FACE_ADVANCED                                               :{BLACK}詳細
+STR_FACE_ADVANCED                                               :{BLACK}詳しい
 STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}顔を詳しく選択します。
 STR_FACE_SIMPLE                                                 :{BLACK}簡単
 STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}顔を簡単に選択します。
@@ -1545,17 +1542,17 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}ネク
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}多人数ゲーム
 STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}接続：
-STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}LAN内、もしくはインターネット上のゲームを選択します
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}ローカルネットワークもしくはインターネット上のゲームを選択します
 STR_NETWORK_SERVER_LIST_LAN                                     :LAN
 STR_NETWORK_SERVER_LIST_INTERNET                                :インターネット
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}プレヤー名：
-STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}他のプレーヤーから見えるあなたの名前です
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}他人のプレヤーが見えるあなたの名前です

 STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}名前
 STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}ゲーム名
 STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}クライアント
-STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}オンラインのクライアント数／最高クライアント数{}オンラインの会社数／最高会社数
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}オンラインのクライアント人数／最高クライアント人数{}オンラインの会社数／最高会社数
 STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}地図のサイズ
 STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}ゲームの地図のサイズ{}クリックして地域によって並べ替えます
@@ -1571,16 +1568,16 @@ STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}クリ

 STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}ゲーム情報
 STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}クライアント：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}言語: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}国語：　 {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_LANDSCAPE                               :{SILVER}タイルセット：{WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}地図のサイズ：{WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}サーババージョン：{WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}サーバアドレス：{WHITE}{STRING}
-STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}開始日: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}開始の日付：{WHITE}{DATE_SHORT}
 STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}現在の日付：{WHITE}{DATE_SHORT}
 STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}パスワードが必要！
-STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}サーバはオフラインです
-STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}満員です
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}サーバがオフライン
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}サーバ満員
 STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}バージョン不一致
 STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF 不一致

@@ -1599,10 +1596,10 @@ STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}プレ
 STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}ホストアドレスを入力します

 # Start new multiplayer server
-STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}新規マルチプレイヤーゲームを開始
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}新規多人数ゲームを開始

 STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}ゲーム名：
-STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}マルチプレイゲームメニュー内で他のプレーヤに表示するゲーム名を指定します
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}他のプレヤーが見える多人数ゲームメニューに表示するゲーム名を指定します
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}パスワードを指定
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}ゲームをパスワードで保護することができます。正しいパスワードを入力しないと、接続できません。

@@ -1614,11 +1611,11 @@ STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}接続
 STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}会社{NUM}つ
 STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}最高交通会社数：
 STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}サーバ上の会社上限を指定します
-STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}傍観者{NUM}人
-STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}最高傍観者数:
-STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}サーバ上の傍観者数上限を指定します
-STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}言語:
-STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}サーバ上の主言語を表示します
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}観客者{NUM}人
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}最高傍観者人数：
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}サーバ上の傍観者上限を指定します
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}言語：
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}サーバ上の主の言語を表示します

 STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}ネットワークゲーム名を入力

@@ -1663,10 +1660,10 @@ STR_NETWORK_LANG_LATVIAN                                        :ラトビア語
 ############ End of leave-in-this-order

 # Network game lobby
-STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}マルチプレイヤーゲームロビー
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}多人数ゲームロビー

 STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}次のゲームを準備中：{ORANGE}{STRING}
-STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}このゲームに現在参加している交通会社のリストです。すでに経営している交通会社に参加するか、空き会社スロットがある場合は交通会社を新規開業することができます。
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}このゲームに現在参加している交通会社のリストです。空のスロットがあった場合は、交遊会社を開業できます。そうしないと、すでに経営している交通会社に参加できます。

 STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}交通会社情報
 STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}会社名：{WHITE}{STRING}
@@ -2486,8 +2483,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :複数の Action 8 エントリーを含んでいます。
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :擬似スプライト読込:既に終端に達しました
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}現在を使ってるグラフィックセットが複数のダータが無いです。.{}セットを更新して下さいますよう、お願いします。
-STR_NEWGRF_ERROR_GRM_FAILED                                     :要求されたGRFリソースは使用不能です。
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}は{4:STRING}により無効にされました。

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注意！
@@ -2524,8 +2519,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} は <
 STR_NEWGRF_INVALID_ENGINE                                       :<壊れそうな列車モデル>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<潰れそうな産業>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}標示のリスト - {COMMA}つの標示
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}一致
@@ -2538,12 +2531,12 @@ STR_EDIT_SIGN_CAPTION                                           :{WHITE}標示
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}次の標示へ移動
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}前の標示へ移動

-STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}看板のメッセージを入力
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}サイン名を入力

 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}市町村
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- なし-
-STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK}（{COMMA}）
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}町名 - メイン画面を町の場所に移動するには町名をクリックします。
 STR_TOWN_POPULATION                                             :{BLACK}世界人口：{COMMA}人

@@ -3193,8 +3186,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :停止
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}修理が必要でないとこの指令をスキップ

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}ベースに車両のデータをジャンプ
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :積載率
 STR_ORDER_CONDITIONAL_RELIABILITY                               :信頼度
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :最高速度
@@ -3446,8 +3437,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... 不
 STR_ERROR_BMPMAP                                                :{WHITE}BMP ファイルから地形が読み込めません...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... イメージのフォーマットが交換できませんでした。

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE} イメージが大きすぎます。
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}リサイズ警告
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}ソース地図をリサイズしすぎることはお勧めしません。地形作成を続けてもよろしいですか？

@@ -4253,7 +4242,6 @@ STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLAC
 STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
-STR_TINY_BLACK_DECIMAL                                          :{TINYFONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
@@ -860,19 +860,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}화폐
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}화폐 단위 선택

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :영국 파운드 (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :미국 달러 (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :유로 (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :일본 엔 (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :파운드 (￡)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :달러 ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :유로 (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :엔 (￥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :오스트리아 실링 (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :벨기에 프랑크 (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :스위스 프랑크 (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :체코 코루나 (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :독일 마르크 (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :덴마크 크로네 (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :스페인 페세타 (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :페세타 (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :핀란드 마르카 (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :프랑스 프랑크 (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :프랑크 (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :그리스 드라크마 (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :헝가리 프로인트 (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :아이슬란드 크로나 (ISK)
@@ -349,7 +349,7 @@ STR_SORT_BY_MAX_SPEED                                           :Maksimalų grei
 STR_SORT_BY_MODEL                                               :Modelį
 STR_SORT_BY_VALUE                                               :Vertę
 STR_SORT_BY_LENGTH                                              :Ilgį
-STR_SORT_BY_LIFE_TIME                                           :Likusį naudojimo laiką
+STR_SORT_BY_LIFE_TIME                                           :Likusį gyvavimo laiką
 STR_SORT_BY_TIMETABLE_DELAY                                     :Tvarkaraščio užtrukimą
 STR_SORT_BY_FACILITY                                            :Stoties tipą
 STR_SORT_BY_WAITING                                             :Laukiančio krovinio vertę
@@ -912,7 +912,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} jau priima {STRING} ir {STRING}

 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Subsidijų pasiūlymas baigėsi:{}{}{STRING.ko} pervežimas iš {STRING.ko} į {STRING.ka} daugiau nebesubsidijuojamas.
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Subsidijų laikas baigėsi:{}{}{STRING.ko} transportavimas iš {STRING} į {STRING} daugiau nebesubsidijuojamas.
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Subsidijų laikas baigėsi:{}{}{STRING.ko} transportavimas iš {STRING} į {STRING} daugiau nebesubsidijuojama.
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Subsidijų pasiūlymas:{}{}Pirmasis pervežęs {STRING.ka} iš {STRING} į {STRING} gaus metinę vietinės valdžios subsidiją!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Subsidijos suteiktos {STRING}!{}{}{STRING} pervežimas iš {STRING} į {STRING} visus metus bus apmokamas 50% daugiau!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Subsidijos suteiktos {STRING}!{}{}{STRING} pervežimas iš {STRING} į {STRING} visus metus bus apmokamas dvigubai!
@@ -934,10 +934,10 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valiuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valiutos pasirinkimas

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Svaras sterlingų (£)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikos Doleris ($)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Svarai sterlingai (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Doleriai ($)
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eurai (€)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japonijos jenos (¥)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Jenos (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austru silingai (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgijos frankai (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sveicarijos frankai (CHF)
@@ -946,7 +946,7 @@ STR_GAME_OPTIONS_CURRENCY_DEM                                   :Vokietijos mark
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danijos kronos (DKK)
 STR_GAME_OPTIONS_CURRENCY_ESP                                   :Ispanijos pesetos (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Suomijos markes (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Prancūzijos frankai (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Prancuzijos frankai (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Graikijos drachmos (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Vengrijos forintai (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandijos kronos (ISK)
@@ -1184,7 +1184,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistiškas
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Automobilių greitėjimo modelis: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL     :Originalus
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC    :Realistiškas
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Nuokalnės statumas traukiniams {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Atbrailų statumas traukiniams {ORANGE}{STRING}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Nuokalnių statumas automobiliams {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Drausti traukiniams/laivams pasisukti 90 laips.kampu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Leidžia sujungti stoteles, kurios nėra šalia: {ORANGE}{STRING}
@@ -1396,8 +1396,8 @@ STR_CONFIG_SETTING_STATUSBAR_POS_CENTER                         :Centre
 STR_CONFIG_SETTING_STATUSBAR_POS_RIGHT                          :Dešinėje
 STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Langų persidengimo atstumas: {ORANGE}{STRING} px
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}Langų kibumo atstumas: {ORANGE}disabled
-STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Didž. skaičius langų (nelipnių): {ORANGE}{STRING}
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Didž. skaičius langų (nelipnių): {ORANGE}išjungtas
+STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Langų negriežtas limitas (nelipnių): {ORANGE}{STRING}
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Langų negriežtas limitas (nelipnių): {ORANGE}išjungtas
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}Miestų augimo greitis: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :Joks
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :Lėtas
@@ -1480,7 +1480,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Patikrin
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Rodyti AI nustatymus
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Išeiti iš 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Baigti
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ar jūs tikrai norite sustabdyti žaidimą ir grįžti į {STRING}?
@@ -1570,17 +1569,17 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Pasirink
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Naujas veidas
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Parinka naują atsitiktinį veidą
 STR_FACE_ADVANCED                                               :{BLACK}Plačiau
-STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Išplėstinis veido parinkimas
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Platesnis veido pasirinkimas.
 STR_FACE_SIMPLE                                                 :{BLACK}Paprastas
-STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Paprastas veido parinkimas
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Paprastas veido pasirinkimas.
 STR_FACE_LOAD                                                   :{BLACK}Atverti
 STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Atverti mėgstamą veidą
 STR_FACE_LOAD_DONE                                              :{WHITE}Tavo mėgstamas veidas sėkmingai įkeltas iš OpenTTD nustatymų failo.
 STR_FACE_FACECODE                                               :{BLACK}Žaidėjo veido nr.
 STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Tikrinti ir/arba nustatyti žaidėjo veido numerį
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Tikrinti ir/arba nustatyti žaidėjo veido numerį
-STR_FACE_FACECODE_SET                                           :{WHITE}Nustatytas naujas veido numeris
-STR_FACE_FACECODE_ERR                                           :{WHITE}Prezidento veido numeris nepriskirtas - turi būti skaičius tarp 0 ir 4,294,967,295!
+STR_FACE_FACECODE_SET                                           :{WHITE}Naujas veido numeris sėkmingai nustatytas.
+STR_FACE_FACECODE_ERR                                           :{WHITE}Negalėjau nustatyti veido numerio - turi būti skaičius tarp 0 ir 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Išsaugoti
 STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Išsaugoti mėgstamą veidą
 STR_FACE_SAVE_DONE                                              :{WHITE}Šis veidas bus išsaugotas kaip tavo mėgstamas OpenTTD nustatymų faile.
@@ -1765,8 +1764,8 @@ STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Jungiama

 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Jungiamasi..
-STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Autorizuoja..
-STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Laukia..
+STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Autorizuojamasi..
+STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Laukiama..
 STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Siunčiamas žemėlapis..
 STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Duomenų apdorojimas...
 STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Registruojamasi..
@@ -1813,7 +1812,7 @@ STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Naudoti
 STR_COMPANY_VIEW_JOIN                                           :{BLACK}Prisijungti
 STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Prisijunkite ir žaiskite kaip šios kompanijos
 STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Slaptažodis
-STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Apsaugok savo kompaniją slaptažodžiu nuo neleistinų vartotojų prisijungimo
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Slaptažodis apsaugo tavo kompanija nuo neleistinų vartotojų prisijungimo.
 STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Įvesti slaptažodį

 # Network chat
@@ -1958,15 +1957,15 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nepavyko

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Permatomumo nustatymai
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Nustatyti stočių ženklų permatomumą. Ctrl+Click to užrakinti.
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Nustatyti medžių permatomumą . Ctrl+Click to užrakinti.
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Nustatyti namų permatomumą . Ctrl+Click užrakinti.
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Nustatyti pramoninių pastatų permatomumą . Ctrl+Click užrakinti
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Perjungti statomų pastatų, tokių kaip stotys, garažai ir kontrolės punktai, permatomumą. Ctrl+Click užrakinti.
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Nustatyti tiltų permatomumą. Ctrl+Click užrakinti
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Perjungti pastatų, tokių kaip švyturiai ir antenos, permatomumą.Ctrl+Click užrakinti
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Perjungti laidų permatomumą . Ctrl+Click užrakinti.
-STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Perjungti krovimo indikatorių permatomumą. Ctrl+Click užrakinti
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Nustatyti permatomumą stočių ženklams. Ctrl+Click to lock.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Nustatyti permatomumą medžiams. Ctrl+Click to lock.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Nustatyti permatomumą namams. Ctrl+Click to lock.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Nustatyti permatomumą pramoniniams pastatams. Ctrl+Click to lock.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Perjungti permatomumą pastatams, tokiems kaip stotys, garažai ir kontrolės punktai. Ctrl+Paspaudimas užrakina.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Nustatyti permatomumą tiltams. Ctrl+Click to lock.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Perjungti permatomumą pastatams, tokiems kaip švyturiai ir antenos.Ctrl+Paspaudimas užrakina
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Perjungti permatomumą laidams. Ctrl+Paspaudimas užrakina.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Perjungti permatomumą krovimo indikatoriams. Ctrl+Paspaudimas užrakina.
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Nustatyti objektus nematomais vietoje permatomų

 # Base for station construction window(s)
@@ -2102,7 +2101,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Pasirink
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Kanalų kasimas
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Kanalai
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Statyti kanalus. Nuspaudus klavišą 'Shift' bus rodoma statybų kaina
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Statyk kanalus.
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Įrengti šliuzus. Shift perjungia tarp statymo/kainos parodymo
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Statyti laivų depą (naujų laivų įsigijimui ir remontui). Shift perjungia tarp statymo/kainos parodymo
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Statyti laivų doką. Ctrl leidžia prijungti stoteles. Shift perjungia tarp statymo/kainos parodymo
@@ -2147,7 +2146,7 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Sukeltas

 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Žemės tvarkymas
-STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Pažeminti žemės lygį. Tempiant pirmas segmentas bus pažemintas, kiti pažymėti segmentai išlyginti pagal pirmąjį. Nuspaudus 'Ctrl', plotas bus žymimas įstrižai. 'Shift' parodys statybos kainą
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Pažeminti žemės lygį
 STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Paaukštinti žemės lygį
 STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Žemės lygis
 STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Nusipirkti žemę vėlesniam naudojimui. Shift perjungia tarp statymo/kainos parodymo
@@ -2271,6 +2270,7 @@ STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Žolė
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Laukai
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Užpustyta žemė
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Dykuma
+
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Geležinkelio bėgiai
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Gelezinkelio bėgiai su paprastais šviesoforais
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Geležinkelio bėgiai su pre-šviesoforais
@@ -3269,12 +3269,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Sustoti
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Automobilio duomenys bazei šokant ant
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Krovimosi kiekis (proc)
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Patikimumas
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Max. greitis
-STR_ORDER_CONDITIONAL_AGE                                       :Amžius (metais)
+STR_ORDER_CONDITIONAL_AGE                                       :Automobilio amžius
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Reikia taisymo
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Visada

@@ -3349,8 +3347,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Neiškrauti ir
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Neiškrauti ir laukti bet kokio pilno pakrovimo)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Jokio iškrovimo ar pakrovimo)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[netoli pabaigos]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[viduryje]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[toli nuo pabaigos]
@@ -3439,7 +3435,7 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Rodyti D
 STR_ERROR_NO_AI                                                 :{WHITE}OpenTTD yra paruoštas be DI palaikymo...
 STR_ERROR_NO_AI_SUB                                             :{WHITE}... nerasta jokių prieinamų DI!

-STR_ERROR_AI_NO_AI_FOUND                                        :Nerasta jokio tinkamo DI.{}Šis DI yra netikras ir nieko nedarys.{}Galite parsisiųsti keletą DI per 'Turinio internete' sistemą.
+STR_ERROR_AI_NO_AI_FOUND                                        :Nerasta jokio tinkamo DI..{}Šis DI yra netikras ir nieko nedarys.{}Gali parsisiųsti keletą DI naudojant 'Turinio internete' sistemą.
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Vienas iš paleistų DI išsijungė. Praneškite apie tai šio DI autoriui su DI Debug lango vaizdu.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}DI derinimo langas yra pasiekiamas tik iš serverio

@@ -3518,19 +3514,17 @@ STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... šia

 STR_ERROR_PNGMAP                                                :{WHITE}Negalima užkrauti žemėlapio iš PNG...
 STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... failas nerastas.
-STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... kovertuoti paveikslėlio nepavyko. Reikalingas 8-ių arba 24-ių bitų PNG paveikslėlis.
-STR_ERROR_PNGMAP_MISC                                           :{WHITE}... nutiko kažkas netikėto (greičiausiai pažeistas failas). Atsiprašome.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... Negali perversti paveiklsėlio. 8 arba 24-bit PNG paveikslėlis reikalingas.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... kažkas buvo ne taip. Atsiprašome. (greičiausiai pažeistas failas)

 STR_ERROR_BMPMAP                                                :{WHITE}Negalima nuskaityti kraštovaizdžio iš BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... nepavyko pakeisti vaizdo failo formato.

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... paveikslėlis yra per didelis
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skales ispejimas
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Perdaryti pagrindini zemelapi per daug nerekomenduojama. Testi generavima?

 # Soundset messages
-STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Rasta tik fiktyvi garsų biblioteka. Jeigu norite garsų žaidime, įdiekite garsų rinkinį naudojant parsisiuntimų sistemą.
+STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Rasta tik fiktyvi garsų biblioteka. Jeigu nori garsų žaidime, gauk garsų rinkinį naudojant parsisiuntimų sistemą.

 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekrano vaizdas išsaugotas kaip „{STRING}“
@@ -3600,7 +3594,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... per
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... per arti kito miesto
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... per daug miestų
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... daugiau nera vietos zemelapyje
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Miestas nestatys kelių. Jūs galite įjungti kelių statybą per Sudėtingesni nustatymai>Ekonomika>Miestai.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Miestas nestatys kelių. Jūs galite įjungti kelių statyba per Sudėtingesni nustatymai>Ekonomika>Miestai.
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vyksta kelio darbai
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Negalima panaikinti šio miesto...{}Mieste yra stotis arba depas, arba miestui priklausantis vienas iš laukelių negali būti ištrintas.
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... nėra tinkamos vietos statulai šio miesto centre
@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED                                           :Kelajuan maksim
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Nilai
 STR_SORT_BY_LENGTH                                              :Panjang
-STR_SORT_BY_LIFE_TIME                                           :Baki jangka hayat
+STR_SORT_BY_LIFE_TIME                                           :Baki masa hayat
 STR_SORT_BY_TIMETABLE_DELAY                                     :Penangguhan dalam jadual
 STR_SORT_BY_FACILITY                                            :Jenis stesen
 STR_SORT_BY_WAITING                                             :Nilai kargo yang sedang menunggu
@@ -448,25 +448,25 @@ STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Penjajar peperi
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
-STR_ORDINAL_NUMBER_1ST                                          :1
-STR_ORDINAL_NUMBER_2ND                                          :2
-STR_ORDINAL_NUMBER_3RD                                          :3
-STR_ORDINAL_NUMBER_4TH                                          :4
-STR_ORDINAL_NUMBER_5TH                                          :5
-STR_ORDINAL_NUMBER_6TH                                          :6
-STR_ORDINAL_NUMBER_7TH                                          :7
-STR_ORDINAL_NUMBER_8TH                                          :8
-STR_ORDINAL_NUMBER_9TH                                          :9
-STR_ORDINAL_NUMBER_10TH                                         :10
-STR_ORDINAL_NUMBER_11TH                                         :11
-STR_ORDINAL_NUMBER_12TH                                         :12
-STR_ORDINAL_NUMBER_13TH                                         :13
-STR_ORDINAL_NUMBER_14TH                                         :14
-STR_ORDINAL_NUMBER_15TH                                         :15
-STR_ORDINAL_NUMBER_16TH                                         :16
-STR_ORDINAL_NUMBER_17TH                                         :17
-STR_ORDINAL_NUMBER_18TH                                         :18
-STR_ORDINAL_NUMBER_19TH                                         :19
+STR_ORDINAL_NUMBER_1ST                                          :Pertama
+STR_ORDINAL_NUMBER_2ND                                          :Kedua
+STR_ORDINAL_NUMBER_3RD                                          :Ketiga
+STR_ORDINAL_NUMBER_4TH                                          :Keempat
+STR_ORDINAL_NUMBER_5TH                                          :Kelima
+STR_ORDINAL_NUMBER_6TH                                          :Keenam
+STR_ORDINAL_NUMBER_7TH                                          :ketujuh
+STR_ORDINAL_NUMBER_8TH                                          :Kelapan
+STR_ORDINAL_NUMBER_9TH                                          :Kesembilan
+STR_ORDINAL_NUMBER_10TH                                         :Kesepuluh
+STR_ORDINAL_NUMBER_11TH                                         :Kesebelas
+STR_ORDINAL_NUMBER_12TH                                         :Kedua belas
+STR_ORDINAL_NUMBER_13TH                                         :Ketiga belas
+STR_ORDINAL_NUMBER_14TH                                         :Keempat Belas
+STR_ORDINAL_NUMBER_15TH                                         :Kelima belas
+STR_ORDINAL_NUMBER_16TH                                         :Keenam belas
+STR_ORDINAL_NUMBER_17TH                                         :Ketujuh belas
+STR_ORDINAL_NUMBER_18TH                                         :Kelapan belas
+STR_ORDINAL_NUMBER_19TH                                         :Kesembilan belas
 STR_ORDINAL_NUMBER_20TH                                         :20
 STR_ORDINAL_NUMBER_21ST                                         :21
 STR_ORDINAL_NUMBER_22ND                                         :22
@@ -538,7 +538,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik unt
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Jadual Liga Syarikat
 STR_COMPANY_LEAGUE_COMPANY_NAME                                 :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
-STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER                   :Jurutera
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER                   :Drebar
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER            :Pengurus Lalulintas
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR      :Penyelaras Pengangkutan
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ROUTE_SUPERVISOR           :Penyelia Jalanraya
@@ -812,7 +812,7 @@ STR_NEWS_VEHICLE_HAS_INVALID_ENTRY                              :{WHITE}{VEHICLE
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} semakin usang
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} terlalu usang
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} terlalu usang dan memerlukan penggantian segera
-STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} tidak dapat mencari laluan untuk meneruskan perjalanan.
+STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} tidak dapat mencari jalan untuk meneruskan perjalanan.
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} telah sesat.
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :Keuntungan {WHITE}{VEHICLE} pada tahun lepas ialah {CURRENCY}

@@ -1048,7 +1048,6 @@ STR_SEA_LEVEL_HIGH                                              :Tinggi
 STR_SEA_LEVEL_CUSTOM                                            :Pilihan Diri
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Pilihan ({NUM}%)

-
 STR_DISASTER_NONE                                               :Tiada
 STR_DISASTER_REDUCED                                            :Dikurangkan
 STR_DISASTER_NORMAL                                             :Biasa
@@ -1099,7 +1098,7 @@ STR_CONFIG_SETTING_SMOKE_AMOUNT_REALISTIC                       :Realistik
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Model pecutan keretapi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Asal
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistik
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Kecerunan bukit untuk keretapi: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Kecerunan bukit untuk keretapi {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Halangkan keretapi dan kapal daripada membuat pusingan 90 darjah: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Benarkan penyambungan stesen yang tidak bersebelahan: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Gunakan algoritma muatan yang diperbaiki: {ORANGE}{STRING}
@@ -1386,7 +1385,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Periksa
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Papar tetapan AI
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Keluar 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Keluar
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Pastikah anda untuk keluar dari OpenTTD dan kembali ke {STRING}?
@@ -2484,8 +2482,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} dari <k
 STR_NEWGRF_INVALID_ENGINE                                       :<model kenderaan tidak sah>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industry tidak sah>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Senarai Papan Tanda - {COMMA} Papan Tanda
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Padankan kes
@@ -2591,7 +2587,7 @@ STR_STATION_VIEW_CARGO_RATINGS_TITLE                            :{BLACK}Penarafa
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)

 ############ range for rating starts
-STR_CARGO_RATING_APPALLING                                      :Sangat teruk
+STR_CARGO_RATING_APPALLING                                      :Dahsyat
 STR_CARGO_RATING_VERY_POOR                                      :Sangat Teruk
 STR_CARGO_RATING_POOR                                           :Teruk
 STR_CARGO_RATING_MEDIOCRE                                       :Sederhana
@@ -3027,8 +3023,6 @@ STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Tukar ca



-# Conditional order variables, must follow order of OrderConditionVariable enum
-



@@ -3074,8 +3068,6 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Kenderaa


 # Date window (for timetable)
-STR_DATE_CAPTION                                                :{WHITE}Tetapkan tarikh
-STR_DATE_DAY_TOOLTIP                                            :{BLACK}Pilih hari


 # AI debug window
@@ -3168,8 +3160,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... ada
 STR_ERROR_BMPMAP                                                :{WHITE}Tidak boleh membuka lanskap daripada BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... tidak dapat menukar jenis imej.

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... imej terlalu besar
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Amaran skala
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Menukar saiz source map dengan terlalu banyak tidak disyorkan. Teruskan janaan?

@@ -238,7 +238,7 @@ STR_TOOLTIP_RESIZE                                              :{BLACK}Klikk og
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Veksle mellom stor/liten vindustørrelse
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullefelt - ruller listen opp/ned
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullefelt - ruller listen til venstre/høyre
-STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Riv bygninger o.l. på et landområde. Ctrl velger område diagonalt. Shift slår av og på kostnadsestimat.
+STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Riv bygninger o.l.

 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Standard
@@ -333,9 +333,9 @@ STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landskap
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Bygenerering
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Industrigenerering
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Veibygging
-STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Plant trær. Shift slår av og på kostnadsestimat.
+STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Plant trær
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Plasser skilt
-STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Plasser objekt. Shift slår av og på kostnadsestimat.
+STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Plasser objekt

 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Lagre scenario
@@ -821,7 +821,7 @@ STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} er veldig gammel
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} er veldig gammel, og bør byttes ut snarest
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} kan ikke finne en rute å fortsette på.
-STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} har kjørt seg vill.
+STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} har kjørt seg vill
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}{VEHICLE}s inntekt i fjor var {CURRENCY}

 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} stoppet fordi ombyggingsordre feilet
@@ -837,7 +837,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} godtar nå {STRING} og {STRING}

 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Subsidietilbud har gått ut:{}{}{STRING} fra {STRING} til {STRING} vil ikke subsidieres.
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Subsidie er trukket tilbake:{}{}Transport av {STRING} fra {STRING} til {STRING} subsidieres ikke lenger.
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Subsidie trukket tilbake:{}{}Transport av {STRING} fra {STRING} til {STRING} subsidieres ikke lenger.
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Subsidietilbud:{}{}Første transport av {STRING} fra {STRING} til {STRING} vil subsidieres av bystyret i ett år!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STRING} til {STRING} vil gi 50{NBSP}% ekstra fortjeneste det neste året!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STRING} til {STRING} vil gi dobbel fortjeneste det neste året!
@@ -859,31 +859,31 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaen
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Velg valutaenhet som skal brukes

 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britisk pund (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikansk dollar (USD)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_YEN                                   :Japansk yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pund (£)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar ($)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (€)
+STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen (¥)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Østerriksk shilling (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgisk franc (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sveitsisk franc (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tsjekkisk koruna (CZK)
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Tysk mark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Tyske mark (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Dansk krone (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spansk pesetas (ESP)
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finsk mark (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Fransk franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesetas (ESP)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finske mark (FIM)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Gresk drakme (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungarsk forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandsk krone (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italiensk lire (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Hollandsk guilder (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norsk krone (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polsk złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polsk zloty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumensk leu (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russisk rubel (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovensk tolar (SIT)
 STR_GAME_OPTIONS_CURRENCY_SEK                                   :Svensk krone (SEK)
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Tyrkisk lire (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Tyrkiske lire (TRY)
 STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakisk koruna (SKK)
 STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasiliansk real (BRL)
 STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estlandsk krone (EEK)
@@ -1057,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Høyt
 STR_SEA_LEVEL_CUSTOM                                            :Egendefinert
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Egendefinert ({NUM}%)

-
 STR_DISASTER_NONE                                               :Ingen
 STR_DISASTER_REDUCED                                            :Redusert
 STR_DISASTER_NORMAL                                             :Normalt
@@ -1163,17 +1162,17 @@ STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :alle kjøretøy
 STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Advar hvis inntekten til et kjøretøy er negativ: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Kjøretøy utgår aldri: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Autoforny kjøretøy når det blir gammelt: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Autoforny kjøretøy når det er {ORANGE}{STRING}{LTBLUE} måned{P 0:1 "" er} før/etter maksalder.
+STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Autoforny kjøretøy når det er {ORANGE}{STRING}{LTBLUE} mnd. før/etter maks. alder
 STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Minimum formue for autofornyelse av kjøretøy: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Varighet for feilmeldinger: {ORANGE}{STRING} sekund{P 0:1 "" er}
-STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Vil hjelpetekst: {ORANGE}Pek i {STRING} sekund{P 0:1 "" er}.
-STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}Vis hjelpetekst: {ORANGE}Høyreklikk
+STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Varighet for feilmeldinger: {ORANGE}{STRING}
+STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Forsinkelse av svevende hendelser: {ORANGE}{STRING}
+STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}Forsinkelse av svevende hendelser: {ORANGE}deaktivert
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Vis byers innbyggertall i tittelfeltet: {ORANGE}{STRING}

 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}Landskapsgenerator: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Orginal
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
-STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Maksavstand fra kartkant for oljeraffinerier: {ORANGE}{STRING} rute{P 0:1 "" r}.
+STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Maks. avstand fra kartkant for oljeraffinerier: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}Snøgrense: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Ulendthet på terreng (kun TerraGenesis): {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Veldig jevnt
@@ -1192,7 +1191,7 @@ STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Tillat
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}En eller flere ruter ved den nordlige kanten av kartet er ikke tom(me)
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}En eller flere ruter ved en av kantene på kartet er ikke vann

-STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Maks. stasjonsstørrelse: {ORANGE}{STRING} rute{P 0:1 "" r} {RED}Advarsel: Høy instilling gir tregere spill
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Maks. stasjonsstørrelse: {ORANGE}{STRING} {RED}Advarsel: Høy instilling gir tregere spill
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Automatisk vedlikehold ved helikopterplass: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Koble landskapsverktøylinjen til bygningsverktøylinjene: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Landfarge brukt på oversiktskartet: {ORANGE}{STRING}
@@ -1220,7 +1219,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Av

 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Venstre-klikk rulling: {ORANGE}{STRING}

-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Bruk {ORANGE}{STRING}{LTBLUE} datoformat i navn på lagrede spill.
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Bruk {ORANGE}{STRING}{LTBLUE} datoformat på lagrede spill
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :langt (31. Des 2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :kort (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
@@ -1283,7 +1282,7 @@ STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}Start s
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}Jevn økonomi (flere, mindre endringer): {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}Tillat aksjekjøp i andre firmaer: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :{LTBLUE}Prosent av etappefortjeneste å betale i tilbringersystemer: {ORANGE}{STRING}{NBSP}%
-STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ved dra-og-slipp, plasser signal på hver: {ORANGE}{STRING} rute{P 0:1 "" r}
+STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ved dra-og-slipp, plasser signal på hver {ORANGE}{STRING}. rute
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Bygg vingesignal automatisk før: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Aktiver signalgrensesnittet: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Standard signaltype: {ORANGE}{STRING}
@@ -1408,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Se etter
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Vis AI-instillinger
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Avslutt 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Avslutt
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå tilbake til {STRING}?
@@ -1435,7 +1433,7 @@ STR_ABANDON_SCENARIO_QUERY                                      :{YELLOW}Er du s
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Juksekoder
 STR_CHEATS_TOOLTIP                                              :{BLACK}Avkrysningsbokser indikerer om du har brukt denne juksekoden tidligere
-STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Du er i ferd med å bedra dine motstandere. Vær klar over at en slik skammelig oppførsel vil bli husket i all evighet.
+STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Du er i ferd med å bedra dine motstandere. Vær klar over at denne skammelige handlingen vil bli husket i all evighet.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Øk pengebeholdningen med {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spiller som firma: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldoser (fjern industrier, uflyttbare objekter): {ORANGE}{STRING}
@@ -1500,14 +1498,14 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Lag et t
 STR_FACE_ADVANCED                                               :{BLACK}Avansert
 STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Avansert ansiktsvalg
 STR_FACE_SIMPLE                                                 :{BLACK}Enkelt
-STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Enkelt ansiktsvalg
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Enkelt ansiktsvalg.
 STR_FACE_LOAD                                                   :{BLACK}Last inn
 STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Last inn favorittansikt
 STR_FACE_LOAD_DONE                                              :{WHITE}Ditt favorittansikt har blitt lastet inn fra OpenTTDs konfigurasjonsfil
 STR_FACE_FACECODE                                               :{BLACK}Ansiktsnummer
 STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Vis og/eller endre ansiktsnummeret til firma sjefen
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Vis og/eller endre sjefens ansiktsnummer
-STR_FACE_FACECODE_SET                                           :{WHITE}Ny ansiktsnummerkode har blitt satt
+STR_FACE_FACECODE_SET                                           :{WHITE}Ny ansiktsnummerkode har blitt fastsatt.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kunne ikke sette sjefens ansiktsnummer - må være et heltall mellom 0 og 4 294 967 295!
 STR_FACE_SAVE                                                   :{BLACK}Lagre
 STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Lagre favorittansikt
@@ -1692,15 +1690,15 @@ STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hjelp ti
 STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Kobler til...

 ############ Leave those lines in this order!!
-STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Kobler til...
-STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Godkjenner...
-STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Venter...
-STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Laster ned kart...
-STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Behandler data...
-STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Registrerer...
+STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Kobler til..
+STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Godkjenner..
+STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Venter..
+STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Laster ned kart..
+STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Behandler data..
+STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Registrerer..

-STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spillinformasjon...
-STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter firmainformasjon...
+STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spillinformasjon..
+STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter firmainformasjon..
 ############ End of leave-in-this-order
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} foran deg
 STR_NETWORK_CONNECTING_DOWNLOADING_1                            :{BLACK}{BYTES} nedlastet så langt
@@ -1741,7 +1739,7 @@ STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Bruk det
 STR_COMPANY_VIEW_JOIN                                           :{BLACK}Bli med
 STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Bli med og spill som dette firmaet
 STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Passord
-STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Passordbeskytt firmaet ditt for å forhindre uautoriserte brukere fra å bli med.
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Beskytt firmaet ditt med et passord for å forhindre uautoriserte brukere fra å bli med.
 STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Velg firmapassord

 # Network chat
@@ -1886,15 +1884,15 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kunne ik

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Instillinger for gjennomsiktighet
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Gjennomsiktighet for stasjonsskilt. Ctrl-klikk for å låse.
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Gjennomsiktighet for trær. Ctrl-klikk for å låse.
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Gjennomsiktighet for hus. Ctrl-klikk for å låse.
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Gjennomsiktighet for industrier. Ctrl-klikk for å låse.
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Gjennomsiktighet for stasjoner, garasjer, staller, hangarer, dokker og kontrollpunkt. Ctrl-klikk for å låse.
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Gjennomsiktighet for broer. Ctrl-klikk for å låse.
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Gjennomsiktighet for bygg som fyrtårn og antenner. Ctrl-klikk for å låse.
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Gjennomsiktighet for kjeder. Ctrl-klikk for å låse.
-STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Gjennomsiktighet for lastingsindikatorer. Ctrl-klikk for å låse.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Gjennomsiktighet for stasjonsskilt. CTRL+klikk for å låse.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Gjennomsiktighet for trær. CTRL+klikk for å låse.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Gjennomsiktighet for hus. CTRL+klikk for å låse.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Gjennomsiktighet for industrier. CTRL+klikk for å låse.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Gjennomsiktighet for stasjoner, garasjer, staller, hangarer, dokker og kontrollpunkt. CTRL+klikk for å låse.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Gjennomsiktighet for broer. CTRL+klikk for å låse.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Gjennomsiktighet for fyrtårn og antenner. CTRL+klikk for å låse.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Gjennomsiktighet for kjeder. CTRL+klikk for å låse.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Gjennomsiktighet for lastingsindikatorer. CTRL+klikk for å låse.
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Gjør objekter usynlige i stedet for gjennomsiktige

 # Base for station construction window(s)
@@ -1919,16 +1917,16 @@ STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :Bygg elektrisk
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :Bygg monorail
 STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Bygg maglev

-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Bygg jernbanespor. Ctrl veksler mellom å bygge/fjerne. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Bygg jernbane ved hjelp av autobanemodusen. Ctrl veksler mellom å bygge/fjerne. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Bygg togstall (trengs for å kjøpe og vedlikeholde tog). Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Gjør om jernbane til kontrollpunkt. Ctrl slår sammen kontrollpunkt. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Bygg jernbanestasjon. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Bygg jernbanesignaler. Ctrl veksler mellom vingesignaler/lyssignaler{}Hold og dra for å bygge signaler langs en rett jernbanestrekning. Ctrl bygger signaler til det neste krysset. Ctrl-klikk viser/skjuler signalvalgsvinduet. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bygg jernbanebro. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bygg jernbanetunnel. Shift slår av og på kostnadsestimat.
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Veksle mellom bygging/fjerning av jernbanespor, signaler, kontrollpunkt og stasjoner. Hold inne Ctrl for i tillegg å fjerne jernbanespor fra kontrollpunkt og stasjoner.
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konverter/oppgrader jernbanetypen. Shift slår av og på kostnadsestimat.
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Bygg jernbanespor. CTRL veksler mellom å bygge/fjerne
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Bygg jernbane ved hjelp av autobanemodusen. CTRL veksler mellom bygg/fjern for jernbanekonstruksjon
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Bygg togstall (trengs for å kjøpe og vedlikeholde tog)
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Gjør om jernbane til kontrollpunkt. Klikk CTRL for å legge til eksisterende kontrollpunkt.
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Bygg jernbanestasjon. Klikk CTRL for å legge til eksisterende stasjon.
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Bygg jernbanesignaler. CTRL veksler mellom vingesignaler/lyssignaler{}Hold og dra for å bygge signaler langs en rett jernbanestrekning. CTRL bygger signaler til det neste krysset. CTRL+klikk viser/skjuler signalvalgsvinduet.
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bygg jernbanebro
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bygg jernbanetunnel
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Veksle mellom bygging/fjerning av jernbanespor, signaler, kontrollpunkt og stasjoner. Hold inne CTRL for i tillegg å fjerne jernbanespor fra kontrollpunkt og stasjoner
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konverter/oppgrader jernbanetypen

 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Togstallens retning
@@ -1962,14 +1960,14 @@ STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Inngangs
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Utgangssignal (vingesignal){}Oppfører seg på samme måte som et blokksignal, men er nødvendig for å utløse riktig farge på inngangs- og kombinasjons-forsignaler.
 STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinasjonssignal (vingesignal){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge store "grener" med forsignaler.
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Avansert signal (vingesignal){}Et avansert signal tillater flere tog å kjøre samtidig på samme signalblokk, dersom togene kan reservere en rute til et trygt stoppested. Vanlige avanserte signaler kan passeres bakfra.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Enveis avansert signal (vingesignal){}Et avansert signal tillater flere tog å kjøre samtidig på samme signalblokk, dersom togene kan reservere en rute til et trygt stoppested. Enveis avanserte signaler kan ikke passeres bakfra.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Enveis avansert signal (vingesignal){}Et avansert signal tillater flere tog å kjøre samtidig på samme signalblokk, dersom togene kan reservere en rute til et trygt stoppested . Enveis avanserte signaler kan ikke passeres bakfra.
 STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blokksignal (lyssignal){}Dette er den enkleste typen av signaler som tillater kun ett tog å kjøre om gangen.
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Inngangssignal (lyssignal){}Grønt så lenge det er ett eller flere grønne utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Utgangssignal (lyssignal){}Oppfører seg på samme måte som et blokksignal, men er nødvendig for å utløse riktig farge på inngangs- og kombinasjons-forsignaler.
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinasjonssignal (lyssignal){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge store "grener" med forsignaler.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Avanserte signal (lyssignal){}Et avansert signal tillater flere tog å kjøre samtidig på samme signalblokk, dersom togene kan reservere en rute til et trygt stoppested. Vanlige avanserte signaler kan passeres bakfra.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Enveis avansert signal (lyssignal){}Et avansert signal tillater flere tog å kjøre samtidig på samme signalblokk, dersom togene kan reservere en rute til et trygt stoppested . Enveis avanserte signaler kan ikke passeres bakfra.
-STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konverter signal{}Konverterer signaler til den valgte signaltypen. Ctrl-klikk vil endre eksisterende variant. Shift-klikk viser kostnadsestimat.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konverter signal{}Konverterer signaler til den valgte signaltypen. CTRL-klikk vil endre eksisterende variant.
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Signaltetthet ved dra-og-slipp
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Senk signaltetthet ved dra-og-slipp
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Øk signaltetthet ved dra-og-slipp
@@ -1993,21 +1991,21 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Hvelv, Silisium
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Bygg vei
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Bygg trikkespor
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Bygg vei. Ctrl veksler mellom å bygge/fjerne. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Bygg trikkestasjon. Ctrl veksler mellom å bygge/fjerne. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Bygg veiseksjon ved bruk av autoveimodusen. Ctrl veksler mellom å bygge/fjerne. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Bygg trikkespor ved bruk av autotrikkespormodusen. Ctrl veksler mellom å bygge/fjerne. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Bygg garasje (nødvendig for kjøp og vedlikehold av kjøretøy). Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Bygg trikkestall (nødvendig for kjøp og vedlikehold av trikker). Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Bygg bussholdeplass. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Bygg trikkestasjon for passasjerer. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Bygg lasteterminal. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Bygg trikkestasjon for varer. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Bygg vei. CTRL veksler mellom å bygge/fjerne
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Bygg trikkestasjon. CTRL veksler mellom å bygge/fjerne
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Bygg veiseksjon ved bruk av autoveimodusen. CTRL veksler mellom å bygge/fjerne
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Bygg trikkespor ved bruk av autotrikkespormodusen. CTRL veksler mellom å bygge/fjerne
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Bygg garasje (nødvendig for innkjøp og vedlikehold av kjøretøy)
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Bygg trikkestall (nødvendig for innkjøp og vedlikehold av trikker)
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Bygg bussholdeplass. Klikk CTRL for å legge til eksisterende stasjon
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Bygg trikkestasjon for passasjerer. Klikk CTRL for å legge til eksisterende stasjon
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Bygg lasteterminal. Klikk CTRL for å legge til eksisterende stasjon
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Bygg trikkestasjon for varer. Klikk CTRL for å legge til eksisterende stasjon
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Skru av/på enveiskjørte veier
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Bygg veibro. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Bygg trikkesporbro. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Bygg veitunnel. Shift slår av og på kostnadsestimat.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Bygg trikkesportunnel. Shift slår av og på kostnadsestimat.
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Bygg veibro
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Bygg trikkesporbro
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Bygg veitunnel
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Bygg trikkesportunnel
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Veksle mellom bygging/fjerning for veibygging
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Veksle mellom bygging/fjerning for trikkesporkonstruksjon

@@ -2030,13 +2028,13 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Velg var
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Bygg vannveier
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vannveier
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Bygg kanaler. Shift slår av og på kostnadsestimat.
-STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Bygg sluser. Shift slår av og på kostnadsestimat.
-STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Bygg skipsdokk (nødvendig for kjøp og vedlikehold av skip). Shift slår av og på kostnadsestimat.
-STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bygg havn. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
-STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plasser en bøye, som kan brukes til å danne kontrollpunkter. Shift slår av og på kostnadsestimat.
-STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bygg akvedukt. Shift slår av og på kostnadsestimat.
-STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definer vannområde.{}Lag en kanal, unntatt hvis Ctrl holdes nede på havnivå, hvorpå området rundt vil fylles istedenfor.
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Bygg kanaler
+STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Bygg sluser
+STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Bygg skipsdokk (nødvendig for innkjøp og vedlikehold av skip)
+STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bygg havn. Klikk CTRL for å legge til eksisterende stasjon
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plasser en bøye, som kan brukes til å danne kontrollpunkter
+STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bygg akvedukt
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definer vannområde.{}Lag en kanal, unntatt hvis CTRL holdes nede på havnivå, hvorpå området rundt vil fylles istedenfor
 STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Plasser elver

 # Ship depot construction window
@@ -2048,7 +2046,7 @@ STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Havn

 # Airport toolbar
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flyplasser
-STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg flyplass. Ctrl slår sammen stasjoner. Shift slår av og på kostnadsestimat.
+STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg flyplass. Klikk CTRL for å legge til eksisterende stasjon

 # Airport construction window
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Velg flyplasstype
@@ -2075,10 +2073,10 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Støy ge

 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landskapsverktøy
-STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Senk et landområde. Dra for å senke det første valgte området, og jevne resten til samme høyde. Ctrl velger område diagonalt. Shift slår av og på kostnadsestimat.
-STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Hev et landområde. Dra for å heve det første valgte området, og jevne resten til samme høyde. Ctrl velger område diagonalt. Shift slår av og på kostnadsestimat.
-STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Jevn ut land til samme høyde som det første valgte området. Ctrl velger området diagonalt. Shift slår av og på kostnadsestimat.
-STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kjøp land for fremtidig bruk. Shift slår av og på kostnadsestimat.
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Senk et hjørne av et landstykke
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Hev et hjørne av et landstykke
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Jevn ut land
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kjøp land for fremtidig bruk

 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Objektvalg
@@ -2199,6 +2197,7 @@ STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gress
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Jorder
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snødekket land
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
+
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbanespor
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbanespor med blokksignaler
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Jernbanespor med forsignaler
@@ -2469,7 +2468,7 @@ STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Advarsel:
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Feil: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{STRING}
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}En fatal NewGRF-feil har oppstått: {}{STRING}
-STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} virker ikke med TTDPatch-versjonen som er rapportert av OpenTTD.
+STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} virker ikke med TTDPatch versjonen som er rapportert av OpenTTD
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} er for versjon {STRING} av TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} er laget for å bli brukt med {STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Ugyldig parameter for {1:STRING}: parameter {STRING} ({NUM})
@@ -2480,10 +2479,10 @@ STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF-filen den v
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :For mange NewGRFer innlastet.
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Å laste inn {2:STRING} som statisk NewGRF med {4:STRING} kan forårsake synkroniseringsfeil.
 STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventet sprite.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukjent "Action 0"-egenskap.
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukjent hendelse 0 egenskap.
 STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøk på å bruke ugyldig ID.
-STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneholder en ødelagt sprite. Alle ødelagte spriter vil bli vist som røde spørsmålstegn (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneholder flere "Action 8"-oppføringer
+STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneholder ødelagt sprite. Alle ødelagte spriter vil bli vist som røde spørsmålstegn (?).
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneholder flere "Action 8" oppføringer
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leste forbi slutten på pseudo-sprite.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det nåværende grafikksettet mangler en del spriter.{}Vennligst oppdater grafikksettet.
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Etterspurte GRF resurser var ikke tilgjengelige.
@@ -2523,8 +2522,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} med <in
 STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<invalid industry>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} skilt
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Skriftformgjenkjennelse
@@ -3152,7 +3149,7 @@ STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE
 STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Rutetabell
 STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Skift til rutetabellvisning

-STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Ordreliste - klikk på en ordre for å markere den. Ctrl-klikk viser ordrens endestasjon.
+STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Ordreliste - klikk på en ordre for å markere den. CTRL+klikk ruller til stasjonen.
 STR_ORDER_INDEX                                                 :{COMMA}:{NBSP}
 STR_ORDER_TEXT                                                  :{STRING} {STRING}

@@ -3169,8 +3166,8 @@ STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Endre st

 STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Full last av enhver varetype
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Last hvis tilgjengelig
-STR_ORDER_DROP_FULL_LOAD_ALL                                    :Full last av alle varetyper
-STR_ORDER_DROP_FULL_LOAD_ANY                                    :Full last av minst en varetype
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Full last av alle varer
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Full last av enhver varetype
 STR_ORDER_DROP_NO_LOADING                                       :Ingen lasting
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Endre lasterutinene for den merkede ordren

@@ -3191,12 +3188,10 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stopp
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Hopp over ordren med mindre vedlikehold er nødvendig

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Kjøretøydata å basere hopp på
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Lastprosent
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Pålitelighet
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maks. hastighet
-STR_ORDER_CONDITIONAL_AGE                                       :Alder (år)
+STR_ORDER_CONDITIONAL_AGE                                       :Kjøretøyets alder (år)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Trenger vedlikehold
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Alltid

@@ -3226,7 +3221,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Gå til nærmes
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Gå til nærmeste hangar
 STR_ORDER_CONDITIONAL                                           :Betinget ordrehopp
 STR_ORDER_SHARE                                                 :Del ordre
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Sett inn en ny ordre før den markerte ordren, eller legg til i slutten av listen. Ctrl gir ordren 'full last, enhver varetype', kontrollpunktordre 'direkte' og verkstedsordre 'vedlikehold'. 'Del ordrer' eller Ctrl lar dette kjøretøyet dele ordrer med det valgte kjøretøyet. Klikk på et kjøretøy for å kopiere ordrene fra det.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Sett inn en ny ordre før den markerte ordren, eller legg til i slutten av listen. CTRL gir ordren 'full last, enhver varetype', kontrollpunktordre 'direkte' og verkstedsordre 'vedlikehold'
 STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Sett inn en avansert ordre

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Vis alle kjøretøy som deler denne ruteplanen
@@ -3254,8 +3249,8 @@ STR_ORDER_GO_TO_STATION                                         :{STRING} {STATI

 STR_ORDER_IMPLICIT                                              :(Automatisk)

-STR_ORDER_FULL_LOAD                                             :(Full last av alle varetyper)
-STR_ORDER_FULL_LOAD_ANY                                         :(Full last av minst en varetype)
+STR_ORDER_FULL_LOAD                                             :(Full last)
+STR_ORDER_FULL_LOAD_ANY                                         :(Full last av alle varetyper)
 STR_ORDER_NO_LOAD                                               :(Ingen lasting)
 STR_ORDER_UNLOAD                                                :(Loss av og last på varer)
 STR_ORDER_UNLOAD_FULL_LOAD                                      :(Loss av og vent på full last)
@@ -3270,8 +3265,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ingen lossing
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ingen lossing og vent på første fulle last)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ingen av og pålasting)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[nær slutten]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[midten]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[enden]
@@ -3349,7 +3342,7 @@ STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Slå av
 STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Tillat/nekt bryt når en AI-loggbeskjed tilsvarer brytstrengen
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Bryt på:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Bryt på
-STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Når en AI-loggbeskjed tilsvarer denne strengen, settes spillet i pause.
+STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Når en AI-loggbeskjed tilsvarer denne strengen, pauses spillet.
 STR_AI_DEBUG_MATCH_CASE                                         :{BLACK}Skriftformgjenkjennelse
 STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Veksle mellom skriftformgjenkjennelse ved sammenligning av AI-loggbeskjeder mot bruddstrengen
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Fortsett
@@ -3438,13 +3431,12 @@ STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... det

 STR_ERROR_PNGMAP                                                :{WHITE}Kunne ikke laste landskap fra PNG...
 STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... fant ikke filen.
-STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... kunne ikke konvertere bildetypen. 8- eller 24-bits PNG-bilde kreves.
-STR_ERROR_PNGMAP_MISC                                           :{WHITE}... noe gikk akkurat galt (sannsynligvis en ødelagt fil).
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... kunne ikke konvertere bildetypen. Et 8- eller 24-bits PNG-bilde trengs.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... noe gikk akkurat galt. Beklager. (sannsynligvis en ødelagt fil)

 STR_ERROR_BMPMAP                                                :{WHITE}Kunne ikke laste landskap fra BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kunne ikke konvertere bildetype.

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalaadvarsel
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Å endre kildekartstørrelsen for mye er ikke anbefalt. Fortsette generering?

@@ -3611,7 +3603,7 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... må
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Tog kan kun endres når det har stoppet i togstallen
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Toget er for langt
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke snu om kjøreretningen til kjøretøy...
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}... består av flere deler
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke snu kjøretøy som består av flere deler...
 STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Inkompatible jernbanetyper

 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan ikke flytte kjøretøy...
@@ -1057,7 +1057,6 @@ STR_SEA_LEVEL_HIGH                                              :Høgt
 STR_SEA_LEVEL_CUSTOM                                            :Eigendefinert
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Eigendefinert ({NUM}%)

-
 STR_DISASTER_NONE                                               :Ingen
 STR_DISASTER_REDUCED                                            :Redusert
 STR_DISASTER_NORMAL                                             :Normalt
@@ -1120,7 +1119,7 @@ STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Last k
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflasjon: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Lever varer til ein stasjon kun hvis det er etterspørjing: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}Maksimal lengde på bru: {ORANGE}{STRING} rute{P 0:1 "" r}
-STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Maksimal tunnellengde: {ORANGE}{STRING} rute{P 0:1 "" r}
+STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Maksimal tunnel lengde: {ORANGE}{STRING} rute{P 0:1 "" r}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Konstruksjonsmetode for primærindustri: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :inga
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :som andre industriar
@@ -1402,7 +1401,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Sjå ett
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Syne AI-instillingar
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Avslutt 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Avslutt
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå attende til {STRING}?
@@ -2190,6 +2188,7 @@ STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Jorde
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snødekt land
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
+
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbanespor
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbanespor med blokksignaler
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Jernbanespor med forsignaler
@@ -2513,8 +2512,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} med <in
 STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<invalid industry>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} Skilt{P "" er}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Skriftformgjenkjenning
@@ -3181,8 +3178,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stopp
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Hopp over ordren dersom ikkje vedlikehald trengst

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Køyretøy-data å basere hopp på
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Lastprosent
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Pålitelegheit
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maks. hastigheit
@@ -3261,8 +3256,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ingen lossing
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ingen lossing og vent på første fulle last)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ingen lossing og ingen lasting)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[starten]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[midten]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[andre enden]
@@ -3435,7 +3428,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... noko
 STR_ERROR_BMPMAP                                                :{WHITE}Kan ikkje laste inn landskap frå BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kan ikkje konvertere bilettype

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalaåtvaring
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Å endre storleiken på kjeldekartet for mykje er ikkje anbefalt. Vil du halde fram med genereringa?

@@ -861,7 +861,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecç

 ############ start of currency region
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra Britânica (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar dos E.U.A. (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar dos Estados Unidos (USD)
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
 STR_GAME_OPTIONS_CURRENCY_YEN                                   :Yen Japonês (JPY)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Xelim Austríaco (ATS)
@@ -1931,7 +1931,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construi
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Alternar entre construir/remover linha férrea, sinais, pontos de passagem e estações. Fixar o Ctrl também remove a linha férrea de pontos de passagem e estações
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converter/Actualizar tipo de linha. Shift alterna contruir/mostrar custo estimado

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientação do Depósito
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Seleccionar a orientação do depósito
@@ -2406,6 +2405,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Move o f
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Para Baixo
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o ficheiro NewGRF seleccionado para baixo na lista
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos ficheiros NewGRF instalados. Clique num ficheiro para alterar os seus parâmetros
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alternar palete
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna a palete do NewGRF seleccionado.{}Alterne quando os gráficos deste NewGRF aparecerem a cor-de-rosa no jogo
@@ -2438,8 +2438,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parâmetro {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Número de parâmetros: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspeccionar - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Pai
@@ -3277,8 +3275,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Não descarreg
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Não descarregar e aguardar até encher de qq. carga)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Não descarregar e não carregar)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[extremo perto]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[no meio]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[extremo longe]
@@ -1930,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construi
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Comută construcţia/înlăturarea căilor ferate, semnalelor, punctelor de tranzit şi a staţiilor. Ctrl+Click înlătură şinele din punctele de tranzit şi din staţii
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converteşte tipul de cale ferată. Shift comută între convertire/afişare cost estimat

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientarea depoului feroviar
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Alege orientarea depoului
@@ -3275,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Nu descărca
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Nu descărca şi aşteaptă orice încărcătură)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Fără încărcare sau descărcare)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[la capătul apropiat]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[la mijloc]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[la capătul îndepărtat]
@@ -406,7 +406,7 @@ STR_SORT_BY_FACILITY                                            :Тип стан
 STR_SORT_BY_WAITING                                             :Кол-во товара на станции
 STR_SORT_BY_RATING_MAX                                          :Наивысший рейтинг
 STR_SORT_BY_RATING_MIN                                          :Низший рейтинг
-STR_SORT_BY_ENGINE_ID                                           :Идентификатор (классическая сортировка)
+STR_SORT_BY_ENGINE_ID                                           :Идентификатор
 STR_SORT_BY_COST                                                :Цена
 STR_SORT_BY_POWER                                               :Мощность
 STR_SORT_BY_TRACTIVE_EFFORT                                     :Тяговое усилие
@@ -455,7 +455,7 @@ STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}Нажм
 STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}Показать карту; список городов
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Создание ландшафта
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Создание городов
-STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Создание предприятий
+STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Создание промышленности
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Строительство автомобильных дорог
 STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Посадить деревья. При нажатом Shift - оценка стоимости высадки.
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Поставить метку
@@ -659,7 +659,7 @@ STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRI
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}

 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}График прибыли
-STR_GRAPH_INCOME_CAPTION                                        :{WHITE}График дохода
+STR_GRAPH_INCOME_CAPTION                                        :{WHITE}График доходов
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Количество доставленного груза
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Рейтинг компании (макс=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Стоимость компании
@@ -800,13 +800,13 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Карт

 STR_SMALLMAP_TYPE_CONTOURS                                      :Рельеф
 STR_SMALLMAP_TYPE_VEHICLES                                      :Транспорт
-STR_SMALLMAP_TYPE_INDUSTRIES                                    :Предприятия
+STR_SMALLMAP_TYPE_INDUSTRIES                                    :Промышленность
 STR_SMALLMAP_TYPE_ROUTES                                        :Маршруты
 STR_SMALLMAP_TYPE_VEGETATION                                    :Растительность
 STR_SMALLMAP_TYPE_OWNERS                                        :Владельцы
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Показать контуры земли на карте
 STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}Показать транспорт на карте
-STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Показать предприятия на карте
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Показать промышленность на карте
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Показать маршруты на карте
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Показать растительность на карте
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Показать владельцев земли на карте
@@ -1489,7 +1489,7 @@ STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :очень вы
 STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}Количество мегаполисов: {ORANGE}1 из {STRING}
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :{LTBLUE}Количество мегаполисов: {ORANGE}нет
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :{LTBLUE}Изначальный множитель размера города: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}Удалять бесполезные элементы во время постройки дорог: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}Удалять бесполезные элементы дорог во время реконструкции: {ORANGE}{STRING}

 STR_CONFIG_SETTING_GUI                                          :{ORANGE}Интерфейс
 STR_CONFIG_SETTING_CONSTRUCTION                                 :{ORANGE}Строительство
@@ -1507,7 +1507,7 @@ STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Обс
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Маршруты
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Поезда
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Города
-STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Предприятия
+STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Промышленность


 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Алгоритм поиска пути для поездов: {ORANGE}{STRING}
@@ -2054,18 +2054,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... со
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... невозможно записать файл
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Не удалось распаковать скачанный файл

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Настройки прозрачности
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Переключение прозрачности значков станций. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Переключение прозрачности деревьев. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Переключение прозрачности городских зданий. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Переключение прозрачности предприятий. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Переключение прозрачности построенных игроками объектов: станций, депо, точек пути и пр. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Переключение прозрачности мостов. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Переключение прозрачности таких сооружений, как маяки и антенны. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Переключение прозрачности контактной сети. Ctrl+щелчок - заблокировать.
-STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Переключение прозрачности индикаторов загрузки. Ctrl+щелчок - заблокировать.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Переключение прозрачности значков станций. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Переключение прозрачности деревьев. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Переключение прозрачности городских зданий. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Переключение прозрачности промышленных объектов. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Переключение прозрачности построенных игроками объектов: станций, депо, точек пути и пр. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Переключение прозрачности мостов. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Переключение прозрачности таких сооружений, как маяки и антенны. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Переключение прозрачности контактной сети. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Переключение прозрачности индикаторов загрузки. Ctrl+щелчок - блокировка.
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Сделать объекты не прозрачными, а полностью невидимыми

 # Base for station construction window(s)
@@ -2101,7 +2100,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Стро
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Переключение между строительством и удалением ж/д путей, сигналов, станций. При нажатом Ctrl убирает станции с рельсами.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Преобразовать/модернизировать рельсы. При нажатом Shift - оценка стоимости преобразования.

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Направление депо
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Выбор направления депо
@@ -2345,10 +2343,10 @@ STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP                    :{BLACK}Пока

 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Информация об участке земли
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Стоимость очистки: {LTBLUE}(недоступна)
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Стоимость очистки: {RED}{CURRENCY}
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Чтобы очистить, надо: {LTBLUE}(нет данных)
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Чтобы очистить, надо: {RED}{CURRENCY}
 STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Выручка от продажи: {LTBLUE}{CURRENCY}
-STR_LAND_AREA_INFORMATION_OWNER_N_A                             :отсутствует
+STR_LAND_AREA_INFORMATION_OWNER_N_A                             :нет данных
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Владелец: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Владелец дороги: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Владелец трамвая: {LTBLUE}{STRING}
@@ -2581,8 +2579,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Вниз
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Переместить выбранный файл NewGRF ниже
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Список установленных файлов NewGRF. Выберите файл для просмотра информации о нём

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Параметры
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Переключить палитру
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Переключить палитру для выбраного NewGRF файла.{}Используйте переключение, если графика отрисовывается розовым цветом.
@@ -2605,6 +2601,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Отклю
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Несовместимо с данной версией OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Введите параметры файла NewGRF
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Изменить параметры NewGRF
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Закрыть
@@ -2614,8 +2611,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамет
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Количество параметров: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Просмотр - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Родитель
@@ -2913,7 +2908,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Имя дире
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Мы ищем транспортную компанию для присоединения к ней.{}{}Вы хотите купить {COMPANY} за {CURRENCY}?

 # Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Предприятия
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Промышленность
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Нет -
 STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% перевезено)
 STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
@@ -3240,7 +3235,7 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Попал
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Поломка
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Остановлен
 STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Останавливается; {VELOCITY}
-STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Нет тяги
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Нет тока
 STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Ожидает свободного пути

 STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Идёт к {STATION}; {VELOCITY}
@@ -3374,7 +3369,7 @@ STR_ORDER_DROP_NO_UNLOADING                                     :Не разгр
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Изменить способ разгрузки на указанной станции

 STR_ORDER_REFIT                                                 :{BLACK}Переоборудовать
-STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Выберите тип груза для переоборудования. Ctrl+щелчок отменит переоборудование.
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Выберите тип груза для переоборудования. Ctrl+клик - для удаления задания.

 STR_ORDER_SERVICE                                               :{BLACK}Обслуживание
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Всегда идти
@@ -3463,8 +3458,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Не разг
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Не разгружаться и ждать полной загрузки любым грузом)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Не разгружаться и не загружаться)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[начало станции]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[середина станции]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[конец станции]
@@ -3721,7 +3714,7 @@ STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}...в ц

 # Industry related errors
 STR_ERROR_TOO_MANY_INDUSTRIES                                   :{WHITE}... слишком много предприятий
-STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Невозможно создать предприятия...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Невозможно создать промышленность...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Здесь нельзя создать {STRING}...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Построить это предприятие невозможно...
 STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... слишком близко к другому предприятию
@@ -2125,7 +2125,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Izgradnj
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Izgradnja/Uklanjanje železničkih pruga, signalizacije, putnih tačaka i stanica (kad je uključeno). Držanjem Ctrl takođe se uklanja pruga sa putnih tačaka i stanica
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Promena/Nadogradnja vrste pruge. Shift prebacuje između promene/nadogradnje i prikaza procene troškova

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orijentacija železničkog depoa
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Izbor orijentacije železničkog depoa
@@ -2600,6 +2599,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Pomera o
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naniže
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pomera označenu NewGRF datoteku niže na spisku
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Spisak instaliranih NewGRF datoteka. Kliknite na datoteku kako bi promenili njena svojstva
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Postavi parametre
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Promeni paletu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Menja paletu označenog NewGRF-a.{}Promenite paletu ako grafici iz NewGRF-a su ružičasti tokom igre
@@ -2632,8 +2632,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametar {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Broj parametara: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Provera - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Roditelj
@@ -3487,8 +3485,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Bez istovara i
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Bez istovara i pun utovar bilo kog)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Bez istovara i bez utovara)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[pri početku]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[na sredini]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[pri kraju]
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :高清截图
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :全地图截图
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :关于 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite 对齐
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :切换边界框
 ############ range ends here

 ############ range for days starts (also used for the place in the highscore window)
@@ -2082,7 +2081,6 @@ STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}购买

 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}物体选单
-STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}选择要建造的物件类型
 STR_OBJECT_BUILD_SIZE                                           :{BLACK}大小: {GOLD}{NUM} x {NUM} 瓦

 STR_OBJECT_CLASS_LTHS                                           :灯塔
@@ -404,7 +404,7 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Fundar nueva in

 ############ range for railway construction menu starts
 STR_RAIL_MENU_RAILROAD_CONSTRUCTION                             :Construcción de ferrocarril
-STR_RAIL_MENU_ELRAIL_CONSTRUCTION                               :Construcción ferrocarril eléctrico
+STR_RAIL_MENU_ELRAIL_CONSTRUCTION                               :Construcción línea eléctrica de ferrocarril
 STR_RAIL_MENU_MONORAIL_CONSTRUCTION                             :Construcción de monorraíl
 STR_RAIL_MENU_MAGLEV_CONSTRUCTION                               :Construcción de maglev
 ############ range ends here
@@ -514,8 +514,8 @@ STR_MONTH_DEC                                                   :Diciembre
 ############ range for months ends

 # Graph window
-STR_GRAPH_KEY_BUTTON                                            :{BLACK}Leyenda
-STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Mostrar leyenda en gráficos
+STR_GRAPH_KEY_BUTTON                                            :{BLACK}Clave
+STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Mostrar clave en gráficos
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING}
@@ -540,7 +540,7 @@ STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLAC
 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Mostrar detalles de rendimiento

 # Graph key window
-STR_GRAPH_KEY_CAPTION                                           :{WHITE}Leyenda de los gráficos
+STR_GRAPH_KEY_CAPTION                                           :{WHITE}Clave de los gráficos
 STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Click aquí para intercambiar la entrada de la empresa

 # Company league window
@@ -1885,7 +1885,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... cone
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... no se puede escribir en el fichero
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No ha sido posible descomprimir el fichero descargado

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opciones de Transparencia
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Ajustar transparencia para carteles de estaciones. Ctrl+Click para bloquear
@@ -1917,7 +1916,7 @@ STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Constru

 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :Construcción de Ferrocarril
-STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :Construcción Ferrocarril Eléctrico
+STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :Construcción Línea Eléctrica de Ferrocarril
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :Construcción de Monorraíl
 STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Construcción de Maglev

@@ -1932,7 +1931,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construi
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Cambiar entre construir/retirar ferrocarriles, señales, estaciones y puntos de ruta de ferrocarril. Mantener pulsado Ctrl retirará también el ferrocarril al retirar estaciones y puntos de ruta
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convertir/Actualizar tipo de ferrocarril. Shift permite mostrar una estimación del precio

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientación del depósito
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Seleccione orientación del depósito de trenes
@@ -2408,8 +2406,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mover Ab
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mueve el NewGRF seleccionado abajo en la lista
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Una lista de los NewGRF instalados. Pulsa en el fichero para cambiar sus parámetros

-# Additional textfiles accompanying NewGRFs
-
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Establecer parámetros
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Seleccionar paleta
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Seleccionar la paleta del NewGRF seleccionado.{}Esto es necesario cuando los gráficos de este NewGRF se vean de color rosa
@@ -2432,6 +2428,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivad
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Incompatible con esta versión de OpenTTD

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Introduce los parámetros del NewGRF
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Cambiar parámetros NewGRF
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Cerrar
@@ -2441,8 +2438,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parámetro {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Número de parámetros: {ORANGE}{NUM}

-# NewGRF textfile window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspeccionar - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Superior
@@ -2522,7 +2517,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tren '{V

 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{STRING}' da información incorrecta
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Información de carga/reforma para '{1:ENGINE}' difiere tras la de la lista de compra después de la construcción. Esto puede causar que la renovación/reemplazo automáticos no reformen correctamente
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' ha causado un bucle sin fin en la 'callback' de producción
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' ha causado un bucle sin fin en la llamada de retorno de producción

 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<carga incorrecta>
@@ -3280,8 +3275,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(No descargar y
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(No descargar y esperar a cualquier carga completa)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(No descargar y no cargar)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[cerca del fin]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[medio]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[lejos del fin]
@@ -1930,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bygg jä
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Växla mellan att bygga/ta bort järnväg, signaler, riktmärken och stationer. Håll nere Ctrl för att även ta bort räls från waypoints och stationer
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertera/Uppgradera spårtyp. Shift växlar mellan att bygga/visa beräknad kostnad

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Riktning för depå
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Välj riktning för depå
@@ -2405,6 +2404,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Flytta u
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Flytta ned
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flytta ner den markerade NewGRF-filen i listan
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}En lista med installerade NewGRF-filer . Välj en fil för att ändra dess parametrar
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parametrar
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Byt palett
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Ändra palett för markerad NewGRF.{}Gör detta när grafiken från denna NewGRF är rosa i spelet
@@ -2437,8 +2437,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Antal parametrar: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspektera - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Förälder
@@ -3276,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Lasta ej av me
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Lasta ej av men vänta på full last av någon godstyp)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Lasta ej av och lasta ej)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[början]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[mitten]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[slutet]
@@ -1056,7 +1056,6 @@ STR_SEA_LEVEL_HIGH                                              :高
 STR_SEA_LEVEL_CUSTOM                                            :自訂
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :自訂 ({NUM}%)

-
 STR_DISASTER_NONE                                               :無
 STR_DISASTER_REDUCED                                            :減少
 STR_DISASTER_NORMAL                                             :普通
@@ -1224,7 +1223,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :長格式 (31st
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :短格式 (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :國際格式 (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}自動在開始新遊戲時暫停：{ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}當暫停時允許: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :無動作
@@ -1407,7 +1405,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}檢查
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}顯示 AI 設定
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}離開「OpenTTD」

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}離開
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}您確定要放棄進行中的遊戲{}返回 {STRING}？
@@ -2522,8 +2519,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} / <無
 STR_NEWGRF_INVALID_ENGINE                                       :<無效交通工具模型>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<無效工業>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}標誌清單 - 標誌 {COMMA} 個
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}符合大小寫
@@ -3191,8 +3186,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :停留
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}跳過這個指令，除非需要維護

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}跳躍指令依據
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :裝載進度 (%)
 STR_ORDER_CONDITIONAL_RELIABILITY                               :可靠度
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :極速
@@ -3444,8 +3437,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... 出
 STR_ERROR_BMPMAP                                                :{WHITE}無法從 BMP 檔載入地形...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... 無法轉換影像格式

-STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... 影像過大
-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}縮放警告
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}不建議過度縮放地圖。要繼續產生嗎？

@@ -121,7 +121,7 @@ STR_QUANTITY_SUGAR                                              :{WEIGHT} şeker
 STR_QUANTITY_TOYS                                               :{COMMA} oyuncak
 STR_QUANTITY_SWEETS                                             :{COMMA} çanta tatlı
 STR_QUANTITY_COLA                                               :{VOLUME} kola
-STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} pamuk helva
+STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} pamukhelva
 STR_QUANTITY_BUBBLES                                            :{COMMA} balon
 STR_QUANTITY_TOFFEE                                             :{WEIGHT} bonbon
 STR_QUANTITY_BATTERIES                                          :{COMMA} pil
@@ -503,14 +503,14 @@ STR_MONTH_JAN                                                   :Ocak
 STR_MONTH_FEB                                                   :Subat
 STR_MONTH_MAR                                                   :Mart
 STR_MONTH_APR                                                   :Nisan
-STR_MONTH_MAY                                                   :Mayıs
+STR_MONTH_MAY                                                   :Mayis
 STR_MONTH_JUN                                                   :Haziran
 STR_MONTH_JUL                                                   :Temmuz
 STR_MONTH_AUG                                                   :Ağustos
 STR_MONTH_SEP                                                   :Eylül
 STR_MONTH_OCT                                                   :Ekim
 STR_MONTH_NOV                                                   :Kasım
-STR_MONTH_DEC                                                   :Aralık
+STR_MONTH_DEC                                                   :Aralik
 ############ range for months ends

 # Graph window
@@ -788,8 +788,8 @@ STR_NEWS_NEW_TOWN                                               :{BLACK}{BIGFONT
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Yeni bir {STRING}, {TOWN} şehri yakınlarında kuruldu!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Yeni bir {STRING}, {TOWN} şehri yakınlarında kuruldu!

-STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} her an kapanabileceğini duyurdu!
-STR_NEWS_INDUSTRY_CLOSURE_SUPPLY_PROBLEMS                       :{BIGFONT}{BLACK}{STRING} kaynak sorunları yüzünden kapanıyor!
+STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} tükendi, kapaniyor!
+STR_NEWS_INDUSTRY_CLOSURE_SUPPLY_PROBLEMS                       :{BIGFONT}{BLACK}{STRING} kaynak sorunları yüzünden kapaniyor!
 STR_NEWS_INDUSTRY_CLOSURE_LACK_OF_TREES                         :{BIGFONT}{BLACK}Yakında ağaç olmadığı için {STRING} kapanıyor!

 STR_NEWS_EURO_INTRODUCTION                                      :{BIGFONT}{BLACK}Avrupa Birliği Karar Aldı!{}{}Artık ülkemizde para birimi olarak Euro kullanılacak!
@@ -1348,6 +1348,7 @@ STR_CONFIG_SETTING_DISPLAY_OPTIONS                              :{ORANGE}Görün
 STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Etkileşim
 STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Sinyaller
 STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}Kargo idaresi
+STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}İşaretlerde otomatik geri çevirme: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Bilgisayar oyuncuları
 STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Otomatik yenileme
 STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Bakımlar
@@ -1360,7 +1361,6 @@ STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Endüst
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Trenler için yol bulucu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Önerilen)
-STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}İşaretlerde otomatik geri çevirme: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}Arabalar için yol bulucu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF             :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_YAPF            :YAPF {BLUE}(Önerilen)
@@ -2167,6 +2167,7 @@ STR_INDUSTRY_DISPLAY_CHAIN                                      :{BLACK}Zinciri
 STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP                              :{BLACK}Kargo sağlayan ve kabul eden fabrikaları göster
 STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP                            :{BLACK}Küçük haritaya bağla
 STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP                    :{BLACK}Gösterilen fabrikaları küçük haritada da seç
+
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Arazi Bilgisi
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Temizleme fiyatı: {LTBLUE}Yok
@@ -2294,7 +2295,7 @@ STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Yükle
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Senaryoyu Kaydet
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Senaryoyu Yükle
 STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Yükseklik haritası yükle
-STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Şu anki varsayılan kayıt/yükleme dizinine gitmek için tıklayın
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Su anki varsayılan kayıt/yükleme dizinine gitmek için tıklayın
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} bos
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Sürücü, klasör ve kayıtli oyun listesi
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Kaydetmek için kullanılacak dosya adı
@@ -3920,7 +3921,7 @@ STR_SV_STNAME_ANNEXE                                            :{STRING} Ekleme
 STR_SV_STNAME_SIDINGS                                           :{STRING} Kenarı
 STR_SV_STNAME_BRANCH                                            :{STRING} Kolu
 STR_SV_STNAME_UPPER                                             :Yukarı {STRING}
-STR_SV_STNAME_LOWER                                             :Aşağı {STRING}
+STR_SV_STNAME_LOWER                                             :Asağı {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Ormanı
 STR_SV_STNAME_FALLBACK                                          :{STRING} {NUM}. istasyon
@@ -3965,7 +3966,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GRAIN_HOPPER                  :Tahıl Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WOOD_TRUCK                    :Odun Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_IRON_ORE_HOPPER               :Demir Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_STEEL_TRUCK                   :Çelik Vagonu
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN                   :Zırhlı Vagon
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN                   :Zirhli Vagon
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN                      :Yiyecek Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PAPER_TRUCK                   :Kağıt Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER             :Bakır Vagonu
@@ -3995,7 +3996,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GRAIN_HOPPER              :Tahıl Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK                :Odun Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER           :Demir Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK               :Çelik Vagonu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Zırhlı Vagon
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Zirhli Vagon
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :Yiyecek Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK               :Kağıt Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER         :Bakır Vagonu
@@ -4027,7 +4028,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GRAIN_HOPPER                :Tahıl Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK                  :Odun Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER             :Demir Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK                 :Çelik Vagonu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Zırhlı Vagon
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Zirhli Vagon
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :Yiyecek Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK                 :Kağıt Vagonu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER           :Bakır Vagonu
@@ -4081,9 +4082,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Chippy Demir Ka
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Balogh Çelik Kamyonu
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl Çelik Kamyonu
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling Çelik Kamyonu
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Balogh Zırhlı Araç
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Uhl Zırhlı Araç
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster Zırhlı Araç
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Balogh Zirhli Araç
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Uhl Zirhli Araç
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster Zirhli Araç
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :Foster Yiyecek Arabası
 STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :Perry Yiyecek Arabası
 STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Chippy Yiyecek Arabası
@@ -1028,13 +1028,13 @@ STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL                      :{LTBLUE}Quan đ
 ############ range for difficulty settings ends

 STR_NONE                                                        :Không Có
-STR_FUNDING_ONLY                                                :Chỉ Cấp Vốn
-STR_MINIMAL                                                     :Tối Thiểu
-STR_NUM_VERY_LOW                                                :Ít Nhất
+STR_FUNDING_ONLY                                                :Chỉ cấp vốn
+STR_MINIMAL                                                     :Tối thiểu
+STR_NUM_VERY_LOW                                                :Ít nhất
 STR_NUM_LOW                                                     :Ít
-STR_NUM_NORMAL                                                  :Trung Bình
+STR_NUM_NORMAL                                                  :Trung bình
 STR_NUM_HIGH                                                    :Nhiều
-STR_NUM_CUSTOM                                                  :Tùy Chọn
+STR_NUM_CUSTOM                                                  :Tuỳ chọn
 STR_NUM_CUSTOM_NUMBER                                           :Tùy chỉnh ({NUM})

 STR_VARIETY_NONE                                                :Không
@@ -1158,21 +1158,21 @@ STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Sân ba
 STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :{LTBLUE}Cảnh báo nếu phương tiện bị thất lạc: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ORDER_REVIEW                                 :{LTBLUE}Kiểm soát lộ trình của các phương tiện: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ORDER_REVIEW_OFF                             :không
-STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :có, nhưng trừ các phương tiện đang dừng
-STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :tất cả phương tiện
-STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Cảnh báo nếu thu nhập của phương tiện bị âm: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :có, nhưng trừ các ph.tiện đang dừng
+STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :tất cả ph.tiện
+STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Cảnh báo nếu thu nhập của ph.tiện bị âm: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Phương tiện không bao giờ thành đồ cổ: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Tự thay mới phương tiện nếu nó hết tuổi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Tự thay mới phương tiện vào {ORANGE}{STRING}{LTBLUE} tháng trước/sau khi quá tuổi
-STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Số tiền tối thiểu cần cho việc tự thay mới phương tiện: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Số tiền tối thiểu cần cho việc tự thay mới ph.tiện: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Khoảng thời gian hiện báo lỗi: {ORANGE}{STRING} giây
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Thông báo các sự kiện hiện ra: {ORANGE}{STRING} giây
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}THông báo các sự kiện hiện ra: {ORANGE}Click phải
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Hiện dân số đô thị trong nhãn tên của đô thị: {ORANGE}{STRING}

 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}Tạo nền đất: {ORANGE}{STRING}
-STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Nguyên Bản
-STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
+STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Nguyên bản
+STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :Đất liền
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Khoảng cách tối đa từ mép bản đồ tới Nhà máy lọc dầu {ORANGE}{STRING} ô
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}Độ cao tuyết phủ: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Độ gồ ghề của địa chất (cho TerraGenesis) : {ORANGE}{STRING}
@@ -1206,7 +1206,7 @@ STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}Hiện
 STR_CONFIG_SETTING_LIVERIES_NONE                                :Không
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :Công ty đang giữ
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :Tất cả công ty
-STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}Bắt đầu tán gẫu nội nhóm với phím <ENTER>: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}Bắt đầu chát nội nhóm với phím <ENTER>: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING                        :{LTBLUE}Chức năng nút cuộn trên chuột: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM                             :Phóng to bản đồ
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :Cuộn bản đồ
@@ -1287,7 +1287,7 @@ STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Khi ké
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Xây cờ hiệu thay vì đèn trước năm: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Bật GUI đèn tín hiệu : {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Kiểu đèn tín hiệu đc xây mặc định: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Đèn hiệu khóa
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Đèn dừng
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Đèn dẫn đường
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Đèn dẫn đường 1-chiều
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :{LTBLUE}Đổi tuần hoàn các kiểu đèn báo: {ORANGE}{STRING}
@@ -1755,7 +1755,7 @@ STR_NETWORK_CHAT_TO_COMPANY                                     :[Nhóm] tới {
 STR_NETWORK_CHAT_CLIENT                                         :[Riêng] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Riêng] Tới {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_ALL                                            :[Chung] {STRING}: {WHITE}{STRING}
-STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Nhập thông điệp tán gẫu
+STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Nhập thông điệp chat

 # Network messages
 STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Không có thiết bị mạng hoặc không thiết lập ENABLE_NETWORK
@@ -1882,7 +1882,7 @@ STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Không t
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD                            :{WHITE}Tải bất thành...
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... kết nối bị đứt
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... không ghi được file
-STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Không thể giải nén file đã tải
+STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Không thể giải nétn file đã tải

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Tuỳ Hiệu Ứng Trong Suốt
@@ -1930,7 +1930,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Xây h
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Chuyển chế độ xây/phá cho đường ray, đèn tín hiệu, điểm mốc và nhà ga. Giữ Ctrl để phá bỏ đường ray tính từ điểm mốc hay nhà ga
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Chuyển đổi loại đường ray. Shift để xem chi phí dự tính

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Hướng Của Xưởng Tàu Hỏa
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Chọn hướng đặt xưởng tàu hoả
@@ -2324,7 +2323,7 @@ STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Di chuy
 STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Di chuyển độ cao tuyết phủ xuống thấp
 STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Số ngẫu nhiên:
 STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Chọn để nhập con số ngẫu nhiên khi tạo bản đồ
-STR_MAPGEN_RANDOM                                               :{BLACK}Sinh Ngẫu Nhiên
+STR_MAPGEN_RANDOM                                               :{BLACK}Sinh ngẫu nhiên
 STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Thay đổi con số ngẫu nhiên để khởi tạo địa hình ngẫu nhiên
 STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Tạo nền đất:
 STR_MAPGEN_TREE_PLACER                                          :{BLACK}Cơ chế trồng cây:
@@ -2332,7 +2331,7 @@ STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Kiểu n
 STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Mực nước biển:
 STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Độ phẳng phiu:
 STR_MAPGEN_VARIETY                                              :{BLACK}Phân bổ sự đa dạng:
-STR_MAPGEN_GENERATE                                             :{WHITE}Khởi Tạo
+STR_MAPGEN_GENERATE                                             :{WHITE}Khởi tạo

 # Strings for map borders at game generation
 STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Rìa bản đồ:
@@ -2340,11 +2339,11 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Tây B
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Đông Bắc
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Đông Nam
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Tây Nam
-STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Dạng Tự Do
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Dạng tự do
 STR_MAPGEN_BORDER_WATER                                         :{BLACK}Nước
-STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Ngẫu Nhiên
-STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Ngẫu Nhiên
-STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Bằng Tay
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Ngẫu nhiên
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Ngẫu nhiên
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Bằng tay

 STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Xoay bản đồ địa hình:
 STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Tên bản đồ địa hình:
@@ -2426,6 +2425,7 @@ STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Không c
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}File hợp lệ không có
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Tắt
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Không tương thích với phiên bản OpenTTD này.
+
 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Nhập NewGRF tham số

 # NewGRF parameters window
@@ -2437,8 +2437,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Tham số {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Số các thông số: {ORANGE}{NUM}

-# NewGRF readme window
-
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Phân tích - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Đối tượng cha
@@ -3276,8 +3274,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Không dỡ v
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Không dỡ và chờ lấy đủ hàng bất kỳ)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Không bốc hàng và không dỡ hàng)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[đỗ ở đầu gần]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[đỗ ở giữa]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[đỗ ở đầu xa]
@@ -3371,10 +3367,10 @@ STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Có mộ
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Cửa sổ gỡ lỗi AI chỉ có trên server

 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Thiết Lập AI
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Cấu Hình AI
 STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Tất cả AI sẽ nạp tại ván chơi kế tiếp
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Nhân vật người
-STR_AI_CONFIG_RANDOM_AI                                         :AI ngẫu nhiên
+STR_AI_CONFIG_RANDOM_AI                                         :AI Ngẫu Nhiên

 STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Di Chuyển Lên Trên
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Di chuyển AI lên trên danh sách
@@ -3383,7 +3379,7 @@ STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Di chuy

 STR_AI_CONFIG_CHANGE                                            :{BLACK}Chọn AI
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Nạp một AI khác
-STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Tham Số
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Cấu Hình
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Cấu hình tham số cho AI

 # Available AIs window
@@ -3402,7 +3398,7 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Không
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Tham Số AI
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Đóng
-STR_AI_SETTINGS_RESET                                           :{BLACK}Thiết Lập Lại
+STR_AI_SETTINGS_RESET                                           :{BLACK}Thiết lập lại
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

 # Vehicle loading indicators
@@ -3446,7 +3442,7 @@ STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... khô
 STR_ERROR_PNGMAP                                                :{WHITE}Không thể nạp nền từ file PNG...
 STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... không tìm thấy file.
 STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... không thể chuyển kiểu ảnh. Phải là ảnh PNG 8 hoặc 24-bit.
-STR_ERROR_PNGMAP_MISC                                           :{WHITE}... có lỗi gì đó, rất tiếc (có thể là hỏng file)
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... có lỗi gì đó, rất tiếc. (có thể là hỏng file)

 STR_ERROR_BMPMAP                                                :{WHITE}Không thể nạp nền từ file BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... không thể chuyển đổi kiểu ảnh.
@@ -3739,9 +3735,9 @@ STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Không t
 STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Không thể gửi máy bay về xưởng...

 STR_ERROR_CAN_T_BUY_TRAIN                                       :{WHITE}Không thể mua tàu hỏa này...
-STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}Không thể mua ôtô này...
-STR_ERROR_CAN_T_BUY_SHIP                                        :{WHITE}Không thể mua tàu thủy này...
-STR_ERROR_CAN_T_BUY_AIRCRAFT                                    :{WHITE}Không thể mua máy bay này...
+STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}Không thể mua xe này...
+STR_ERROR_CAN_T_BUY_SHIP                                        :{WHITE}Không thể mua tàu này...
+STR_ERROR_CAN_T_BUY_AIRCRAFT                                    :{WHITE}Không thể mua phi cơ này...

 STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Không thể đổi tên kiểu tàu hoả...
 STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Không thể đổi tên kiểu ôtô...
@@ -3838,7 +3834,7 @@ STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1                          :Trung tâm mua
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Túp lều
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Lều vải
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Nhà ấm trà
-STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Nhà băng heo đất
+STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Nhà con heo đất

 ##id 0x4800
 # industry names
@@ -3868,13 +3864,13 @@ STR_INDUSTRY_NAME_WATER_TOWER                                   :Tháp nước
 STR_INDUSTRY_NAME_FACTORY_2                                     :Nhà máy thực phẩm
 STR_INDUSTRY_NAME_FARM_2                                        :Nông trại
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :Nhà máy chế biến gỗ
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :Rừng kẹo bông
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :Nhà máy chế biến kẹo bông
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :Nhà máy sản xuất kẹo
-STR_INDUSTRY_NAME_BATTERY_FARM                                  :Nông trại pin
-STR_INDUSTRY_NAME_COLA_WELLS                                    :Giếng cola
+STR_INDUSTRY_NAME_BATTERY_FARM                                  :Nhà máy sản xuất pin
+STR_INDUSTRY_NAME_COLA_WELLS                                    :Nhà máy đồ uống cola
 STR_INDUSTRY_NAME_TOY_SHOP                                      :Cửa hàng đồ chơi
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :Nhà máy sản xuất đồ chơi
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :Suối chất dẻo
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :Nhà máy chất dẻo
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :Nhà máy đồ uống có ga
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :Nhà máy tạo bong bóng
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :Mỏ kẹo bơ cứng
@@ -3900,7 +3896,7 @@ STR_SV_STNAME_TRANSFER                                          :Trung chuyển
 STR_SV_STNAME_HALT                                              :{STRING} phụ
 STR_SV_STNAME_VALLEY                                            :Thung lũng {STRING}
 STR_SV_STNAME_HEIGHTS                                           :Cao nguyên {STRING}
-STR_SV_STNAME_WOODS                                             :Rừng {STRING}
+STR_SV_STNAME_WOODS                                             :Hàng hoá {STRING}
 STR_SV_STNAME_LAKESIDE                                          :Bờ hồ {STRING}
 STR_SV_STNAME_EXCHANGE                                          :Trung chuyển {STRING}
 STR_SV_STNAME_AIRPORT                                           :Sân bay {STRING}
@@ -3914,7 +3910,7 @@ STR_SV_STNAME_ANNEXE                                            :{STRING} phụ
 STR_SV_STNAME_SIDINGS                                           :{STRING} kế
 STR_SV_STNAME_BRANCH                                            :Nhánh {STRING}
 STR_SV_STNAME_UPPER                                             :{STRING} thượng
-STR_SV_STNAME_LOWER                                             :{STRING} hạ
+STR_SV_STNAME_LOWER                                             :{STRING} Hạ
 STR_SV_STNAME_HELIPORT                                          :Sân bay trực thăng {STRING}
 STR_SV_STNAME_FOREST                                            :Rừng {STRING}
 STR_SV_STNAME_FALLBACK                                          :Bến {STRING} số #{NUM}
@@ -3959,7 +3955,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GRAIN_HOPPER                  :Toa ngũ cốc
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WOOD_TRUCK                    :Toa chở gỗ
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_IRON_ORE_HOPPER               :Toa chở quặng sắt
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_STEEL_TRUCK                   :Toa chở thép
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN                   :Toa thiết giáp
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN                   :Toa két an toàn
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN                      :Toa chở thực phẩm
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PAPER_TRUCK                   :Toa chở giấy
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER             :Toa chở quặng đồng
@@ -3989,7 +3985,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GRAIN_HOPPER              :Toa ngũ cốc
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK                :Toa chở gỗ
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER           :Toa chở quặng sắt
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK               :Toa chở thép
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Toa thiết giáp
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Toa két an toàn
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :Toa thực phẩm
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK               :Toa chở giấy
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER         :Toa chở quặng đồng
@@ -4021,7 +4017,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GRAIN_HOPPER                :Toa chở ngũ
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK                  :Toa chở gỗ
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER             :Toa chở quặng sắt
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK                 :Toa chở thép
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Toa thiết giáp
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Toa két an toàn
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :Toa thực phẩm
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK                 :Toa chở giấy
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER           :Toa chở quặng đồng
@@ -4075,9 +4071,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Xe quặng sắ
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Xe tải thép Balogh
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Xe tải thép Uhl
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Xe tải thép Kelling
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Xe thiết giáp Balogh
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Xe thiết giáp Uhl
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Xe thiết giáp Foster
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Xe két an toàn Balogh
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Xe két an toàn Uhl
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Xe két an toàn Foster
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :Xe thực phẩm Foster
 STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :Xe thực phẩm Perry
 STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Xe thực phẩm Chippy
@@ -4155,13 +4151,13 @@ STR_VEHICLE_NAME_AIRCRAFT_DARWIN_400                            :Darwin 400
 STR_VEHICLE_NAME_AIRCRAFT_DARWIN_500                            :Darwin 500
 STR_VEHICLE_NAME_AIRCRAFT_DARWIN_600                            :Darwin 600
 STR_VEHICLE_NAME_AIRCRAFT_GURU_GALAXY                           :Guru Galaxy
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A21                           :Airtaxi A21
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A31                           :Airtaxi A31
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A32                           :Airtaxi A32
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A33                           :Airtaxi A33
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A21                           :Taxi hàng không A21
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A31                           :Taxi hàng không A31
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A32                           :Taxi hàng không A32
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A33                           :Taxi hàng không A33
 STR_VEHICLE_NAME_AIRCRAFT_YATE_AEROSPACE_YAE46                  :Yate Aerospace YAe46
 STR_VEHICLE_NAME_AIRCRAFT_DINGER_100                            :Dinger 100
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A34_1000                      :AirTaxi A34-1000
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A34_1000                      :Taxi hàng không A34-1000
 STR_VEHICLE_NAME_AIRCRAFT_YATE_Z_SHUTTLE                        :Yate Z-Shuttle
 STR_VEHICLE_NAME_AIRCRAFT_KELLING_K1                            :Kelling K1
 STR_VEHICLE_NAME_AIRCRAFT_KELLING_K6                            :Kelling K6
@@ -4202,7 +4198,7 @@ STR_FORMAT_DEPOT_NAME_SHIP                                      :Xưởng Tàu {
 STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :Xưởng Tàu {TOWN} #{COMMA}
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :Xưởng {STATION}

-STR_UNKNOWN_STATION                                             :trạm chưa biết
+STR_UNKNOWN_STATION                                             :Ga,bến không biết
 STR_DEFAULT_SIGN_NAME                                           :Biển hiệu
 STR_COMPANY_SOMEONE                                             :ai đó

@@ -78,24 +78,19 @@ static byte * const _playlists[] = {

 /**
 * Validate a playlist.
- * @param playlist The playlist to validate.
- * @param last The last location in the list.
+ * @param playlist the playlist to validate
 */
-void ValidatePlaylist(byte *playlist, byte *last)
+void ValidatePlaylist(byte *playlist)
 {
-	while (*playlist != 0 && playlist <= last) {
-		/* Song indices are saved off-by-one so 0 is "nothing". */
-		if (*playlist <= NUM_SONGS_AVAILABLE && !StrEmpty(GetSongName(*playlist - 1))) {
+	while (*playlist != 0) {
+		if (*playlist <= BaseMusic::GetUsedSet()->num_available) {
 			playlist++;
 			continue;
 		}
-		for (byte *p = playlist; *p != 0 && p <= last; p++) {
+		for (byte *p = playlist; *p != 0; p++) {
 			p[0] = p[1];
 		}
 	}
-
-	/* Make sure the list is null terminated. */
-	*last = 0;
 }

 /** Initialize the playlists */
@@ -121,8 +116,8 @@ void InitializeMusic()
 		_playlists[k + 1][j] = 0;
 	}

-	ValidatePlaylist(_msf.custom_1, lastof(_msf.custom_1));
-	ValidatePlaylist(_msf.custom_2, lastof(_msf.custom_2));
+	ValidatePlaylist(_msf.custom_1);
+	ValidatePlaylist(_msf.custom_2);

 	if (BaseMusic::GetUsedSet()->num_available < _music_wnd_cursong) {
 		/* If there are less songs than the currently played song,
@@ -19,12 +19,6 @@
 #include "tcp_admin.h"
 #include "../../debug.h"

-/* Make sure that these enums match. */
-assert_compile((int)CRR_MANUAL    == (int)ADMIN_CRR_MANUAL);
-assert_compile((int)CRR_AUTOCLEAN == (int)ADMIN_CRR_AUTOCLEAN);
-assert_compile((int)CRR_BANKRUPT  == (int)ADMIN_CRR_BANKRUPT);
-assert_compile((int)CRR_END       == (int)ADMIN_CRR_END);
-
 NetworkAdminSocketHandler::NetworkAdminSocketHandler(SOCKET s)
 {
 	this->sock = s;
@@ -99,9 +99,7 @@ DECLARE_ENUM_AS_BIT_SET(AdminUpdateFrequency)
 enum AdminCompanyRemoveReason {
 	ADMIN_CRR_MANUAL,    ///< The company is manually removed.
 	ADMIN_CRR_AUTOCLEAN, ///< The company is removed due to autoclean.
-	ADMIN_CRR_BANKRUPT,  ///< The company went belly-up.
-
-	ADMIN_CRR_END        ///< Sentinel for end.
+	ADMIN_CRR_BANKRUPT   ///< The company went belly-up.
 };

 #define DECLARE_ADMIN_RECEIVE_COMMAND(type) virtual NetworkRecvStatus NetworkPacketReceive_## type ##_command(Packet *p)
@@ -199,20 +199,16 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendClientJoin(ClientID clien
 	return NETWORK_RECV_STATUS_OKAY;
 }

-/**
- * Send an initial set of data from some client's information.
- * @param cs The socket of the client.
- * @param ci The information about the client.
- */
-NetworkRecvStatus ServerNetworkAdminSocketHandler::SendClientInfo(const NetworkClientSocket *cs, const NetworkClientInfo *ci)
+NetworkRecvStatus ServerNetworkAdminSocketHandler::SendClientInfo(const NetworkClientSocket *cs)
 {
 	/* Only send data when we're a proper client, not just someone trying to query the server. */
+	const NetworkClientInfo *ci = cs->GetInfo();
 	if (ci == NULL) return NETWORK_RECV_STATUS_OKAY;

 	Packet *p = new Packet(ADMIN_PACKET_SERVER_CLIENT_INFO);

 	p->Send_uint32(ci->client_id);
-	p->Send_string(cs == NULL ? "" : const_cast<NetworkAddress &>(cs->client_address).GetHostname());
+	p->Send_string(const_cast<NetworkAddress &>(cs->client_address).GetHostname());
 	p->Send_string(ci->client_name);
 	p->Send_uint8 (ci->client_lang);
 	p->Send_uint32(ci->join_date);
@@ -575,17 +571,12 @@ DEF_ADMIN_RECEIVE_COMMAND(Server, ADMIN_PACKET_ADMIN_POLL)
 			/* The admin is requesting client info. */
 			const NetworkClientSocket *cs;
 			if (d1 == UINT32_MAX) {
-				this->SendClientInfo(NULL, NetworkClientInfo::GetByClientID(CLIENT_ID_SERVER));
 				FOR_ALL_CLIENT_SOCKETS(cs) {
-					this->SendClientInfo(cs, cs->GetInfo());
+					this->SendClientInfo(cs);
 				}
 			} else {
-				if (d1 == CLIENT_ID_SERVER) {
-					this->SendClientInfo(NULL, NetworkClientInfo::GetByClientID(CLIENT_ID_SERVER));
-				} else {
-					cs = NetworkClientSocket::GetByClientID((ClientID)d1);
-					if (cs != NULL) this->SendClientInfo(cs, cs->GetInfo());
-				}
+				cs = NetworkClientSocket::GetByClientID((ClientID)d1);
+				if (cs != NULL) this->SendClientInfo(cs);
 			}
 			break;

@@ -667,7 +658,7 @@ void NetworkAdminClientInfo(const NetworkClientSocket *cs, bool new_client)
 	ServerNetworkAdminSocketHandler *as;
 	FOR_ALL_ACTIVE_ADMIN_SOCKETS(as) {
 		if (as->update_frequency[ADMIN_UPDATE_CLIENT_INFO] & ADMIN_FREQUENCY_AUTOMATIC) {
-			as->SendClientInfo(cs, cs->GetInfo());
+			as->SendClientInfo(cs);
 			if (new_client) {
 				as->SendClientJoin(cs->client_id);
 			}
@@ -50,7 +50,7 @@ public:

 	NetworkRecvStatus SendDate();
 	NetworkRecvStatus SendClientJoin(ClientID client_id);
-	NetworkRecvStatus SendClientInfo(const NetworkClientSocket *cs, const NetworkClientInfo *ci);
+	NetworkRecvStatus SendClientInfo(const NetworkClientSocket *cs);
 	NetworkRecvStatus SendClientUpdate(const NetworkClientInfo *ci);
 	NetworkRecvStatus SendClientQuit(ClientID client_id);
 	NetworkRecvStatus SendClientError(ClientID client_id, NetworkErrorCode error);
@@ -280,8 +280,7 @@ protected:
 	/** Sort servers by name. */
 	static int CDECL NGameNameSorter(NetworkGameList * const *a, NetworkGameList * const *b)
 	{
-		int r = strnatcmp((*a)->info.server_name, (*b)->info.server_name); // Sort by name (natural sorting).
-		return r == 0 ? (*a)->address.CompareTo((*b)->address) : r;
+		return strnatcmp((*a)->info.server_name, (*b)->info.server_name); // Sort by name (natural sorting).
 	}

 	/**
@@ -717,8 +716,9 @@ public:
 			}

 			case NGWW_LASTJOINED: {
-				if (this->last_joined != NULL) {
-					this->server = this->last_joined;
+				NetworkGameList *last_joined = NetworkGameListAddItem(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port));
+				if (last_joined != NULL) {
+					this->server = last_joined;

 					/* search the position of the newly selected server */
 					for (uint i = 0; i < this->servers.Length(); i++) {
@@ -862,7 +862,6 @@ public:
 			if (this->server != NULL) {
 				if (keycode == WKC_DELETE) { // Press 'delete' to remove servers
 					NetworkGameListRemoveItem(this->server);
-					if (this->server == this->last_joined) this->last_joined = NULL;
 					this->server = NULL;
 					this->list_pos = SLP_INVALID;
 				}
@@ -669,8 +669,6 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendCommand(const CommandPacke

 NetworkRecvStatus ServerNetworkGameSocketHandler::SendChat(NetworkAction action, ClientID client_id, bool self_send, const char *msg, int64 data)
 {
-	if (this->status != STATUS_ACTIVE) return NETWORK_RECV_STATUS_OKAY;
-
 	Packet *p = new Packet(PACKET_SERVER_CHAT);

 	p->Send_uint8 (action);
@@ -1576,7 +1574,8 @@ static void NetworkAutoCleanCompanies()
 			/* Is the company empty for autoclean_unprotected-months, and is there no protection? */
 			if (_settings_client.network.autoclean_unprotected != 0 && _network_company_states[c->index].months_empty > _settings_client.network.autoclean_unprotected && StrEmpty(_network_company_states[c->index].password)) {
 				/* Shut the company down */
-				DoCommandP(0, 2 | c->index << 16, CRR_AUTOCLEAN, CMD_COMPANY_CTRL);
+				DoCommandP(0, 2 | c->index << 16, 0, CMD_COMPANY_CTRL);
+				NetworkAdminCompanyRemove(c->index, ADMIN_CRR_AUTOCLEAN);
 				IConsolePrintF(CC_DEFAULT, "Auto-cleaned company #%d with no password", c->index + 1);
 			}
 			/* Is the company empty for autoclean_protected-months, and there is a protection? */
@@ -1590,7 +1589,8 @@ static void NetworkAutoCleanCompanies()
 			/* Is the company empty for autoclean_novehicles-months, and has no vehicles? */
 			if (_settings_client.network.autoclean_novehicles != 0 && _network_company_states[c->index].months_empty > _settings_client.network.autoclean_novehicles && vehicles_in_company[c->index] == 0) {
 				/* Shut the company down */
-				DoCommandP(0, 2 | c->index << 16, CRR_AUTOCLEAN, CMD_COMPANY_CTRL);
+				DoCommandP(0, 2 | c->index << 16, 0, CMD_COMPANY_CTRL);
+				NetworkAdminCompanyRemove(c->index, ADMIN_CRR_AUTOCLEAN);
 				IConsolePrintF(CC_DEFAULT, "Auto-cleaned company #%d with no vehicles", c->index + 1);
 			}
 		} else {
@@ -1435,15 +1435,15 @@ static ChangeInfoResult CanalChangeInfo(uint id, int numinfo, int prop, ByteRead
 	}

 	for (int i = 0; i < numinfo; i++) {
-		CanalProperties *cp = &_cur_grffile->canal_local_properties[id + i];
+		WaterFeature *wf = &_water_feature[id + i];

 		switch (prop) {
 			case 0x08:
-				cp->callback_mask = buf->ReadByte();
+				wf->callback_mask = buf->ReadByte();
 				break;

 			case 0x09:
-				cp->flags = buf->ReadByte();
+				wf->flags = buf->ReadByte();
 				break;

 			default:
@@ -1679,6 +1679,13 @@ static ChangeInfoResult TownHouseChangeInfo(uint hid, int numinfo, int prop, Byt
 					housespec->cargo_acceptance[2] = 0;
 				}

+				/**
+				 * New houses do not (currently) expect to have a default start
+				 * date before 1930, as this breaks the build date stuff.
+				 * @see FinaliseHouseArray() for more details.
+				 */
+				if (housespec->min_year < 1930) housespec->min_year = 1930;
+
 				_loaded_newgrf_features.has_newhouses = true;
 				break;
 			}
@@ -4706,15 +4713,15 @@ static void FeatureNewName(ByteReader *buf)
 				if (!generic) {
 					Engine *e = GetNewEngine(_cur_grffile, (VehicleType)feature, id, HasBit(_cur_grfconfig->flags, GCF_STATIC));
 					if (e == NULL) break;
-					StringID string = AddGRFString(_cur_grffile->grfid, e->index, lang, new_scheme, false, name, e->info.string_id);
+					StringID string = AddGRFString(_cur_grffile->grfid, e->index, lang, new_scheme, name, e->info.string_id);
 					e->info.string_id = string;
 				} else {
-					AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, true, name, STR_UNDEFINED);
+					AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
 				}
 				break;

 			case GSF_INDUSTRIES: {
-				AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, true, name, STR_UNDEFINED);
+				AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
 				break;
 			}

@@ -4726,7 +4733,7 @@ static void FeatureNewName(ByteReader *buf)
 							grfmsg(1, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring", GB(id, 0, 8));
 						} else {
 							StationClassID cls_id = _cur_grffile->stations[GB(id, 0, 8)]->cls_id;
-							StationClass::SetName(cls_id, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, false, name, STR_UNDEFINED));
+							StationClass::SetName(cls_id, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED));
 						}
 						break;

@@ -4734,7 +4741,7 @@ static void FeatureNewName(ByteReader *buf)
 						if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) {
 							grfmsg(1, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring", GB(id, 0, 8));
 						} else {
-							_cur_grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, false, name, STR_UNDEFINED);
+							_cur_grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
 						}
 						break;

@@ -4742,7 +4749,7 @@ static void FeatureNewName(ByteReader *buf)
 						if (_cur_grffile->airtspec == NULL || _cur_grffile->airtspec[GB(id, 0, 8)] == NULL) {
 							grfmsg(1, "FeatureNewName: Attempt to name undefined airport tile 0x%X, ignoring", GB(id, 0, 8));
 						} else {
-							_cur_grffile->airtspec[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, false, name, STR_UNDEFINED);
+							_cur_grffile->airtspec[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
 						}
 						break;

@@ -4750,7 +4757,7 @@ static void FeatureNewName(ByteReader *buf)
 						if (_cur_grffile->housespec == NULL || _cur_grffile->housespec[GB(id, 0, 8)] == NULL) {
 							grfmsg(1, "FeatureNewName: Attempt to name undefined house 0x%X, ignoring.", GB(id, 0, 8));
 						} else {
-							_cur_grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, false, name, STR_UNDEFINED);
+							_cur_grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
 						}
 						break;

@@ -4759,7 +4766,7 @@ static void FeatureNewName(ByteReader *buf)
 					case 0xD2:
 					case 0xD3:
 					case 0xDC:
-						AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, true, name, STR_UNDEFINED);
+						AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
 						break;

 					default:
@@ -5429,11 +5436,11 @@ static void ScanInfo(ByteReader *buf)
 	/* GRF IDs starting with 0xFF are reserved for internal TTDPatch use */
 	if (GB(grfid, 24, 8) == 0xFF) SetBit(_cur_grfconfig->flags, GCF_SYSTEM);

-	AddGRFTextToList(&_cur_grfconfig->name->text, 0x7F, grfid, false, name);
+	AddGRFTextToList(&_cur_grfconfig->name->text, 0x7F, grfid, name);

 	if (buf->HasData()) {
 		const char *info = buf->ReadString();
-		AddGRFTextToList(&_cur_grfconfig->info->text, 0x7F, grfid, true, info);
+		AddGRFTextToList(&_cur_grfconfig->info->text, 0x7F, grfid, info);
 	}

 	/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */
@@ -5600,7 +5607,7 @@ static void GRFLoadError(ByteReader *buf)
 		if (buf->HasData()) {
 			const char *message = buf->ReadString();

-			error->custom_message = TranslateTTDPatchCodes(_cur_grffile->grfid, lang, true, message);
+			error->custom_message = TranslateTTDPatchCodes(_cur_grffile->grfid, lang, message);
 		} else {
 			grfmsg(7, "GRFLoadError: No custom message supplied.");
 			error->custom_message = strdup("");
@@ -5612,7 +5619,7 @@ static void GRFLoadError(ByteReader *buf)
 	if (buf->HasData()) {
 		const char *data = buf->ReadString();

-		error->data = TranslateTTDPatchCodes(_cur_grffile->grfid, lang, true, data);
+		error->data = TranslateTTDPatchCodes(_cur_grffile->grfid, lang, data);
 	} else {
 		grfmsg(7, "GRFLoadError: No message data supplied.");
 		error->data = strdup("");
@@ -6150,11 +6157,11 @@ static void FeatureTownName(ByteReader *buf)

 			const char *name = buf->ReadString();

-			char *lang_name = TranslateTTDPatchCodes(grfid, lang, false, name);
+			char *lang_name = TranslateTTDPatchCodes(grfid, lang, name);
 			grfmsg(6, "FeatureTownName: lang 0x%X -> '%s'", lang, lang_name);
 			free(lang_name);

-			townname->name[nb_gen] = AddGRFString(grfid, id, lang, new_scheme, false, name, STR_UNDEFINED);
+			townname->name[nb_gen] = AddGRFString(grfid, id, lang, new_scheme, name, STR_UNDEFINED);

 			lang = buf->ReadByte();
 		} while (lang != 0);
@@ -6194,7 +6201,7 @@ static void FeatureTownName(ByteReader *buf)
 				townname->partlist[id][i].parts[j].data.id = ref_id;
 			} else {
 				const char *text = buf->ReadString();
-				townname->partlist[id][i].parts[j].data.text = TranslateTTDPatchCodes(grfid, 0, false, text);
+				townname->partlist[id][i].parts[j].data.text = TranslateTTDPatchCodes(grfid, 0, text);
 				grfmsg(6, "FeatureTownName: part %d, text %d, '%s' (with probability %d)", i, j, townname->partlist[id][i].parts[j].data.text, prob);
 			}
 			townname->partlist[id][i].parts[j].prob = prob;
@@ -6405,14 +6412,10 @@ static void LoadFontGlyph(ByteReader *buf)
 		uint8  num_char  = buf->ReadByte();
 		uint16 base_char = buf->ReadWord();

-		if (size >= FS_END) {
-			grfmsg(1, "LoadFontGlyph: Size %u is not supported, ignoring", size);
-		}
-
 		grfmsg(7, "LoadFontGlyph: Loading %u glyph(s) at 0x%04X for size %u", num_char, base_char, size);

 		for (uint c = 0; c < num_char; c++) {
-			if (size < FS_END) SetUnicodeGlyph(size, base_char + c, _cur_spriteid);
+			SetUnicodeGlyph(size, base_char + c, _cur_spriteid);
 			_nfo_line++;
 			LoadNextSprite(_cur_spriteid++, _file_index, _nfo_line);
 		}
@@ -6495,21 +6498,21 @@ static void TranslateGRFStrings(ByteReader *buf)
 		 * new_scheme has to be true as well. A language id of 0x7F will be
 		 * overridden by a non-generic id, so this will not change anything if
 		 * a string has been provided specifically for this language. */
-		AddGRFString(grfid, first_id + i, 0x7F, true, true, string, STR_UNDEFINED);
+		AddGRFString(grfid, first_id + i, 0x7F, true, string, STR_UNDEFINED);
 	}
 }

 /** Callback function for 'INFO'->'NAME' to add a translation to the newgrf name. */
 static bool ChangeGRFName(byte langid, const char *str)
 {
-	AddGRFTextToList(&_cur_grfconfig->name->text, langid, _cur_grfconfig->ident.grfid, false, str);
+	AddGRFTextToList(&_cur_grfconfig->name->text, langid, _cur_grfconfig->ident.grfid, str);
 	return true;
 }

 /** Callback function for 'INFO'->'DESC' to add a translation to the newgrf description. */
 static bool ChangeGRFDescription(byte langid, const char *str)
 {
-	AddGRFTextToList(&_cur_grfconfig->info->text, langid, _cur_grfconfig->ident.grfid, true, str);
+	AddGRFTextToList(&_cur_grfconfig->info->text, langid, _cur_grfconfig->ident.grfid, str);
 	return true;
 }

@@ -6589,14 +6592,14 @@ static GRFParameterInfo *_cur_parameter; ///< The parameter which info is curren
 /** Callback function for 'INFO'->'PARAM'->param_num->'NAME' to set the name of a parameter. */
 static bool ChangeGRFParamName(byte langid, const char *str)
 {
-	AddGRFTextToList(&_cur_parameter->name, langid, _cur_grfconfig->ident.grfid, false, str);
+	AddGRFTextToList(&_cur_parameter->name, langid, _cur_grfconfig->ident.grfid, str);
 	return true;
 }

 /** Callback function for 'INFO'->'PARAM'->param_num->'DESC' to set the description of a parameter. */
 static bool ChangeGRFParamDescription(byte langid, const char *str)
 {
-	AddGRFTextToList(&_cur_parameter->desc, langid, _cur_grfconfig->ident.grfid, true, str);
+	AddGRFTextToList(&_cur_parameter->desc, langid, _cur_grfconfig->ident.grfid, str);
 	return true;
 }

@@ -6776,10 +6779,10 @@ static bool ChangeGRFParamValueNames(ByteReader *buf)

 		SmallPair<uint32, GRFText *> *val_name = _cur_parameter->value_names.Find(id);
 		if (val_name != _cur_parameter->value_names.End()) {
-			AddGRFTextToList(&val_name->second, langid, _cur_grfconfig->ident.grfid, false, name_string);
+			AddGRFTextToList(&val_name->second, langid, _cur_grfconfig->ident.grfid, name_string);
 		} else {
 			GRFText *list = NULL;
-			AddGRFTextToList(&list, langid, _cur_grfconfig->ident.grfid, false, name_string);
+			AddGRFTextToList(&list, langid, _cur_grfconfig->ident.grfid, name_string);
 			_cur_parameter->value_names.Insert(id, list);
 		}

@@ -7516,17 +7519,6 @@ static void CalculateRefitMasks()
 	}
 }

-/** Set to use the correct action0 properties for each canal feature */
-static void FinaliseCanals()
-{
-	for (uint i = 0; i < CF_END; i++) {
-		if (_water_feature[i].grffile != NULL) {
-			_water_feature[i].callback_mask = _water_feature[i].grffile->canal_local_properties[i].callback_mask;
-			_water_feature[i].flags = _water_feature[i].grffile->canal_local_properties[i].flags;
-		}
-	}
-}
-
 /** Check for invalid engines */
 static void FinaliseEngineArray()
 {
@@ -8212,9 +8204,6 @@ static void AfterLoadGRFs()
 	/* Polish engines */
 	FinaliseEngineArray();

-	/* Set the actually used Canal properties */
-	FinaliseCanals();
-
 	/* Set the block size in the depot windows based on vehicle sprite sizes */
 	InitDepotWindowBlockSizes();

@@ -15,29 +15,6 @@
 #include "cargotype.h"
 #include "rail_type.h"

-/**
- * List of different canal 'features'.
- * Each feature gets an entry in the canal spritegroup table
- */
-enum CanalFeature {
-	CF_WATERSLOPE,
-	CF_LOCKS,
-	CF_DIKES,
-	CF_ICON,
-	CF_DOCKS,
-	CF_RIVER_SLOPE,
-	CF_RIVER_EDGE,
-	CF_RIVER_GUI,
-	CF_BUOY,
-	CF_END,
-};
-
-/** Canal properties local to the NewGRF */
-struct CanalProperties {
-	uint8 callback_mask;  ///< Bitmask of canal callbacks that have to be called.
-	uint8 flags;          ///< Flags controlling display.
-};
-
 enum GrfLoadingStage {
 	GLS_FILESCAN,
 	GLS_SAFETYSCAN,
@@ -146,8 +123,6 @@ struct GRFFile {
 	RailTypeLabel *railtype_list;
 	RailType railtype_map[RAILTYPE_END];

-	CanalProperties canal_local_properties[CF_END]; ///< Canal properties as set by this NewGRF
-
 	struct LanguageMap *language_map; ///< Mappings related to the languages.

 	int traininfo_vehicle_pitch;  ///< Vertical offset for draing train images in depot GUI and vehicle details
@@ -14,9 +14,23 @@

 #include "gfx_type.h"
 #include "tile_type.h"
-#include "newgrf.h"
 #include "newgrf_generic.h"

+/**
+ * List of different canal 'features'.
+ * Each feature gets an entry in the canal spritegroup table
+ */
+enum CanalFeature {
+	CF_WATERSLOPE,
+	CF_LOCKS,
+	CF_DIKES,
+	CF_ICON,
+	CF_DOCKS,
+	CF_RIVER_SLOPE,
+	CF_RIVER_EDGE,
+	CF_END,
+};
+
 /** Flags controlling the display of canals. */
 enum CanalFeatureFlag {
 	CFF_HAS_FLAT_SPRITE = 0, ///< Additional flat ground sprite in the beginning.
@@ -587,7 +587,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
 			return v->grf_cache.company_information;

 		case 0x44: // Aircraft information
-			if (v->type != VEH_AIRCRAFT || !Aircraft::From(v)->IsNormalAircraft()) return UINT_MAX;
+			if (v->type != VEH_AIRCRAFT) return UINT_MAX;

 			{
 				const Vehicle *w = v->Next();
@@ -792,7 +792,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
 			switch (variable - 0x80) {
 				case 0x62: return t->track;
 				case 0x66: return t->railtype;
-				case 0x73: return 0x80 + VEHICLE_LENGTH - t->gcache.cached_veh_length;
+				case 0x73: return t->gcache.cached_veh_length;
 				case 0x74: return t->gcache.cached_power;
 				case 0x75: return GB(t->gcache.cached_power,  8, 24);
 				case 0x76: return GB(t->gcache.cached_power, 16, 16);
@@ -1347,9 +1347,6 @@ public:
 		this->resize_y = this->avs->resize_y;
 		if (this->acs->resize_y > 0 && (this->resize_y == 0 || this->resize_y > this->acs->resize_y)) this->resize_y = this->acs->resize_y;
 		this->resize_y = LeastCommonMultiple(this->resize_y, this->inf->resize_y);
-
-		/* Make sure the height suits the 3 column (resp. not-editable) format; the 2 column format can easily fill space between the lists */
-		this->smallest_y = ComputeMaxSize(min_acs_height, this->smallest_y + this->resize_y - 1, this->resize_y);
 	}

 	virtual void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl)
@@ -1399,9 +1396,8 @@ public:
 			acs_width = ComputeMaxSize(min_acs_width, acs_width, this->acs->GetHorizontalStepSize(sizing)) -
 					this->acs->padding_left - this->acs->padding_right;

-			/* Never use fill_y on these; the minimal size is choosen, so that the 3 column view looks nice */
-			uint avs_height = ComputeMaxSize(this->avs->smallest_y, given_height, this->avs->resize_y);
-			uint acs_height = ComputeMaxSize(this->acs->smallest_y, given_height, this->acs->resize_y);
+			uint avs_height = ComputeMaxSize(this->avs->smallest_y, given_height, this->avs->GetVerticalStepSize(sizing));
+			uint acs_height = ComputeMaxSize(this->acs->smallest_y, given_height, this->acs->GetVerticalStepSize(sizing));

 			/* Assign size and position to the childs. */
 			if (rtl) {
@@ -1437,10 +1433,9 @@ public:
 			uint min_acs_height = this->acs->smallest_y + this->acs->padding_top + this->acs->padding_bottom;
 			uint extra_height = given_height - min_acs_height - min_avs_height;

-			/* Never use fill_y on these; instead use the INTER_LIST_SPACING as filler */
-			uint avs_height = ComputeMaxSize(this->avs->smallest_y, this->avs->smallest_y + extra_height / 2, this->avs->resize_y);
+			uint avs_height = ComputeMaxSize(this->avs->smallest_y, this->avs->smallest_y + extra_height / 2, this->avs->GetVerticalStepSize(sizing));
 			if (this->editable) extra_height -= avs_height - this->avs->smallest_y;
-			uint acs_height = ComputeMaxSize(this->acs->smallest_y, this->acs->smallest_y + extra_height, this->acs->resize_y);
+			uint acs_height = ComputeMaxSize(this->acs->smallest_y, this->acs->smallest_y + extra_height, this->acs->GetVerticalStepSize(sizing));

 			/* Assign size and position to the childs. */
 			if (rtl) {
@@ -1448,16 +1443,20 @@ public:
 				this->inf->AssignSizePosition(sizing, x, y + this->inf->padding_top, inf_width, inf_height, rtl);
 				x += inf_width + this->inf->padding_right + INTER_COLUMN_SPACING;

-				this->acs->AssignSizePosition(sizing, x + this->acs->padding_left, y + this->acs->padding_top, acs_width, acs_height, rtl);
+				uint ypos = y + this->acs->padding_top;
+				this->acs->AssignSizePosition(sizing, x + this->acs->padding_left, ypos, acs_width, acs_height, rtl);
 				if (this->editable) {
-					this->avs->AssignSizePosition(sizing, x + this->avs->padding_left, y + given_height - avs_height - this->avs->padding_bottom, avs_width, avs_height, rtl);
+					ypos += acs_height + this->acs->padding_bottom + INTER_LIST_SPACING + this->avs->padding_top;
+					this->avs->AssignSizePosition(sizing, x + this->avs->padding_left, ypos, avs_width, avs_height, rtl);
 				} else {
 					this->avs->AssignSizePosition(sizing, 0, 0, this->avs->smallest_x, this->avs->smallest_y, rtl);
 				}
 			} else {
-				this->acs->AssignSizePosition(sizing, x + this->acs->padding_left, y + this->acs->padding_top, acs_width, acs_height, rtl);
+				uint ypos = y + this->acs->padding_top;
+				this->acs->AssignSizePosition(sizing, x + this->acs->padding_left, ypos, acs_width, acs_height, rtl);
 				if (this->editable) {
-					this->avs->AssignSizePosition(sizing, x + this->avs->padding_left, y + given_height - avs_height - this->avs->padding_bottom, avs_width, avs_height, rtl);
+					ypos += acs_height + this->acs->padding_bottom + INTER_LIST_SPACING + this->avs->padding_top;
+					this->avs->AssignSizePosition(sizing, x + this->avs->padding_left, ypos, avs_width, avs_height, rtl);
 				} else {
 					this->avs->AssignSizePosition(sizing, 0, 0, this->avs->smallest_x, this->avs->smallest_y, rtl);
 				}
@@ -371,9 +371,7 @@ struct UnmappedChoiceList : ZeroedMemoryAllocator {
 			for (int i = 0; i < count; i++) {
 				int idx = (this->type == SCC_GENDER_LIST ? lm->GetReverseMapping(i, true) : i + 1);
 				const char *str = this->strings[this->strings.Contains(idx) ? idx : 0];
-				/* Limit the length of the string we copy to 0xFE. The length is written above
-				 * as a byte and we need room for the final '\0'. */
-				size_t len = min(0xFE, strlen(str));
+				size_t len = strlen(str);
 				memcpy(d, str, len);
 				d += len;
 				*d++ = '\0';
@@ -385,14 +383,13 @@ struct UnmappedChoiceList : ZeroedMemoryAllocator {

 /**
 * Translate TTDPatch string codes into something OpenTTD can handle (better).
- * @param grfid          The (NewGRF) ID associated with this string
- * @param language_id    The (NewGRF) language ID associated with this string.
- * @param allow_newlines Whether newlines are allowed in the string or not.
- * @param str            The string to translate.
- * @param [out] olen     The length of the final string.
+ * @param grfid       The (NewGRF) ID associated with this string
+ * @param language_id The (NewGRF) language ID associated with this string.
+ * @param str         The string to translate.
+ * @param [out] olen  The length of the final string.
 * @return The translated string.
 */
-char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newlines, const char *str, int *olen)
+char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, const char *str, int *olen)
 {
 	char *tmp = MallocT<char>(strlen(str) * 10 + 1); // Allocate space to allow for expansion
 	char *d = tmp;
@@ -431,13 +428,7 @@ char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newline
 				*d++ = *str++;
 				break;
 			case 0x0A: break;
-			case 0x0D:
-				if (allow_newlines) {
-					*d++ = 0x0A;
-				} else {
-					grfmsg(1, "Detected newline in string that does not allow one");
-				}
-				break;
+			case 0x0D: *d++ = 0x0A; break;
 			case 0x0E: d += Utf8Encode(d, SCC_TINYFONT); break;
 			case 0x0F: d += Utf8Encode(d, SCC_BIGFONT); break;
 			case 0x1F:
@@ -646,14 +637,13 @@ void AddGRFTextToList(GRFText **list, GRFText *text_to_add)
 * @param list The list where the text should be added to.
 * @param langid The language of the new text.
 * @param grfid The grfid where this string is defined.
- * @param allow_newlines Whether newlines are allowed in this string.
 * @param text_to_add The text to add to the list.
 * @note All text-codes will be translated.
 */
-void AddGRFTextToList(struct GRFText **list, byte langid, uint32 grfid, bool allow_newlines, const char *text_to_add)
+void AddGRFTextToList(struct GRFText **list, byte langid, uint32 grfid, const char *text_to_add)
 {
 	int len;
-	char *translatedtext = TranslateTTDPatchCodes(grfid, langid, allow_newlines, text_to_add, &len);
+	char *translatedtext = TranslateTTDPatchCodes(grfid, langid, text_to_add, &len);
 	GRFText *newtext = GRFText::New(langid, translatedtext, len);
 	free(translatedtext);

@@ -690,7 +680,7 @@ GRFText *DuplicateGRFText(GRFText *orig)
 /**
 * Add the new read string into our structure.
 */
-StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool new_scheme, bool allow_newlines, const char *text_to_add, StringID def_string)
+StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool new_scheme, const char *text_to_add, StringID def_string)
 {
 	char *translatedtext;
 	uint id;
@@ -706,9 +696,9 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne
 			langid_to_add = GRFLX_ENGLISH;
 		} else {
 			StringID ret = STR_EMPTY;
-			if (langid_to_add & GRFLB_GERMAN)  ret = AddGRFString(grfid, stringid, GRFLX_GERMAN,  true, allow_newlines, text_to_add, def_string);
-			if (langid_to_add & GRFLB_FRENCH)  ret = AddGRFString(grfid, stringid, GRFLX_FRENCH,  true, allow_newlines, text_to_add, def_string);
-			if (langid_to_add & GRFLB_SPANISH) ret = AddGRFString(grfid, stringid, GRFLX_SPANISH, true, allow_newlines, text_to_add, def_string);
+			if (langid_to_add & GRFLB_GERMAN)  ret = AddGRFString(grfid, stringid, GRFLX_GERMAN,  true, text_to_add, def_string);
+			if (langid_to_add & GRFLB_FRENCH)  ret = AddGRFString(grfid, stringid, GRFLX_FRENCH,  true, text_to_add, def_string);
+			if (langid_to_add & GRFLB_SPANISH) ret = AddGRFString(grfid, stringid, GRFLX_SPANISH, true, text_to_add, def_string);
 			return ret;
 		}
 	}
@@ -723,7 +713,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne
 	if (id == lengthof(_grf_text)) return STR_EMPTY;

 	int len;
-	translatedtext = TranslateTTDPatchCodes(grfid, langid_to_add, allow_newlines, text_to_add, &len);
+	translatedtext = TranslateTTDPatchCodes(grfid, langid_to_add, text_to_add, &len);

 	GRFText *newtext = GRFText::New(langid_to_add, translatedtext, len);

@@ -19,16 +19,16 @@
 /** This character, the thorn ('þ'), indicates a unicode string to NFO. */
 static const WChar NFO_UTF8_IDENTIFIER = 0x00DE;

-StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid, bool new_scheme, bool allow_newlines, const char *text_to_add, StringID def_string);
+StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid, bool new_scheme, const char *text_to_add, StringID def_string);
 StringID GetGRFStringID(uint32 grfid, uint16 stringid);
 const char *GetGRFStringFromGRFText(const struct GRFText *text);
 const char *GetGRFStringPtr(uint16 stringid);
 void CleanUpStrings();
 void SetCurrentGrfLangID(byte language_id);
-char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newlines, const char *str, int *olen = NULL);
+char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, const char *str, int *olen = NULL);
 struct GRFText *DuplicateGRFText(struct GRFText *orig);
 void AddGRFTextToList(struct GRFText **list, struct GRFText *text_to_add);
-void AddGRFTextToList(struct GRFText **list, byte langid, uint32 grfid, bool allow_newlines, const char *text_to_add);
+void AddGRFTextToList(struct GRFText **list, byte langid, uint32 grfid, const char *text_to_add);
 void AddGRFTextToList(struct GRFText **list, const char *text_to_add);
 void CleanUpGRFText(struct GRFText *grftext);

@@ -205,9 +205,7 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 		/* Owned land is special as it can be placed on any slope. */
 		cost.AddCost(DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR));
 	} else {
-		/* Check the surface to build on. At this time we can't actually execute the
-		 * the CLEAR_TILE commands since the newgrf callback later on can check
-		 * some information about the tiles. */
+		/* Check the surface to build on. */
 		bool allow_water = (spec->flags & (OBJECT_FLAG_BUILT_ON_WATER | OBJECT_FLAG_NOT_ON_LAND)) != 0;
 		bool allow_ground = (spec->flags & OBJECT_FLAG_NOT_ON_LAND) == 0;
 		TILE_AREA_LOOP(t, ta) {
@@ -216,7 +214,7 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 				if (!IsWaterTile(t)) {
 					/* Normal water tiles don't have to be cleared. For all other tile types clear
 					 * the tile but leave the water. */
-					cost.AddCost(DoCommand(t, 0, 0, flags & ~DC_NO_WATER & ~DC_EXEC, CMD_LANDSCAPE_CLEAR));
+					cost.AddCost(DoCommand(t, 0, 0, flags & ~DC_NO_WATER, CMD_LANDSCAPE_CLEAR));
 				} else {
 					/* Can't build on water owned by another company. */
 					Owner o = GetTileOwner(t);
@@ -225,7 +223,7 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			} else {
 				if (!allow_ground) return_cmd_error(STR_ERROR_MUST_BE_BUILT_ON_WATER);
 				/* For non-water tiles, we'll have to clear it before building. */
-				cost.AddCost(DoCommand(t, 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR));
+				cost.AddCost(DoCommand(t, 0, 0, flags, CMD_LANDSCAPE_CLEAR));
 			}
 		}

@@ -246,20 +244,6 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 				return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 			}
 		}
-
-		if (flags & DC_EXEC) {
-			/* This is basically a copy of the loop above with the exception that we now
-			 * execute the commands and don't check for errors, since that's already done. */
-			TILE_AREA_LOOP(t, ta) {
-				if (HasTileWaterGround(t)) {
-					if (!IsWaterTile(t)) {
-						DoCommand(t, 0, 0, (flags & ~DC_NO_WATER) | DC_NO_MODIFY_TOWN_RATING, CMD_LANDSCAPE_CLEAR);
-					}
-				} else {
-					DoCommand(t, 0, 0, flags | DC_NO_MODIFY_TOWN_RATING, CMD_LANDSCAPE_CLEAR);
-				}
-			}
-		}
 	}
 	if (cost.Failed()) return cost;

@@ -16,7 +16,6 @@
 #include "network/network_func.h"
 #include "order_backup.h"
 #include "vehicle_base.h"
-#include "window_func.h"

 OrderBackupPool _order_backup_pool("BackupOrder");
 INSTANTIATE_POOL_METHODS(OrderBackup)
@@ -85,8 +84,6 @@ void OrderBackup::DoRestore(Vehicle *v)
 	} else if (this->orders != NULL && OrderList::CanAllocateItem()) {
 		v->orders.list = new OrderList(this->orders, v);
 		this->orders = NULL;
-		/* Make sure buoys/oil rigs are updated in the station list. */
-		InvalidateWindowClassesData(WC_STATION_LIST, 0);
 	}

 	uint num_orders = v->GetNumOrders();
@@ -51,7 +51,7 @@ public:
 	uint16 travel_time;  ///< How long in ticks the journey to this destination should take.

 	Order() : refit_cargo(CT_NO_REFIT) {}
-	~Order();
+	~Order() {}

 	Order(uint32 packed);

@@ -41,19 +41,6 @@ INSTANTIATE_POOL_METHODS(Order)
 OrderListPool _orderlist_pool("OrderList");
 INSTANTIATE_POOL_METHODS(OrderList)

-/** Clean everything up. */
-Order::~Order()
-{
-	if (CleaningPool()) return;
-
-	/* We can visit oil rigs and buoys that are not our own. They will be shown in
-	 * the list of stations. So, we need to invalidate that window if needed. */
-	if (this->IsType(OT_GOTO_STATION) || this->IsType(OT_GOTO_WAYPOINT)) {
-		BaseStation *bs = BaseStation::GetIfValid(this->GetDestination());
-		if (bs != NULL && bs->owner == OWNER_NONE) InvalidateWindowClassesData(WC_STATION_LIST, 0);
-	}
-}
-
 /**
 * 'Free' the order
 * @note ONLY use on "current_order" vehicle orders!
@@ -380,14 +367,6 @@ void OrderList::InsertOrderAt(Order *new_order, int index)
 	++this->num_orders;
 	if (!new_order->IsType(OT_IMPLICIT)) ++this->num_manual_orders;
 	this->timetable_duration += new_order->wait_time + new_order->travel_time;
-
-	/* We can visit oil rigs and buoys that are not our own. They will be shown in
-	 * the list of stations. So, we need to invalidate that window if needed. */
-	if (new_order->IsType(OT_GOTO_STATION) || new_order->IsType(OT_GOTO_WAYPOINT)) {
-		BaseStation *bs = BaseStation::Get(new_order->GetDestination());
-		if (bs->owner == OWNER_NONE) InvalidateWindowClassesData(WC_STATION_LIST, 0);
-	}
-
 }


@@ -29,14 +29,6 @@
 #define MAC_OS_X_VERSION_10_6 1060
 #endif

-#ifndef MAC_OS_X_VERSION_10_7
-#define MAC_OS_X_VERSION_10_7 1070
-#endif
-
-#ifndef MAC_OS_X_VERSION_10_8
-#define MAC_OS_X_VERSION_10_8 1080
-#endif
-

 /** Helper function displaying a message the best possible way. */
 void ShowMacDialog(const char *title, const char *message, const char *button_label);
--- a/Show More
+++ b/Show More