(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
authorludde
Fri, 15 Jul 2005 14:53:44 +0000
changeset 2063 95259a31ceb5
parent 2062 00f7d339fdcb
child 2064 c889fcc76398
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
- Feature: [strgen] Allow changing the order of parameters in translated strings.
- Use {1:TOWN} syntax to set the order.
- Codechange: [strgen] Rewrote lots of strgen internals.
economy.c
graph_gui.c
industry_gui.c
lang/american.txt
lang/brazilian_portuguese.txt
lang/catalan.txt
lang/czech.txt
lang/danish.txt
lang/dutch.txt
lang/english.txt
lang/finnish.txt
lang/french.txt
lang/galician.txt
lang/german.txt
lang/hungarian.txt
lang/icelandic.txt
lang/italian.txt
lang/latvian.txt
lang/lithuanian.txt
lang/norwegian.txt
lang/polish.txt
lang/portuguese.txt
lang/romanian.txt
lang/slovak.txt
lang/spanish.txt
lang/swedish.txt
misc.c
misc_gui.c
strgen/strgen.c
strings.c
strings.h
town_gui.c
--- a/economy.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/economy.c	Fri Jul 15 14:53:44 2005 +0000
@@ -807,23 +807,20 @@
 			SetDParam(1, STR_2029);
 			i = GetIndustry(s->from);
 			tile = i->xy;
-			SetDParam(2, i->town->townnametype);
-			SetDParam(3, i->town->townnameparts);
-
-			SetDParam(4, i->type + STR_4802_COAL_MINE);
+			SetDParam(2, i->town->index);
+			SetDParam(3, i->type + STR_4802_COAL_MINE);
 
 			if (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD) {
-				SetDParam(5, STR_2029);
+				SetDParam(4, STR_2029);
 				i = GetIndustry(s->to);
 				tile2 = i->xy;
-				SetDParam(8, i->type + STR_4802_COAL_MINE);
-				SetDParam(6, i->town->townnametype);
-				SetDParam(7, i->town->townnameparts);
+				SetDParam(5, i->town->index);
+				SetDParam(6, i->type + STR_4802_COAL_MINE);
 			} else {
 				t = GetTown(s->to);
 				tile2 = t->xy;
-				SetDParam(5, t->townnametype);
-				SetDParam(6, t->townnameparts);
+				SetDParam(4, t->townnametype);
+				SetDParam(5, t->townnameparts);
 			}
 		} else {
 			t = GetTown(s->from);
@@ -833,8 +830,8 @@
 
 			t = GetTown(s->to);
 			tile2 = t->xy;
-			SetDParam(3, t->townnametype);
-			SetDParam(4, t->townnameparts);
+			SetDParam(4, t->townnametype);
+			SetDParam(5, t->townnameparts);
 		}
 	} else {
 		st = GetStation(s->from);
--- a/graph_gui.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/graph_gui.c	Fri Jul 15 14:53:44 2005 +0000
@@ -838,19 +838,12 @@
 
 		i = 0;
 		do {
-			SetDParam(0, i + 1 + STR_01AB);
+			SetDParam(0, i + STR_01AC_1ST);
 			p = plist[i];
 			SetDParam(1, p->name_1);
 			SetDParam(2, p->name_2);
-
 			SetDParam(3, GetPlayerNameString(p->index, 4));
-			/*	WARNING ugly hack!
-					GetPlayerNameString sets up (Player #) if the player is human in an extra DPARAM16
-					It seems that if player is non-human, nothing is set up, so param is 0. GetString doesn't like
-					that because there is another param after it.
-					So we'll just shift the rating one back if player is AI and all is fine
-				*/
-			SetDParam((IS_HUMAN_PLAYER(p->index) ? 5 : 4), GetPerformanceTitleFromValue(p->old_economy[1].performance_history));
+			SetDParam(5, GetPerformanceTitleFromValue(p->old_economy[1].performance_history));
 
 			DrawString(2, 15 + i * 10, i == 0 ? STR_7054 : STR_7055, 0);
 			DrawPlayerIcon(p->index, 27, 16 + i * 10);
--- a/industry_gui.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/industry_gui.c	Fri Jul 15 14:53:44 2005 +0000
@@ -304,6 +304,7 @@
 
 			SetDParam(1, i->total_production[0]);
 			SetDParam(0, _cargoc.names_long_s[i->produced_cargo[0]] + ((i->total_production[0]!=1)<<5));
+
 			SetDParam(2, i->pct_transported[0] * 100 >> 8);
 			DrawString(4 + (NEED_ALTERB ? 30 : 0), 127, STR_482B_TRANSPORTED, 0);
 			// Let's put out those buttons..
--- a/lang/american.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/american.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Flat land required
 STR_0008_WAITING                                                :{BLACK}Waiting: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (en-route from
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (en-route from
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepts: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepts: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Map - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Game Options
 STR_00B2_MESSAGE                                                :{YELLOW}Message
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message from {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message from {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Can't do this....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Can't clear this area....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (miles)
 STR_013A_METRIC_KILOMETERS                                      :Metric (kilometers)
-STR_013B_OWNED_BY                                               :{WHITE}...owned by {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...owned by {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Cargo
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Capacities
 STR_013E_TOTAL_CARGO                                            :{BLACK}Total Cargo
-STR_013F_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total cargo (capacity) of this train:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}New Game
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pause game
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Save game, quit game, quit
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Display list of company's stations
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost to clear: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Owner: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Local authority: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Owner: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Local authority: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :None
 STR_01AA_NAME                                                   :{BLACK}Name
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Select Tutorial/Demonstration
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Track{SETX 88}Title
 STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Music Program Selection
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Track Index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Clear
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Setting for all messagetypes (off/summary/full)
 STR_MESSAGE_SOUND                                               :{YELLOW}Play sound for summarized newsmessages
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...too far from previous destination
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUMU16}{}({STRING} Level)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUM}{}({STRING} Level)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Businessman
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon of the Century
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} achieves '{STRING}' status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} of {STRING} achieves '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Select town size
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Town size:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Show last message or news report
 STR_OFF                                                         :Off
 STR_SUMMARY                                                     :Summary
 STR_FULL                                                        :Full
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Town directory
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Vehicle design names
 STR_02BD                                                        :{BLACK}{STRING}
@@ -994,88 +990,88 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Off
 STR_CONFIG_PATCHES_ON                                           :On
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Show vehicle speed in status bar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Allow removal of more town-owned roads, bridges, etc: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Enable building very long trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING} {LTBLUE} (requires NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Allow building very long bridges: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Allow goto depot orders: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Allow constructing raw material producing industries: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing the local authority: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}New depot finding: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}New algorithm for train pathfinding: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}New global pathfinding (NPF, overrides NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Show vehicle speed in status bar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Allow removal of more town-owned roads, bridges, etc: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Enable building very long trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING1} {LTBLUE} (requires NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Allow building very long bridges: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Allow goto depot orders: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Allow constructing raw material producing industries: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing the local authority: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}New depot finding: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}New algorithm for train pathfinding: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}New global pathfinding (NPF, overrides NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Always allow small airports: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Always allow small airports: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A train is lost if no progress is made for: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A train is lost if no progress is made for: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}A train is lost if no progress is made for: {ORANGE}disabled
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :no
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :yes, but exclude stopped vehicles
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :of all vehicles
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warn if a train's income is negative: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehicles never expire: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warn if a train's income is negative: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehicles never expire: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autorenew vehicle when it gets old
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenew when vehice is {ORANGE}{STRING}{LTBLUE} months before/after max age
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duration of error message: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snow line height: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station spread: {ORANGE}{STRING} {RED}Warning: High setting slows game
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trains per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aircraft per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max ships per player: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenew when vehice is {ORANGE}{STRING1}{LTBLUE} months before/after max age
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duration of error message: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snow line height: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station spread: {ORANGE}{STRING1} {RED}Warning: High setting slows game
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disable trains for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trains per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aircraft per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max ships per player: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disable trains for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Default service interval for trains: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Default service interval for road vehicles: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Default service interval for aircraft: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Default service interval for ships: {ORANGE}disabled
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Colored news appears in: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}End game in: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Colored news appears in: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}End game in: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Enable smooth economy (more, smaller changes)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Allow buying shares from other companies
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging place signals every: {ORANGE}{STRING} tile(s)
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging place signals every: {ORANGE}{STRING1} tile(s)
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Left
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centre
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Right
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Window snap radius: {ORANGE}disabled
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1086,7 +1082,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competitors
 
 STR_CONFIG_PATCHES_DISABLED                                     :disabled
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Change setting value
@@ -1102,13 +1098,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetplanes will not crash (frequently) on small airports: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Switch climate: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Change date: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable modifying production values: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable modifying production values: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Heading for {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
@@ -1162,7 +1158,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... buoy is in use!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Can't convert railtype here...
@@ -1200,19 +1196,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construct Sugar Mine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Refit train to carry a different cargo type
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Refit)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Refit train
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for train to carry
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Refit train to carry highlighted cargo type
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Can't refit train...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Change production
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Welcome to this new AI, in progress. You can expect problems. When you do, make a screenshot and post it at the forum. Enjoy!
@@ -1251,7 +1246,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
@@ -1320,14 +1315,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Company value:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Players:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connecting...
@@ -1343,8 +1338,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Fetching game info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching company info..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(s) in front of us
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes downloaded so far
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) in front of us
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes downloaded so far
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
 
@@ -1362,7 +1357,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Could not load server-savegame.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Could not start the server.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Could not connect.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUMU16} timed out.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUM} timed out.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} We made a protocol-error and our connection is closed.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} The revision of this client does not match the revision of the server.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Wrong password.
@@ -1415,8 +1410,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-size of map: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-size of map: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-size of map: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-size of map: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cost: {CURRENCY}
@@ -1511,10 +1506,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Towns
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Building must be demolished first
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
@@ -1547,23 +1542,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Show information on local authority
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} local authority
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transport company ratings:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidies
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidies on offer for services taking:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING} to {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING2} to {STRING2}
 STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}None
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidised:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, until {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING2} to {STRING2} will now not attract a subsidy.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidised.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING} to {STRING} will attract a year's subsidy from the local authority!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay triple rates for the next year!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay quadruple rates for the next year!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING2} to {STRING2} will attract a year's subsidy from the local authority!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay triple rates for the next year!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay quadruple rates for the next year!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} local authority refuses to allow another airport to be built in this town
 STR_2036_COTTAGES                                               :Cottages
 STR_2037_HOUSES                                                 :Houses
@@ -1597,7 +1592,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {COMPANY} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
@@ -1615,7 +1610,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Can't plant tree here...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...too many signs
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Can't place sign here...
 STR_280A_SIGN                                                   :Sign
@@ -1639,7 +1633,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Too many bus stops
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Too many truck stations
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Too close to another station/loading area
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Must demolish railroad station first
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Too close to another airport
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Must demolish airport first
@@ -1672,8 +1666,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Too close to another truck station
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish truck station first
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stations
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- None -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Too close to another dock
@@ -1694,7 +1688,7 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolitan airport
 STR_305AB_LARGE                                                 :{BLACK}International airport
 STR_305B_SIZE                                                   :{BLACK}Size
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Railroad station
 STR_305F_AIRCRAFT_HANGAR                                        :Aircraft hangar
 STR_3060_AIRPORT                                                :Airport
@@ -1727,7 +1721,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Load Game
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed
@@ -1789,7 +1783,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transported)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transported)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Center the main view on industry location
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}New {STRING} under construction near {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}New {STRING} being planted near {TOWN}!
@@ -1869,45 +1863,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Unnamed{SKIP}
+STR_SV_UNNAMED                                                  :Unnamed
 STR_SV_TRAIN_NAME                                               :Train {COMMA}
 STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA}
 STR_SV_SHIP_NAME                                                :Ship {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} North
-STR_SV_STNAME_SOUTH                                             :{STRING} South
-STR_SV_STNAME_EAST                                              :{STRING} East
-STR_SV_STNAME_WEST                                              :{STRING} West
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :{STRING} Halt
-STR_SV_STNAME_VALLEY                                            :{STRING} Valley
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Heights
-STR_SV_STNAME_WOODS                                             :{STRING} Woods
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Lakeside
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Exchange
-STR_SV_STNAME_AIRPORT                                           :{STRING} Airport
-STR_SV_STNAME_OILFIELD                                          :{STRING} Oilfield
-STR_SV_STNAME_MINES                                             :{STRING} Mines
-STR_SV_STNAME_DOCKS                                             :{STRING} Docks
-STR_SV_STNAME_BUOY_1                                            :{STRING} Buoy 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Buoy 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Buoy 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Buoy 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Buoy 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Buoy 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Buoy 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Buoy 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Buoy 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annexe
-STR_SV_STNAME_SIDINGS                                           :{STRING} Sidings
-STR_SV_STNAME_BRANCH                                            :{STRING} Branch
-STR_SV_STNAME_UPPER                                             :Upper {STRING}
-STR_SV_STNAME_LOWER                                             :Lower {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Forest
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} North
+STR_SV_STNAME_SOUTH                                             :{STRING1} South
+STR_SV_STNAME_EAST                                              :{STRING1} East
+STR_SV_STNAME_WEST                                              :{STRING1} West
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :{STRING1} Halt
+STR_SV_STNAME_VALLEY                                            :{STRING1} Valley
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Heights
+STR_SV_STNAME_WOODS                                             :{STRING1} Woods
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Lakeside
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Exchange
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Airport
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Oilfield
+STR_SV_STNAME_MINES                                             :{STRING1} Mines
+STR_SV_STNAME_DOCKS                                             :{STRING1} Docks
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Buoy 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Buoy 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Buoy 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Buoy 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Buoy 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Buoy 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Buoy 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Buoy 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Buoy 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annexe
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Sidings
+STR_SV_STNAME_BRANCH                                            :{STRING1} Branch
+STR_SV_STNAME_UPPER                                             :Upper {STRING1}
+STR_SV_STNAME_LOWER                                             :Lower {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Forest
 
 ############ end of	savegame specific region!
 
@@ -1986,7 +1980,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Player {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}New Face
 STR_7005_COLOR_SCHEME                                           :{BLACK}Color Scheme
@@ -1998,9 +1992,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :President's Name
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Can't change company name...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Can't change president's name...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finances {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finances {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Expenditure/Income
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construction
 STR_7012_NEW_VEHICLES                                           :{GOLD}New Vehicles
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Train Running Costs
@@ -2017,7 +2011,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Income Graph
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2042,8 +2036,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Click on selected new color scheme
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Increase size of loan
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Repay part of loan
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(President)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
@@ -2071,18 +2065,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Company performance ratings (maximum rating=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Company values
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Company League Table
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transport company in trouble!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} will be sold off or declared bankrupt unless performance increases soon!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(President)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} will be sold off or declared bankrupt unless performance increases soon!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(President)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transport company merger!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} has been sold to {STRING} for {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We are looking for a transport company to take-over our company{}{}Do you want to purchase {STRING} for {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} has been sold to {COMPANY} for {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We are looking for a transport company to take-over our company{}{}Do you want to purchase {COMPANY} for {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrupt!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} has been closed down by creditors and all assets sold off!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} has been closed down by creditors and all assets sold off!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}New transport company launched!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} starts construction near {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} starts construction near {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Can't buy company...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Cargo Payment Rates
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Days in transit
@@ -2117,9 +2111,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sell 25% share in this company
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Can't buy 25% share in this company...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {STRING}{}   {COMMA}% owned by {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} has been taken over by {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {COMPANY}{}   {COMMA}% owned by {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}This company does not trade shares yet...
 
 ##id 0x8000
@@ -2391,10 +2385,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Train Depot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Go to {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service at {TOWN} Train Depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Go non-stop to {TOWN} Train Depot
@@ -2414,7 +2408,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train too long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trains can only be altered when stopped inside a depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2426,14 +2420,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Go To
 STR_8827_FULL_LOAD                                              :{BLACK}Full Load
 STR_8828_UNLOAD                                                 :{BLACK}Unload
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Orders)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - End of Orders - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Service
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Can't build railroad vehicle...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Value: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Loading / Unloading
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Train must be stopped inside depot
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Can't send train to depot...
@@ -2482,9 +2476,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Weight: {LTBLUE}{COMMA}t  {BLACK}Power: {LTBLUE}{COMMA}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
@@ -2505,8 +2499,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Road Vehicles
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Road Vehicles
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Road Vehicle Depot
 STR_9004_NEW_VEHICLES                                           :{BLACK}New Vehicles
 STR_9005_INFORMATION                                            :{BLACK}Information
@@ -2514,14 +2508,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Build Vehicle
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Can't build road vehicle...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Must build road vehicle depot first
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...must be stopped inside a road vehicle depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Can't sell road vehicle...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Can't stop/start road vehicle...
@@ -2546,7 +2539,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Build the highlighted road vehicle
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}New road vehicle now available!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Speed: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Speed: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name road vehicle
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Can't name road vehicle...
@@ -2569,7 +2562,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ship Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}New Ships
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Ships
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Ships
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Can't build ships...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Must build ship depot first
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2578,15 +2571,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Can't sell ship...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Can't build ship...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Ship in the way
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Can't stop/start ship...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Can't send ship to depot...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Unable to find local depot
@@ -2610,7 +2602,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Show ship details
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}New ship now available!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING}{}Running Cost: {CURRENCY}/yr
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING1}{}Running Cost: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Name ship
 
 STR_9831_NAME_SHIP                                              :{WHITE}Name ship
@@ -2623,12 +2615,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Rename ship type
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Can't rename ship type...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Refit cargo ship to carry a different cargo type
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_983C_REFIT_SHIP                                             :{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Refit ship to carry highlighted cargo type
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
 STR_GO_TO_SHIP_DEPOT                                            :Go to {TOWN} Ship Depot
@@ -2643,15 +2635,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Build Aircraft
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Can't build aircraft...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aircraft
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aircraft
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Can't send aircraft to hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Heading for {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Heading for {STATION} Hangar, {VELOCITY}
@@ -2660,8 +2652,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Can't stop/start aircraft...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aircraft is in flight
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Must build airport first
-STR_A019_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aircraft must be stopped in hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Can't sell aircraft...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Airport construction
@@ -2696,12 +2688,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Rename aircraft type
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Can't rename aircraft type...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry a different cargo type
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Refit aircraft
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for aircraft to carry
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry highlighted cargo type
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
 STR_A043_REFITTABLE                                             :(refittable)
 STR_GO_TO_AIRPORT_HANGAR                                        :Go to {STATION} Hangar
@@ -2725,8 +2717,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehicles:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stations:
@@ -2763,7 +2755,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Switch to Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Switch to Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Switch to Euro: {ORANGE}never
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Preview: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Change custom currency parameter
@@ -2813,11 +2805,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Running Cost: {GOLD}{CURRENCY}/yr
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUMU16}{BLACK} Life: {GOLD}{COMMA} years
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUM}{BLACK} Life: {GOLD}{COMMA} years
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Speed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{COMMA} passengers, {COMMA} bags of mail
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{COMMA}hp{BLACK} Weight: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{COMMA}hp{BLACK} Weight: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/brazilian_portuguese.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/brazilian_portuguese.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}É necessário terreno plano
 STR_0008_WAITING                                                :{BLACK}Aguardando: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (em rota de
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (em rota de
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Aceita: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Aceita: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opções do Jogo
 STR_00B2_MESSAGE                                                :{YELLOW}Mensagem
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensagem de {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensagem de {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Não é possível fazer isto....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Não é possível limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (milhas)
 STR_013A_METRIC_KILOMETERS                                      :Métrico (quilômetros)
-STR_013B_OWNED_BY                                               :{WHITE}...propriedade de {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...propriedade de {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Informação
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
-STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidade) deste trem:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Novo Jogo
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pausar o jogo
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Salvar jogo, abandonar jogo, sair
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostrar lista de estações da empresa
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Custo para limpar: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Custo para limpar: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
-STR_01A7_OWNER                                                  :{BLACK}Proprietário: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Proprietário: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Nenhum
 STR_01AA_NAME                                                   :{BLACK}Nome
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Selecionar Tutorial/Demonstração
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceita: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Carga aceita: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Carga aceita: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Carga aceita: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceita: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceita: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}'{STRING}'
+STR_01E7                                                        :{DKGREEN}{TINYFONT}'{STRING1}'
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Faixa{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Embaralhar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programação Musical
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} '{STRING}'
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   '{STRING}'
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} '{STRING1}'
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   '{STRING1}'
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de faixas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Limpar
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Configurações para todos os tipos de mensagem(on/off/resumo)
 STR_MESSAGE_SOUND                                               :{YELLOW}Tocar som para notícias resumidas
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Muito distante do destino anterior
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de companhias que chegaram a {NUMU16}{}({STRING} Nivél)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela da Liga de Companhias em {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de companhias que chegaram a {NUM}{}({STRING} Nivél)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela da Liga de Companhias em {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Negociante
 STR_0214_ENTREPRENEUR                                           :Empresário
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnata
 STR_0218_MOGUL                                                  :Grande magnata
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnata do século
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} conquista '{STRING}' desempenho!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} conquista '{STRING}' desempenho!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} conquista '{STRING}' desempenho!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista '{STRING}' desempenho!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Selecione o tamanho da cidade
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Tamanho da cidade:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Mostrar a última mensagem ou notícia
 STR_OFF                                                         :Off
 STR_SUMMARY                                                     :Resumo
 STR_FULL                                                        :Completo
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Lista de cidades
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nomes dos veículos
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Off
 STR_CONFIG_PATCHES_ON                                           :On
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar velocidade do veículo na barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permitir a construção em declives e encostas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir dimensionamento mais realista das áreas de abrangência: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permitir a remoção de mais estradas, pontes, etc. das cidades: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permitir a construção de trens muito longos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar aceleração realista para trens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Proibir trens e barcos de virar angulos de 90 graus: {ORANGE}{STRING} {LTBLUE} (requer NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Juntar estações ferroviárias construídas juntas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Deixar a estação quando uma das cargas estiver completa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflação: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar carga a uma estação só quando houver procura: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir a construção de pontes muito longas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permitir ordens de ir para o depósito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permitir construção de indústrias de matérias-primas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Indústrias do mesmo tipo podem ser construídas próximas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre a data completa na barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado da circulação: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar janela das finanças no fim do ano: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Função non-stop compatível com TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fila de veículos de estrada (com efeitos de quantidade): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o cursor está na borda do mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Novo sistema de localização de depósitos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estações não uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novo sistema para calcular rotas dos trens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Novo busca de caminho global (NPF, sobrepõe NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar velocidade do veículo na barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permitir a construção em declives e encostas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir dimensionamento mais realista das áreas de abrangência: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permitir a remoção de mais estradas, pontes, etc. das cidades: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permitir a construção de trens muito longos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar aceleração realista para trens: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Proibir trens e barcos de virar angulos de 90 graus: {ORANGE}{STRING1} {LTBLUE} (requer NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Juntar estações ferroviárias construídas juntas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Deixar a estação quando uma das cargas estiver completa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflação: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar carga a uma estação só quando houver procura: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir a construção de pontes muito longas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permitir ordens de ir para o depósito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permitir construção de indústrias de matérias-primas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Indústrias do mesmo tipo podem ser construídas próximas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre a data completa na barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado da circulação: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar janela das finanças no fim do ano: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Função non-stop compatível com TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fila de veículos de estrada (com efeitos de quantidade): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o cursor está na borda do mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Novo sistema de localização de depósitos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estações não uniformes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novo sistema para calcular rotas dos trens: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Novo busca de caminho global (NPF, sobrepõe NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Um trem está perdido se não houver progresso em: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Um trem está perdido se não houver progresso em: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Um trem está perdido se não houver progresso em: {ORANGE}Desativado
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :Não
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :Sim, mas excluir veículos parados
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :de todos os veículos
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar se o lucro de um trem for negativo: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Veículos nunca expiram: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar se o lucro de um trem for negativo: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Veículos nunca expiram: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Auto-renovação de veículos quando ficam velhos
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Auto-renovação do veículo {ORANGE}{STRING}{LTBLUE} meses antes/depois da idade máx.
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Dinheiro mínimo para fazer auto-renovação: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duração das mensagens de erro: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra população da cidade na janela da cidade: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árvores invisíveis (com edifícios transparentes): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitude da linha de neve: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Tamanho máx. de estações: {ORANGE}{STRING} {RED}Valores altos tornam o jogo lento!
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máximo de trens por jogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máximo de veículos de estrada por jogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Máximo de aeronaves por jogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Máximo de barcos por jogador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Auto-renovação do veículo {ORANGE}{STRING1}{LTBLUE} meses antes/depois da idade máx.
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Dinheiro mínimo para fazer auto-renovação: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duração das mensagens de erro: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra população da cidade na janela da cidade: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árvores invisíveis (com edifícios transparentes): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitude da linha de neve: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Tamanho máx. de estações: {ORANGE}{STRING1} {RED}Valores altos tornam o jogo lento!
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desativar trens para o computador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desativar veículos de estrada para o computador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desativar aeronaves para o computador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desativar barcos para o computador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máximo de trens por jogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máximo de veículos de estrada por jogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Máximo de aeronaves por jogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Máximo de barcos por jogador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Ativar nova IA (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desativar trens para o computador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desativar veículos de estrada para o computador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desativar aeronaves para o computador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desativar barcos para o computador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de serviço predefinido para trens: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Ativar nova IA (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de serviço predefinido para trens: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervalo de serviço predefinido para trens: {ORANGE}desativado
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de serviço predefinido para veículos de estrada: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de serviço predefinido para veículos de estrada: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Intervalo de serviço predefinido para veículos de estrada: {ORANGE}desactivado
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de serviço predefinido para aeronaves: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de serviço predefinido para aeronaves: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Intervalo de serviço predefinido para aeronaves: {ORANGE}desactivado
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de serviço predefinido para barcos: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de serviço predefinido para barcos: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalo de serviço predefinido para barcos: {ORANGE}desactivado
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desativar manutenção quando as avarias estão desativadas: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desativar manutenção quando as avarias estão desativadas: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Noticias coloridas aparecem em: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data de início: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Terminar jogo em: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Noticias coloridas aparecem em: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data de início: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Terminar jogo em: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Ativar economia regular (alterações menores)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permite comprar ações de outras companhias
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ao arrastar colocar sinais a cada: {ORANGE}{STRING} quadrado(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permitir colocação automática de sinais PBS: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posição da barra de ferramentas principal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ao arrastar colocar sinais a cada: {ORANGE}{STRING1} quadrado(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permitir colocação automática de sinais PBS: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posição da barra de ferramentas principal: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Esquerda
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centro
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Direita
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Raio de atração de janelas: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Raio de atração de janelas: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Raio de atração de janelas: {ORANGE}desativado
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Oponentes
 
 STR_CONFIG_PATCHES_DISABLED                                     :deactivado
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Alterar valor
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Atenção! Você está prestes a trair os seus oponentes. Saiba que isto ficará registrado para sempre.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Aviões a jato não irão ter acidentes em aeroportos pequenos: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Mudar de clima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Alterar data: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Dirigindo-se para {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Dirigindo-se para {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...boia está em uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Não é possível remover parte da estação...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Não é possível converter o tipo de linha aqui...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir Mina de Açúcar
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Adaptar trem para um tipo de carga diferente
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Adaptar)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Adaptar trem
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecione o tipo de carga do trem
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Adaptar trem para transportar a carga selecionada
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Não é possível adaptar o trem...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Os intervalos de serviço são em percentagem: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Os intervalos de serviço são em percentagem: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Bem-vindo à nova IA, ainda em desenvolvimento. Pode encontrar problemas. Neste caso faça uma captura de tela e coloque-a no fórum. Divirta-se!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data atual:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protegido por senha!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAÇÃO DA COMPANHIA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da empresa:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valor da Companhia: {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanço atual: {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veículos:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estações:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Veículos:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estações:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Jogadores: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Obtendo informações do jogo..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Obtendo informações da Companhia..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} cliente(s) à sua frente
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes obtidos até agora
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) à sua frente
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes obtidos até agora
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectar
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Não foi possível abrir o jogo.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Não foi possível iniciar o servidor
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Não foi possível estabelecer ligação
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tempo de espera esgotado na conexão #{NUMU16}.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tempo de espera esgotado na conexão #{NUM}.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Ocorreu um erro de protocolo e a conexão foi encerrada
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} A revisão deste cliente não condiz com a revisão do servidor
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Senha incorrecta
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-tamanho do mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-tamanho do mapa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-tamanho do mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-tamanho do mapa: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Custo: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}O edifício deve ser demolido primeiro
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}População: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Ver informações sobre a autoridade local
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} autoridade local
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Avaliações da companhia de transporte
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsídios
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta de subsídios para os serviços:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} para {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING2} para {STRING2}
 STR_2028_BY                                                     :{YELLOW} (por {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Nenhum
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Serviços já subsidiados:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, até {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} já não é subsidiado.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A oferta do subsídio expirou:{}{}{STRING} de {STRING2} para {STRING2} já não é subsidiado.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsídio retirado:{}{}serviço de transporte de {STRING} de {STATION} para {STATION} não é mais subsidiado.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsídio de ligação oferecido:{}{}Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá o subsídio de um ano da autoridade local!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará 50% extra durante o próximo ano!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará em dobro durante o próximo ano!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará o triplo durante o próximo ano!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará o quadruplo durante o próximo ano!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsídio de ligação oferecido:{}{}Primeiro serviço de {STRING} de {STRING2} para {STRING2} atrairá o subsídio de um ano da autoridade local!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará 50% extra durante o próximo ano!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará em dobro durante o próximo ano!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará o triplo durante o próximo ano!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará o quadruplo durante o próximo ano!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} a autoridade local não permite que outro aeroporto seja construído nesta cidade
 STR_2036_COTTAGES                                               :Casas de campo
 STR_2037_HOUSES                                                 :Casas
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}  Custo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e a carga usem somente estações da sua companhia.{} Custo: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {STRING} provoca 6 meses de miséria aos condutores!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {COMPANY} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (em construção)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...local impróprio
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Impossível plantar árvore aqui...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...muitos sinais
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Não pode colocar um sinal aqui...
 STR_280A_SIGN                                                   :Sinal
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Muitos pontos de ônibus
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Muitos locais de carga
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Muito perto de uma estação/local de carga
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Precisa de demolir a estação primeiro
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Muito perto de outro aeroporto
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Precisa de demolir o aeroporto primeiro
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Muito perto de outro local de carga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa de demolir o ponto de ônibus primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa de demolir o local de carga primeiro
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estações
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estações
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...local inadequado
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Muito perto de outra doca
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Aeroporto Metropolitano
 STR_305AB_LARGE                                                 :{BLACK}Aeroporto Internacional
 STR_305B_SIZE                                                   :{BLACK}Tamanho
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Estação ferroviária
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Aeroporto
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Abrir Jogo
 STR_4002_SAVE                                                   :{BLACK}Salvar
 STR_4003_DELETE                                                 :{BLACK}Apagar
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes livres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Não é possível ler unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Falha ao Salvar Jogo
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produção no mês passado:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centralizar visualização na localização da indústria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nova {STRING} em construção em {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nova {STRING} sendo plantada em {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Sem nome{SKIP}
+STR_SV_UNNAMED                                                  :Sem nome
 STR_SV_TRAIN_NAME                                               :Trem {COMMA}
 STR_SV_ROADVEH_NAME                                             :Veículo de Estrada {COMMA}
 STR_SV_SHIP_NAME                                                :Barco {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Norte
-STR_SV_STNAME_SOUTH                                             :{STRING} Sul
-STR_SV_STNAME_EAST                                              :{STRING} Leste
-STR_SV_STNAME_WEST                                              :{STRING} Oeste
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transporte
-STR_SV_STNAME_HALT                                              :{STRING} Paragem
-STR_SV_STNAME_VALLEY                                            :Vale de {STRING}
-STR_SV_STNAME_HEIGHTS                                           :Montes de {STRING}
-STR_SV_STNAME_WOODS                                             :Floresta de {STRING}
-STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING}
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Intercâmbio
-STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING}
-STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING}
-STR_SV_STNAME_MINES                                             :Minas de {STRING}
-STR_SV_STNAME_DOCKS                                             :Docas de {STRING}
-STR_SV_STNAME_BUOY_1                                            :{STRING} Bóia 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Bóia 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Bóia 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Bóia 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Bóia 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Bóia 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Bóia 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Bóia 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Bóia 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Anexo
-STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING}
-STR_SV_STNAME_BRANCH                                            :Ramal de {STRING}
-STR_SV_STNAME_UPPER                                             :{STRING} do norte
-STR_SV_STNAME_LOWER                                             :{STRING} do sul
-STR_SV_STNAME_HELIPORT                                          :Heliporto de {STRING}
-STR_SV_STNAME_FOREST                                            :Floresta de {STRING}
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Norte
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sul
+STR_SV_STNAME_EAST                                              :{STRING1} Leste
+STR_SV_STNAME_WEST                                              :{STRING1} Oeste
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transporte
+STR_SV_STNAME_HALT                                              :{STRING1} Paragem
+STR_SV_STNAME_VALLEY                                            :Vale de {STRING1}
+STR_SV_STNAME_HEIGHTS                                           :Montes de {STRING1}
+STR_SV_STNAME_WOODS                                             :Floresta de {STRING1}
+STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING1}
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Intercâmbio
+STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING1}
+STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING1}
+STR_SV_STNAME_MINES                                             :Minas de {STRING1}
+STR_SV_STNAME_DOCKS                                             :Docas de {STRING1}
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Bóia 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Bóia 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Bóia 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Bóia 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Bóia 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Bóia 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Bóia 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Bóia 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Bóia 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Anexo
+STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING1}
+STR_SV_STNAME_BRANCH                                            :Ramal de {STRING1}
+STR_SV_STNAME_UPPER                                             :{STRING1} do norte
+STR_SV_STNAME_LOWER                                             :{STRING1} do sul
+STR_SV_STNAME_HELIPORT                                          :Heliporto de {STRING1}
+STR_SV_STNAME_FOREST                                            :Floresta de {STRING1}
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Jogador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Novo Rosto
 STR_7005_COLOR_SCHEME                                           :{BLACK}Cores
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nome do Presidente
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Não é possível alterar o nome da empresa...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Não é possível alterar o nome do presidente...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanças {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanças {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Despesas/Lucros
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construção
 STR_7012_NEW_VEHICLES                                           :{GOLD}Novos Veículos
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Circulação de Trens
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Rendimentos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Clique no novo esquema de cor
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Aumentar empréstimo
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Pagar parte do empréstimo
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Veículos:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} trem
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trens
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Avaliações da empresa (máximo=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valor da empresa
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Classificação de Empresas
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Empresa de transportes em dificuldades!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Presidente)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Presidente)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fusão de empresa de transportes!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} foi vendida a {STRING} por {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {STRING} por {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} foi vendida a {COMPANY} por {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Falida!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} foi fechada pelos credores e todos os seus bens foram vendidos!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} foi fechada pelos credores e todos os seus bens foram vendidos!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nova empresa de transportes!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} inicia construção em {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} inicia construção em {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Não é possível comprar empresa...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Tarifas por carga
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dias em trânsito
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender 25% de ações desta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Não é possível comprar 25% de ações desta empresa...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Não é possível vender 25% de ações desta empresa...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propriedade de {STRING}{}   {COMMA}% propriedade de {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} foi comprada por {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propriedade de {COMPANY}{}   {COMMA}% propriedade de {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Esta empresa ainda não troca ações...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Depósito Ferroviário
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalhes)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detalhes)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Comboio no caminho
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Ir para {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ir para {STATION} (Transferir e carregar)
 STR_8808_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informação
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trem muito longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os trens só podem ser alterados quando parados num depósito
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trens
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trens
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Veículos Ferroviários
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Veículos Ferroviários(Monotrilho)
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Veículos Ferroviários(Trem-Bala)
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Ir Para
 STR_8827_FULL_LOAD                                              :{BLACK}Carga
 STR_8828_UNLOAD                                                 :{BLACK}Descarga
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordens)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fim de Ordens - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Manutenção
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Não é possível construir veículo ferroviário...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Carregando / descarregando
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}O trem deve estar parado dentro do depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Não é possível mandar o trem para o depósito...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novo {STRING} disponível!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potência: {COMMA}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potência: {COMMA}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Avariado
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potência: {LTBLUE}{COMMA}hp{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veículo de estrada no caminho
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Veículos de Estrada
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Veículos de Estrada
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Depósito de Veículos de Estrada
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novos Veículos
 STR_9005_INFORMATION                                            :{BLACK}Informação
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construir Veículo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Não é possível construir veículo de estrada...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Deverá construir depósito de veículos de estrada primeiro
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordens)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detalhes)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve estar parado num depósito de veículos de estrada
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Não é possível vender veículo de estrada...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Não é possível iniciar/parar veículo de estrada...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construir o veículo de estrada seleccionado
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo veículo de estrada disponível!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Custo: {CURRENCY}{}Velocidade: {VELOCITY}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Custo: {CURRENCY}{}Velocidade: {VELOCITY}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renomear veículo de estrada
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Não é possível renomear veículo de estrada...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Não é possível construir doca aqui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Depósito Naval
 STR_9804_NEW_SHIPS                                              :{BLACK}Novos Barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Não é possível construir barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}É necessário construir depósito naval primeiro
 STR_9808_NEW_SHIPS                                              :{WHITE}Novos Barcos
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Não é possível vender barco...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Não é possível construir barco...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Barco no caminho
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordens)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detalhes)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_9813_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Não é possível iniciar/parar barco...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Não é possível mandar barco para o depósito...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Não é possível encontrar depósito local
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostrar detalhes do barco
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Novo barco disponível!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {STRING}{}Custo de circulação: {CURRENCY}/ano
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {STRING1}{}Custo de circulação: {CURRENCY}/ano
 STR_982F_NAME_SHIP                                              :{BLACK}Renomear barco
 
 STR_9831_NAME_SHIP                                              :{WHITE}Renomear barco
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Renomear tipo de barco
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Não é possível renomear tipo de barco...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Adaptar barco de mercadorias para um tipo de carga diferente
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Adaptar)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Adaptar)
 STR_983C_REFIT_SHIP                                             :{BLACK}Adaptar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga do barco
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Adaptar barco para transportar a carga seleccionada
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING1}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Não é possível adaptar barco...
 STR_9842_REFITTABLE                                             :(adaptável)
 STR_GO_TO_SHIP_DEPOT                                            :Ir para o depósito naval de {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Não é possível construir aeronave...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronaves
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordens)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalhes)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronaves
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Não é possível mandar aeronave para o hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Dirige-se ao hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Dirige-se ao hangar de {STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Não é possível iniciar/parar aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronave está em voo
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Deverá construir um aeroporto primeiro
-STR_A019_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}A aeronave deverá estar parada no hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Não é possível vender aeronave...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construir aeroporto
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Renomear tipo de aeronave
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Não é possível renomear tipo de aeronave...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Adaptar aeronave para um tipo de carga diferente
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Adaptar)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Adaptar)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Adaptar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga da aeronave
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Adaptar aeronave para transportar a carga seleccionada
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING1}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Não é possível adaptar aeronave...
 STR_A043_REFITTABLE                                             :(adaptável)
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir para o hangar de {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalhes
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Veículos:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estações:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar para Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar para Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mudar para Euro: {ORANGE}nunca
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prevêr: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Mudar parametro de moeda modificada
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Manutenção: {GOLD}{CURRENCY}/ano
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Desenvolvida: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA} anos
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Desenvolvida: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} anos
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Confiabilidade Max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Custo: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} passageiros, {COMMA} malas de correspondência
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{COMMA}hp{BLACK} Peso: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{COMMA}hp{BLACK} Peso: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/catalan.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/catalan.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Es necessita terreny pla
 STR_0008_WAITING                                                :{BLACK}Esperant: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (en ruta des de
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (en ruta des de
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepta: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepta: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opcions del Joc
 STR_00B2_MESSAGE                                                :{YELLOW}Missatge
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Missatge de {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Missatge de {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}No es pot fer aixó....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}No es pot netejar l'àrea....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Tots els Drets reservats
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Britànic (milles)
 STR_013A_METRIC_KILOMETERS                                      :Mètric (kilómetres)
-STR_013B_OWNED_BY                                               :{WHITE}...propietat de {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...propietat de {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Càrrega
 STR_013D_INFORMATION                                            :{BLACK}Informació
 STR_013E_CAPACITIES                                             :{BLACK}Capacitats
 STR_013E_TOTAL_CARGO                                            :{BLACK}Càrrega Total
-STR_013F_CAPACITY                                               :{BLACK}Capacitats: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacitats: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Càrrega total (capacitat) d'aquest tren:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Joc Nou
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Parar joc
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Desar joc, deixar joc, sortir
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostrar la llista d'estacions de les empresses
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost de neteja: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost de neteja: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Propietari: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritat Local: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Propietari: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritat Local: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ningú
 STR_01AA_NAME                                                   :{BLACK}Nom
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demostració
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Càrrega acceptada: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Càrrega acceptada: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Càrrega acceptada: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Càrrega acceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Càrrega acceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Càrrega acceptada: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Pista{SETX 88}Títol
 STR_01E9_SHUFFLE                                                :{TINYFONT}Aleatori
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selecció del Programa de Música
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Index de Pista
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Esborra
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Adjust per tots els tipus de missatge (actiu/inactiu/resum)
 STR_MESSAGE_SOUND                                               :{YELLOW}Emetre so per als nous missatges resumits
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...massa lluny del destí previ
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Principals Empreses en asolir el Nivell {NUMU16}{}({STRING} )
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Taula de Lliga d'Empreses a {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Principals Empreses en asolir el Nivell {NUM}{}({STRING} )
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Taula de Lliga d'Empreses a {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Empresari
 STR_0214_ENTREPRENEUR                                           :Emprenedor
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Gran Magnate
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate del Segle
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} asoleix l'estat '{STRING}' !
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} asoleix l'estat '{STRING}' !
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} asoleix l'estat '{STRING}' !
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} asoleix l'estat '{STRING}' !
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Selecciona mida de població
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Mida de població:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Mostra el darrer missatge o notícia
 STR_OFF                                                         :Fora
 STR_SUMMARY                                                     :Resum
 STR_FULL                                                        :Complet
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Directori de Poblacions
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Noms de dissenys de vehicles
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Inactiu
 STR_CONFIG_PATCHES_ON                                           :Actiu
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar la velocitat del vehicle a la barra d'estat: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permetre construir en desnivells i costes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permetre un tamany més real de l'àrea d'influència: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permetre l'esborrat de propietats de les poblacions: carreteres, ponts, túnels, etc: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Activar la construcció de trens molt llargs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar l'acceleració realista per als trens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibir fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING} {LTBLUE} (necessita NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Juntar estacions de tren fetes al costat d'un altre: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Marxar de l'estació quan un tipus de càrrega és ple, si 'càrrega completa': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algorisme millorat de càrrega: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflació: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar càrreges en una estació només quan ho demana: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permetre construir ponts molt llargs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permetre ordres anar a cotxeres: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permetre fabricar material no processat en indústries: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permetre vàries indústries similars per població: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Permetre construir a prop indústries del mateix tipus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre data llarga a la barra d'estat: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar senyals en el sentit de la marxa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar finestra de balanç al finalitzar cada any: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Gestió de funció 'nonstop' compatible amb TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Cues de trànsit rodat (amb efectes quàntics): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Finestra d'avis quan el ratolí és al marc del programa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permetre subornar a les autoritats locals: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Cerca de noves cotxeres: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estacions no uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nou algorisme per cerca de rutes dels trens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova cerca de rutes global (NPF, anul.la NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar la velocitat del vehicle a la barra d'estat: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permetre construir en desnivells i costes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permetre un tamany més real de l'àrea d'influència: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permetre l'esborrat de propietats de les poblacions: carreteres, ponts, túnels, etc: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Activar la construcció de trens molt llargs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar l'acceleració realista per als trens: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibir fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING1} {LTBLUE} (necessita NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Juntar estacions de tren fetes al costat d'un altre: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Marxar de l'estació quan un tipus de càrrega és ple, si 'càrrega completa': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algorisme millorat de càrrega: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflació: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar càrreges en una estació només quan ho demana: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permetre construir ponts molt llargs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permetre ordres anar a cotxeres: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permetre fabricar material no processat en indústries: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permetre vàries indústries similars per població: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Permetre construir a prop indústries del mateix tipus: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre data llarga a la barra d'estat: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar senyals en el sentit de la marxa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar finestra de balanç al finalitzar cada any: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Gestió de funció 'nonstop' compatible amb TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Cues de trànsit rodat (amb efectes quàntics): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Finestra d'avis quan el ratolí és al marc del programa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permetre subornar a les autoritats locals: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Cerca de noves cotxeres: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estacions no uniformes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nou algorisme per cerca de rutes dels trens: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova cerca de rutes global (NPF, anul.la NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permetre sempre aeroports petits: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permetre sempre aeroports petits: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren es perd quan no ha avançat durant: {ORANGE}{STRING} díes
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren es perd quan no ha avançat durant: {ORANGE}{STRING1} díes
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Un tren es perd quan no ha avançat durant: {ORANGE} desactivat
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Revisar ordres dels vehicles: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Revisar ordres dels vehicles: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :no
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :si, excepte vehicles parats
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :per a tots els vehicles
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar si els ingressos dels trens són negatius: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Els vehicles mai caduquen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar si els ingressos dels trens són negatius: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Els vehicles mai caduquen: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autorenova el vehicle quan sigui vell
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenova el vehicle quan tingui {ORANGE}{STRING}{LTBLUE} mesos abans/després antig. max.
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autorenovació: mínim de diners per renovar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duració del missatge d'error: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra els habitants a la etiqueta del nom de població: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Arbres invisibles (amb edificis transparents): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Alçada de la cota de neu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max extensió de estacions: {ORANGE}{STRING}{RED}Avís: Un valor alt enlenteix el joc
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manteniment dels helicopters als heliports automàticament: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trens per jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max vehicles rodats per jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aeronaus per jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max vaixells per jugador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenova el vehicle quan tingui {ORANGE}{STRING1}{LTBLUE} mesos abans/després antig. max.
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autorenovació: mínim de diners per renovar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duració del missatge d'error: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra els habitants a la etiqueta del nom de població: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Arbres invisibles (amb edificis transparents): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Alçada de la cota de neu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max extensió de estacions: {ORANGE}{STRING1}{RED}Avís: Un valor alt enlenteix el joc
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manteniment dels helicopters als heliports automàticament: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar trens per l'ordinador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactivar vehicles rodats per l'ordinador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeronaus per l'ordinador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar vaixells per l'ordinador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trens per jugador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max vehicles rodats per jugador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aeronaus per jugador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max vaixells per jugador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nou AI (alfa): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar trens per l'ordinador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactivar vehicles rodats per l'ordinador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeronaus per l'ordinador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar vaixells per l'ordinador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Interval de manteniment per defecte dels trens: {ORANGE}{STRING} díes/%
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nou AI (alfa): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Interval de manteniment per defecte dels trens: {ORANGE}{STRING1} díes/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Interval de manteniment per defecte dels trens: {ORANGE}desactivat
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Interval de manteniment per defecte dels vehicles rodats: {ORANGE}{STRING} díes/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Interval de manteniment per defecte dels vehicles rodats: {ORANGE}{STRING1} díes/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Interval de manteniment per defecte dels vehicles rodats: {ORANGE}desactivat
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Interval de manteniment per defecte de les aeronaus: {ORANGE}{STRING} díes/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Interval de manteniment per defecte de les aeronaus: {ORANGE}{STRING1} díes/%
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Interval de manteniment per defecte de les aeronaus: {ORANGE}desactivat
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Interval de manteniment per defecte dels vaixells: {ORANGE}{STRING} díes/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Interval de manteniment per defecte dels vaixells: {ORANGE}{STRING1} díes/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Interval de manteniment per defecte dels vaixells: {ORANGE}desactivat
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar manteniment quan les averíes s'estableixen a cap: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar manteniment quan les averíes s'estableixen a cap: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Les noticies en color apareixen en: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data d'inici: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Fi del joc en: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Les noticies en color apareixen en: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data d'inici: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Fi del joc en: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Activar economia suau (més canvis però més petits)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permetre comprar participadions d'altres empreses
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}En arrosegant, sitúa senyals cada: {ORANGE}{STRING} quadre(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permetre situacio automatica de senyals pbs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posició de la barra d'eines principal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}En arrosegant, sitúa senyals cada: {ORANGE}{STRING1} quadre(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permetre situacio automatica de senyals pbs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posició de la barra d'eines principal: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Esquerra
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centre
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Dreta
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Radi de snap de finestra: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Radi de snap de finestra: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Radi de snap de finestra: {ORANGE}desactivat
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interficie
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competidors
 
 STR_CONFIG_PATCHES_DISABLED                                     :desactivat
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Canviar valor de l'adjustament
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Atenció! Estàs a punt d'enredar als teus companys competidors. Pensa que una cosa així serà recordada per tota la eternitat!.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementar diners en {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jugar com el jugador: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Eruga màgica (treu indústries, inamovibles): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Els tunels es poden creuar: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mentre el joc està en pausa: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Eruga màgica (treu indústries, inamovibles): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Els tunels es poden creuar: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mentre el joc està en pausa: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Els avions a reacció no tenen (frecuents) accidents en els aeroports petits: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Canviar clima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Canviar data: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificació de valors de producció: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificació de valors de producció: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Cap a {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Cap a {WAYPOINT}, a {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...boia en ús!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenades: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordenades: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}No es pot treure part de la estació...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}No es pot convertir el tipus de via aqui...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir Mina de Sucre
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportat)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...massa a prop d'altres indústries
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Remodelar tren per transportar un altre tipus de càrrega
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Remodelar)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Remodelar tren
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona tipus de càrrega a transportar
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Remodelar tren per transportar el tipus de càrrega seleccionat
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}No es pot remodelar el tren...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Els intervals de manteniment estàn en percentatges: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Els intervals de manteniment estàn en percentatges: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Canvi de producció
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Benvingut a aquest nou AI, en desenvolupament. Pot ser que tinguis problemes. Quan en tinguis, fes una còpia de pantalla i publícala al forums. Disfruta!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamany del mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versió del servidor:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreça del servidor:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreça del servidor:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data inicial:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protegit per contrasenya!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMACIÓ DE L'EMPRESA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom d'empresa:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguració:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguració:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valor de l'empresa:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanç actual:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingresos de l'ultim any:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendiment:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendiment:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estacions:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estacions:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Jugadors:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connectant...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Obtenint informació del joc..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Obtenint informació de l'empresa..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(s) rivals
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes descarregats aproximadament
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) rivals
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descarregats aproximadament
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconnecta
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} No es pot carregar un joc desat al servidor.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} No es pot inciar el servidor.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} No es pot connectar.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connexió #{NUMU16} ha esgotat el temps d'espera.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connexió #{NUM} ha esgotat el temps d'espera.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} S'ha obtingut un error de protocol i s'ha tancat la connexió.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La revisió d'aquest client no concorda amb la revisió del servidor.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Contrasenya incorrecta.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Tamany-X del mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Tamany-Y del mapa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Tamany-X del mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Tamany-Y del mapa: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cost: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Poblacions
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}L'edifici s'ha d'enderrocar primer
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Població: {ORANGE}{COMMA}{BLACK}  Cases: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Mostra informació de l'autoritat local
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} autoritat local
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ratis de l'Empresa de Transports:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subvencions
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subvencions per prestació de serveis oferides:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} a {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING2} a {STRING2}
 STR_2028_BY                                                     :{YELLOW} (per {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Cap
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Serveis ja subvencionats:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} des de {STATION} fins a {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} des de {STATION} fins a {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, fins a {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferiment de subvenció caducada: {}{}{STRING} des de {STRING} fins a {STRING} s'ha declarat desert.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferiment de subvenció caducada: {}{}{STRING} des de {STRING2} fins a {STRING2} s'ha declarat desert.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subvenció retirada:{}{}{STRING} des de {STATION} fins a {STATION} ja no està subvencionat.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subvenció per Servei oferida:{}{} Primer servei de {STRING} des de {STRING} fins a {STRING} tindrà una subvenció d'un any de l'autoritat local!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {STRING}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} rebrà un 50% addicional durant el pròxim any!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {STRING}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el doble de la tarifa durant el pròxim any!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {STRING}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el triple de la tarifa durant el pròxim any!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {STRING}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el quàdruple de la tarifa durant el pròxim any!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subvenció per Servei oferida:{}{} Primer servei de {STRING} des de {STRING2} fins a {STRING2} tindrà una subvenció d'un any de l'autoritat local!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {COMPANY}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} rebrà un 50% addicional durant el pròxim any!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {COMPANY}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el doble de la tarifa durant el pròxim any!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {COMPANY}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el triple de la tarifa durant el pròxim any!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvenció per Servei concedida a {COMPANY}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el quàdruple de la tarifa durant el pròxim any!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} l'autoritat local denega el permís de construir un altre aeroport en aquesta població
 STR_2036_COTTAGES                                               :Xalets
 STR_2037_HOUSES                                                 :Cases
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Patrocinar la construcció de nous edificis comercials en la població.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar per 1 any els drets exclusius de transport en la població. La autoritat local només permetrà utilitzar les instal.lacions de la teva empresa de transports als passatgers i les mercaderíes.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {STRING} porta 6 mesos de misèria als motoristes!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {COMPANY} porta 6 mesos de misèria als motoristes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (en construcció)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...lloc inadequat
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}No es poden plantar arbres aqui...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...massa senyals
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}No es pot situar un senyal aqui...
 STR_280A_SIGN                                                   :Sign
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Masses parades d'autobus
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Masses estacions de càrrega
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Massa a prop d'un altre estació/àrea de càrrega
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Primer has d'enderrocar l'estació de tren
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Massa a prop d'un altre aeroport
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Primer has d'enderrocar l'aeroport
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Massa a prop d'un altre estació de mercaderíes
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Primer has d'enderrocar la parada d'autobus
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Primer has d'enderrocar l'estació de mercaderíes
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estacions/Parades
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estacions/Parades
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Cap -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...lloc inadequat
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Massa a prop d'un altre moll
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Aeroport Nacional
 STR_305AB_LARGE                                                 :{BLACK}Aeroport Internacional
 STR_305B_SIZE                                                   :{BLACK}Mida
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Estació de Ferrocarril
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar d'Aeronaus
 STR_3060_AIRPORT                                                :Aeroport
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Carregar Joc
 STR_4002_SAVE                                                   :{BLACK}Desar
 STR_4003_DELETE                                                 :{BLACK}Esborrar
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes lliures
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Imposible llegir unitat de disc
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Desat del Joc erroni
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producció del darrer mes:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportat)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportat)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar la pantalla principal en la situació de l'indústria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nou/nova {STRING} en construcció a prop de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nou/nova {STRING} s'està plantant a prop de {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Sense Nom{SKIP}
+STR_SV_UNNAMED                                                  :Sense Nom
 STR_SV_TRAIN_NAME                                               :Tren {COMMA}
 STR_SV_ROADVEH_NAME                                             :Vehicle Rodat {COMMA}
 STR_SV_SHIP_NAME                                                :Vaixell {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronau {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nort
-STR_SV_STNAME_SOUTH                                             :{STRING} Sud
-STR_SV_STNAME_EAST                                              :{STRING} Est
-STR_SV_STNAME_WEST                                              :{STRING} Oest
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Trànsit
-STR_SV_STNAME_HALT                                              :{STRING} De Munt
-STR_SV_STNAME_VALLEY                                            :{STRING} De Vall
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Coll
-STR_SV_STNAME_WOODS                                             :{STRING} Boscos
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Del Llac
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Intercanvi
-STR_SV_STNAME_AIRPORT                                           :{STRING} Aeroport
-STR_SV_STNAME_OILFIELD                                          :{STRING} Camp de Petroli
-STR_SV_STNAME_MINES                                             :{STRING} Mines
-STR_SV_STNAME_DOCKS                                             :{STRING} Port
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boia 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boia 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boia 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boia 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boia 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boia 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boia 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boia 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boia 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annex
-STR_SV_STNAME_SIDINGS                                           :{STRING} Vía Morta
-STR_SV_STNAME_BRANCH                                            :{STRING} Bifurcació
-STR_SV_STNAME_UPPER                                             :Sobre {STRING}
-STR_SV_STNAME_LOWER                                             :Baix {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Bosc
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nort
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sud
+STR_SV_STNAME_EAST                                              :{STRING1} Est
+STR_SV_STNAME_WEST                                              :{STRING1} Oest
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Trànsit
+STR_SV_STNAME_HALT                                              :{STRING1} De Munt
+STR_SV_STNAME_VALLEY                                            :{STRING1} De Vall
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Coll
+STR_SV_STNAME_WOODS                                             :{STRING1} Boscos
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Del Llac
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Intercanvi
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Aeroport
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Camp de Petroli
+STR_SV_STNAME_MINES                                             :{STRING1} Mines
+STR_SV_STNAME_DOCKS                                             :{STRING1} Port
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boia 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boia 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boia 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boia 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boia 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boia 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boia 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boia 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boia 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annex
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Vía Morta
+STR_SV_STNAME_BRANCH                                            :{STRING1} Bifurcació
+STR_SV_STNAME_UPPER                                             :Sobre {STRING1}
+STR_SV_STNAME_LOWER                                             :Baix {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Bosc
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Jugador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema de Colors
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nom President
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}No es pot canviar el nom d'empresa...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}No es pot canviar el nom de president...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finances {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finances {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Despeses/Ingresos
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construcció
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nous Vehicles
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Desp. de Circ. de Trens
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gràfic d'Ingresos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Clica al nou esquema de color triat
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Augmentar l'import del prèstec
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Amortitzar part del prèstec
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurat: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(President)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurat: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trens
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Ratis de rendiment de l'empresa (màxim rati=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valors de l'empresa
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Taula de la Lliga d'Empreses
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Empresa de Transport en dificultats!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} ha de ser venuda o declarar-se en fallida a menys que el seu rendiment s'incrementi aviat!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(President)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} ha de ser venuda o declarar-se en fallida a menys que el seu rendiment s'incrementi aviat!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(President)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fusió d'Empreses de Transport!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} s'ha venut a {STRING} per {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Busquem empresa de transports per absorbir la nostra empresa{}{}Vols comprar a {STRING} per {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} s'ha venut a {COMPANY} per {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Busquem empresa de transports per absorbir la nostra empresa{}{}Vols comprar a {COMPANY} per {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Fallida!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} ha estat tancada per els acreidors i tots els seus actius venuts!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} ha estat tancada per els acreidors i tots els seus actius venuts!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Creada nova empresa de transports!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} comença la construcció prop de {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} comença la construcció prop de {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}No pots comprar l'empresa...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Tarifes de Pagament de Càrrega
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Díes en transit
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendre el 25% de participació en aquesta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}No pots comprar el 25% de participació en aquesta empresa...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}No pots vendre el 25% de participació en aquesta empresa...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propietat de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propietat de {STRING}{}   {COMMA}% propietat de {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} ha estat absorbida per {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propietat de {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propietat de {COMPANY}{}   {COMMA}% propietat de {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} ha estat absorbida per {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Aquesta Empresa ja no negocía participacions...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Cotxeres de Tren
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{} Arribada del 1er. tren a {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalls)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detalls)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren en el camí
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Anar a {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ves a {STATION} (Transferir i agafar càrrega)
 STR_8808_GO_TO_UNLOAD                                           :Ves a {STATION} (Descarregar)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informació
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren massa llarg
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Els trens només es poden modificar quan s'han parat dintre d'una cotxera
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trens
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trens
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nous Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nous Vehicles Monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nous Vehicles Maglev
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Anar a
 STR_8827_FULL_LOAD                                              :{BLACK}Càrrega completa
 STR_8828_UNLOAD                                                 :{BLACK}Descarregar
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordres)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordres)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fí d'Ordres - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Servei
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}No es pot construir el vehicle...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Carregant / Descarregant
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}El tren s'ha de parar dintre de la cotxera
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}No pots enviar el tren a cotxeres...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar l'ordre a menys que es necessiti manteniment
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nou {STRING} disponible ara!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Pes: {COMMA}t{}Velocitat: {VELOCITY}  Potència: {COMMA}hp{}Cost de circulació: {CURRENCY}/any{}Capacitat: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Pes: {COMMA}t{}Velocitat: {VELOCITY}  Potència: {COMMA}hp{}Cost de circulació: {CURRENCY}/any{}Capacitat: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Averiat
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING2}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Pes: {LTBLUE}{COMMA}t  {BLACK}Potència: {LTBLUE}{COMMA}hp{BLACK} Vel. Max.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des de l'ultim manteniment: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vehicle rodat en el camí
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vehicles Rodats
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehicles Rodats
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Cotxera de Vehicles Rodats
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nous Vehicles
 STR_9005_INFORMATION                                            :{BLACK}Informació
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construir Vehicle
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}No es pot construir el vehicle rodat...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Primer has de construir una cotxera
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordres)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detalls)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de circulació: {LTBLUE}{CURRENCY}/any
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalls)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING2}{BLACK}   Cost de circulació: {LTBLUE}{CURRENCY}/any
 STR_900E_MAX_SPEED                                              :{BLACK}Vel. Max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des del darrer manteniment: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...s'ha de parar dintre d'una cotxera
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}No pots vendre el vehicle rodat...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No es pot parar/arrencar el vehicle rodat...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construeix el vehicle rodat seleccionat
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nou vehicle rodat disponible ara!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Velocitat: {VELOCITY}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Velocitat: {VELOCITY}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Anomenar vehicle rodat
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}No es pot anomenar el vehicle rodat...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}No es pot construir el port aqui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Drassana
 STR_9804_NEW_SHIPS                                              :{BLACK}Nous Vaixells
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Vaixells
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Vaixells
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}No es poden construir vaixells...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Primer has de construir una drassana
 STR_9808_NEW_SHIPS                                              :{WHITE}Nous Vaixells
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}No es pot vendre el vaixell...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}No es pot construir el vaixell...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Vaixell en el camí
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordres)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detalls)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalls)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING2}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_9813_MAX_SPEED                                              :{BLACK}Max. velocitat: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des de l'últim manteniment: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}No es pot parar/arrencar el vaixell...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}No es pot enviar vaixell a la drassana...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Incapaç de trobar drassana local
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostrar els detalls del vaixell
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nou vaixell disponible ara!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Velocitat: {VELOCITY}{}Capacitat: {STRING}{}Cost de Circulació: {CURRENCY}/any
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Velocitat: {VELOCITY}{}Capacitat: {STRING1}{}Cost de Circulació: {CURRENCY}/any
 STR_982F_NAME_SHIP                                              :{BLACK}Anomenar vaixell
 
 STR_9831_NAME_SHIP                                              :{WHITE}Anomenar vaixell
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Reanomena tipus de vaixell
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}No es pot reanomenar el tipus de vaixell...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Remodelar vaixell mercant per portar un tipus diferent de càrrega
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Remodelar)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Remodelar)
 STR_983C_REFIT_SHIP                                             :{BLACK}Remodelar vaixell
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona el tipus de càrrega a transportar
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Remodelar vaixell per portar el tipus de càrrega seleccionat
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona el tipus de càrrega a transportar:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING1}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}No es pot remodelar el vaixell...
 STR_9842_REFITTABLE                                             :(remodelable)
 STR_GO_TO_SHIP_DEPOT                                            :Anar a drassana de {TOWN}.
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronau
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir Aeronau
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No es pot construir l'aeronau...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronaus
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordres)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalls)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronaus
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordres)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalls)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING2}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. velocitat: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Averíes des de l'últim manteniment: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}No es pot enviar l'aronau a l'hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Cap a l'hangar de {STATION}.
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Cap a l'hangar de {STATION}, a {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}No es pot parar/arrencar l' aeronau...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronau en vol
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Primer has de construir l'aeroport
-STR_A019_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}L' aeronau s'ha de parar a l'hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}No es pot vendre l' aeronau...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construcció d'Aeroport
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Reanomenar tipus d'aeronau
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}No es pot reanomenar tipus d'aeronau...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodelar aeronaus per transportar diferent tipus de càrrega
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Remodelar)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Remodelar)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Remodelar aeronaus
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona tipus de càrrega a transportar
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodelar aeronau per transportar el tipus de càrrega seleccionat
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona tipus de càrrega a transportar:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING1}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No es pot remodelar l'aeronau...
 STR_A043_REFITTABLE                                             :(remodelable)
 STR_GO_TO_AIRPORT_HANGAR                                        :Anar a l'hangar de {STATION}.
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detall
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehicles:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estacions:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufix:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Canvi a Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Canvi a Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Canvi a Euro: {ORANGE}mai
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Vista prèvia: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Canviar el paràmetre de la moneda personalitzada
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Pes: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocitat: {GOLD}{VELOCITY}{BLACK}   Potència: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost d'utilització: {GOLD}{CURRENCY}/any
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitat: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Dissenyat: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA} anys
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitat: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Dissenyat: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} anys
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Rendiment: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Velocitat: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitat: {GOLD}{COMMA} passatgers, {COMMA} saques de correu
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{COMMA}hp{BLACK} Pes: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{COMMA}hp{BLACK} Pes: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/czech.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/czech.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Je potreba plochá zeme
 STR_0008_WAITING                                                :{BLACK}Ceka: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (na ceste z
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (na ceste z
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Prijima: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Prijima: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Moznosti hry
 STR_00B2_MESSAGE                                                :{YELLOW}Zpráva
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zpráva od {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zpráva od {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Tohle neumuzes udelat...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nemuzes vycistit tuto oblast...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Puvodni copyright: {COPYRIGHT} 1995 Chris Sawyer, vsechna práva vyhrazena
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperiální (míle)
 STR_013A_METRIC_KILOMETERS                                      :Metrické (kilometry)
-STR_013B_OWNED_BY                                               :{WHITE}...vlastneno {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...vlastneno {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Náklad
 STR_013D_INFORMATION                                            :{BLACK}Informace
 STR_013E_CAPACITIES                                             :{BLACK}Kapacity
 STR_013E_TOTAL_CARGO                                            :{BLACK}Celkový náklad
-STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Celkova kapacita tohoto vlaku:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nová hra
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauza
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Ulozit hru, opustit hru, ukoncit
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zobrazit seznam stanic spolecnosti
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cena za vycisteni: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cena za vycisteni: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Vlastník: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Místní správa: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Vlastník: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Místní správa: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Nic
 STR_01AA_NAME                                                   :{BLACK}Jméno
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Zvolit Tutorial/Ukazka
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Prijimane zbozi: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Prijimane zbozi: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Prijimane zbozi: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Prijimane zbozi: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Prijimane zbozi: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Prijimane zbozi: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Skladba{SETX 88}Název
 STR_01E9_SHUFFLE                                                :{TINYFONT}Nahodne
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Volba programu hudby
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Index skladeb
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Vymazat
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Nastavení vsech zpráv (zapnuty/vypnuty/strucne)
 STR_MESSAGE_SOUND                                               :{YELLOW}Prehrat zvuk pro strucne novinové zprávy
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prilis daleko od predchazejiciho cile
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Nejlepsi spolecnosti, které dosáhly {NUMU16}{}({STRING} uroven)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabulka spolecnosti v roce {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Nejlepsi spolecnosti, které dosáhly {NUM}{}({STRING} uroven)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabulka spolecnosti v roce {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Obchodník
 STR_0214_ENTREPRENEUR                                           :Manazer
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnát
 STR_0218_MOGUL                                                  :Velemagnát
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnát století
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} získal oznaceni '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} z {STRING} získal oznaceni '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} získal oznaceni '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} získal oznaceni '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Zvol velikost mesta:
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Velikost mesta:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Ukázat poslední zprávu nebo clanek
 STR_OFF                                                         :Vypnuto
 STR_SUMMARY                                                     :Shrnutí
 STR_FULL                                                        :Plná
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Seznam mest
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Názvy dopravních prostredku
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,88 +992,88 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Vypnuto
 STR_CONFIG_PATCHES_ON                                           :Zapnuto
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Ukazovat rychlost vozidla ve stavové liste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Povolit výstavbu na svazích kopcu a na pobrezich: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Povolit u oblasti pokrytí realistictejsi velikost: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Povolit bourání více mestskych silnic, mostu, tunelu, atp.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Povolit stavbu dlouhých vlaku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Zapnout realistické zrychlování vlaku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakázat vlakum a lodím otaceni o 90 stupnu: {ORANGE}{STRING} {LTBLUE} (vyzaduje NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Spojovat stanice postavené vedle sebe: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Odjet, kdyz je plne nalozen jakýkoli náklad pri 'nalozit': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Pouzij vylepseny algoritmus nakládání: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflace: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Vozit zbozi do stanice jen pokud je poptávka: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Povolit stavbu velmi dlouhých mostu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Povolit prikaz 'jed do depa': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Povolit konstrukci prumyslu teziciho surový materiál: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Povolit více stejného prumyslu kolem jednoho mesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Prumysl stejného druhu muze byt budován pobliz sebe: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Ukazovat dlouhé datum ve stavové liste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Ukazovat semafory na strane, kde jezdí silnicni vozidla: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Ukazovat financni okno na konci kazdeho roku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Pouziti prikazu 'bez zastavení' jako v TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Silnicni vozidla stojí fronty (s kvantovým efektem): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Posouvat okno, kdyz je kurzor na okraji: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Povolit úplatek místní sprave: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nové vyhledávání dep: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nejednolité stanice: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nový algoritmus pro hledání cesty vlaku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nový globální algoritmus hledání cesty (NPF, nahradí NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Ukazovat rychlost vozidla ve stavové liste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Povolit výstavbu na svazích kopcu a na pobrezich: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Povolit u oblasti pokrytí realistictejsi velikost: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Povolit bourání více mestskych silnic, mostu, tunelu, atp.: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Povolit stavbu dlouhých vlaku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Zapnout realistické zrychlování vlaku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakázat vlakum a lodím otaceni o 90 stupnu: {ORANGE}{STRING1} {LTBLUE} (vyzaduje NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Spojovat stanice postavené vedle sebe: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Odjet, kdyz je plne nalozen jakýkoli náklad pri 'nalozit': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Pouzij vylepseny algoritmus nakládání: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflace: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Vozit zbozi do stanice jen pokud je poptávka: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Povolit stavbu velmi dlouhých mostu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Povolit prikaz 'jed do depa': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Povolit konstrukci prumyslu teziciho surový materiál: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Povolit více stejného prumyslu kolem jednoho mesta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Prumysl stejného druhu muze byt budován pobliz sebe: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Ukazovat dlouhé datum ve stavové liste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Ukazovat semafory na strane, kde jezdí silnicni vozidla: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Ukazovat financni okno na konci kazdeho roku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Pouziti prikazu 'bez zastavení' jako v TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Silnicni vozidla stojí fronty (s kvantovým efektem): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Posouvat okno, kdyz je kurzor na okraji: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Povolit úplatek místní sprave: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nové vyhledávání dep: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nejednolité stanice: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nový algoritmus pro hledání cesty vlaku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nový globální algoritmus hledání cesty (NPF, nahradí NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Malá letiste se budou moci stále stavet: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Malá letiste se budou moci stále stavet: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Vlak je povazovan za ztracený, pokud nedojede do: {ORANGE}{STRING} dní
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Vlak je povazovan za ztracený, pokud nedojede do: {ORANGE}{STRING1} dní
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Vlak je povazovan za ztracený, pokud nedojede do: {ORANGE}vypnuto
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Obnovení prikazu vozidla: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Obnovení prikazu vozidla: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :ne
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ano, krome zastavených vozidel (v depu)
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :ano, u vsech vozidel
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varovat, pokud vlak prodelava: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vozidlum se nikdy nezastaví výroba ('nezastarají'): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varovat, pokud vlak prodelava: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vozidlum se nikdy nezastaví výroba ('nezastarají'): {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automaticky obnovit dopravní prostredek, kdyz je starý
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING}{LTBLUE} mesicu pred / po dosazeni maximálního stari
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimální castka pro automatické obnovení: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Doba zobrazení chybové zprávy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zobrazovat populaci mesta v jeho popisku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Neviditelné stromy (spolecne s pruhlednymi budovami): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Vyska snehove cary: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Nejvetsi rozsah stanice: {ORANGE}{STRING} {RED}Varování: Vysoké nastavení zpomaluje hru
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Udrzba helikoptér na heliportech: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximum vlaku na hrace: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximum silnicnich vozidel na hrace: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximum letadel na hrace: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximum lodí na hrace: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING1}{LTBLUE} mesicu pred / po dosazeni maximálního stari
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimální castka pro automatické obnovení: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Doba zobrazení chybové zprávy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zobrazovat populaci mesta v jeho popisku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Neviditelné stromy (spolecne s pruhlednymi budovami): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Vyska snehove cary: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Nejvetsi rozsah stanice: {ORANGE}{STRING1} {RED}Varování: Vysoké nastavení zpomaluje hru
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Udrzba helikoptér na heliportech: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Zakázat pocitaci vlaky: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Zakázat pocitaci silnicni vozidla: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Zakázat pocitaci letadla: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Zakázat pocitaci lode: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximum vlaku na hrace: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximum silnicnich vozidel na hrace: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximum letadel na hrace: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximum lodí na hrace: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Nová umela inteligence (AI) (alpha verze): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Zakázat pocitaci vlaky: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Zakázat pocitaci silnicni vozidla: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Zakázat pocitaci letadla: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Zakázat pocitaci lode: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Základní servisní interval pro vlaky: {ORANGE}{STRING} dní
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Nová umela inteligence (AI) (alpha verze): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Základní servisní interval pro vlaky: {ORANGE}{STRING1} dní
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Základní servisní interval pro vlaky: {ORANGE}vypnuto
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Základní servisní interval pro silnicni vozidla: {ORANGE}{STRING} dní
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Základní servisní interval pro silnicni vozidla: {ORANGE}{STRING1} dní
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Základní servisní interval pro silnicni vozidla: {ORANGE}vypnuto
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Základní servisní interval pro letadla: {ORANGE}{STRING} dní
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Základní servisní interval pro letadla: {ORANGE}{STRING1} dní
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Základní servisní interval pro letadla: {ORANGE}vypnuto
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Základní servisní interval pro lode: {ORANGE}{STRING} dní
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Základní servisní interval pro lode: {ORANGE}{STRING1} dní
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Základní servisní interval pro lode: {ORANGE}vypnuto
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Vypnout servisy kdyz jsou vypnuty poruchy: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Vypnout servisy kdyz jsou vypnuty poruchy: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Barevné noviny se objeví: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Pocatecni datum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Ukoncit hru v roce: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Barevné noviny se objeví: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Pocatecni datum: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Ukoncit hru v roce: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Plynulé zmeny ekonomiky (více mensich zmen)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Povolit kupování podilu z ostatních spolecnosti
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Pri tazeni umistovat signály kazdych(e): {ORANGE}{STRING} dilku(y)
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Umisteni hlavní listy: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Pri tazeni umistovat signály kazdych(e): {ORANGE}{STRING1} dilku(y)
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Umisteni hlavní listy: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Vlevo
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Uprostred
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Vpravo
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Okno se prichyti k druhému, kdyz je bliz, nez: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Okno se prichyti k druhému, kdyz je bliz, nez: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Okno se prichyti k druhému, kdyz je bliz, nez: {ORANGE}vypnuto
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Ovládaní
@@ -1088,7 +1084,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Konkurenti
 
 STR_CONFIG_PATCHES_DISABLED                                     :vypnuto
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Zmenit hodnotu nastavení
@@ -1104,13 +1100,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Varování! Chystas se podvést ostatní hrace. Pamatuj si, ze tento podlý cin nebude nikdy zapomenut!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Navysit peníze o {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Hrajes jako hrac: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magický buldozer (odstraní prumysl a neodstranitelné predmety): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunely se mohou krizit: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Povolit staveni v pauze: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magický buldozer (odstraní prumysl a neodstranitelné predmety): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunely se mohou krizit: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Povolit staveni v pauze: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Letadla nebudou na malých letistich (tak casto) havarovat: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Zmenit podnebí: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Zmenit datum: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povolit zmenu produkce prumyslu: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povolit zmenu produkce prumyslu: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Mirim do {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Mirim do {WAYPOINT}, {VELOCITY}
@@ -1164,7 +1160,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... bojka je pouzivana!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Souradnice: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Souradnice: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nemohu odstranit cast stanice...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Zde nemohu zmenit typ kolejí...
@@ -1202,19 +1198,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Vyhloubit cukrový dul
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Prumysl
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% prepraveno)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% prepraveno)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% prepraveno)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% prepraveno)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prilis blízko k jinému prumyslu
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Prestavet vlak pro prevoz jineho typu nákladu
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Prestavet)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Prestavet vlak
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Zvolit typ nákladu na ktery vlak prestavet
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Prestavet vlak na oznaceny typ nákladu
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nelze prestavet vlak...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervaly servisu v procentech: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervaly servisu v procentech: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmenit produkci
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Predstavujeme ti novou umelou inteligenci (pracovní). Není jeste OK, takze s ním jsou jeste problémy. Kdykoli muzes, udelej screenshot a prispej s ním do fóra. At se ti líbí!
@@ -1253,7 +1248,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Prostredi:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verze hry na serveru:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serveru:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serveru:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Pocatecni datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Momentální datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Chraneno heslem!
@@ -1322,14 +1317,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO O SPOLECNOSTI
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Jméno spolecnosti:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Zalozeno:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Zalozeno:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Hodnota spolecnosti:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Stav na uctu:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Lonsky hrubý zisk:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Výkon:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Výkon:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozidla:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stanice:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vozidla:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stanice:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Hraci:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Pripojovani...
@@ -1345,8 +1340,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Prijimani informací o hre..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Prijimani informací o spolecnosti..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} klient(u) pred námi
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kB stazeno
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(u) pred námi
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kB stazeno
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Odpojit se
 
@@ -1364,7 +1359,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nemohu nahrát ulozenou hru ze serveru
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nemohu spustit server
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nemohu se pripojit
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} U spojení c. {NUMU16} byl prekrocen cekaci limit
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} U spojení c. {NUM} byl prekrocen cekaci limit
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Vznikla chyba v protokolu a nase spojení je preruseno
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Revize hry tohoto klienta neodpovídá revizi hry na serveru
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Spatne heslo
@@ -1417,8 +1412,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Rozmer X mapy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Rozmer Y mapy: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Rozmer X mapy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Rozmer Y mapy: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cena: {CURRENCY}
@@ -1515,10 +1510,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Mesta
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budova musi byt nejprve znicena
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Populace: {ORANGE}{COMMA}{BLACK} Domu: {ORANGE}{COMMA}
@@ -1551,23 +1546,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Ukázat informace o místní sprave
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Místní správa mesta {TOWN}
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Hodnocení spolecnosti:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Dotace
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Nabídnuté dotace pro sluzbu:
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING} do {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING2} do {STRING2}
 STR_2028_BY                                                     :{YELLOW} (do {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Nic
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Jiz priznane dotace:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Nabídka dotace prepravy vyprsela:{}{}Dotace dopravy {STRING} z {STRING} do {STRING} nebude dále nabízena.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Nabídka dotace prepravy vyprsela:{}{}Dotace dopravy {STRING} z {STRING2} do {STRING2} nebude dále nabízena.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Ukonceni dotovaní dopravy:{}{}Dotace pro {STRING} z {STATION} do {STATION} jiz nebude dále poskytována.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING} z {STRING} do {STRING} bude jeden rok dotovana místní správou!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {STRING}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset 150% normalní ceny.
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {STRING}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset dvojnásobek normalní ceny!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {STRING}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset trojnásobek normalní ceny!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {STRING}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset ctyrnasobek normalní ceny!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING} z {STRING2} do {STRING2} bude jeden rok dotovana místní správou!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {COMPANY}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset 150% normalní ceny.
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {COMPANY}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset dvojnásobek normalní ceny!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {COMPANY}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset trojnásobek normalní ceny!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace pridelena spolecnosti {COMPANY}.{}{}Doprava {STRING} z {STATION} do {STATION} bude po jeden rok vynaset ctyrnasobek normalní ceny!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}Místní správa mesta {TOWN} zakazuje stavbu dalsiho letiste v tomto meste.
 STR_2036_COTTAGES                                               :Chatky
 STR_2037_HOUSES                                                 :Domy
@@ -1601,7 +1596,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Dotovat stavbu nových obchodních budov ve meste.{}  Cena: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Koupit výhradní práva k preprave zbozi z tohoto mesta po dobu jednoho roku. Místní správa dovolí cestujícím a nákladu pouzivat pouze stanice tvé spolecnosti.{} Cena: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Podplatit místní správu pro zvyseni hodnocení spolecnosti. Riziko trestu v pripade pristizeni.{}  Cena: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Dopravni chaos v {TOWN}!{}{}Program prestavby ulic sponzorovaný {STRING} prinasi motoristum 6 mesicu utrpení!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Dopravni chaos v {TOWN}!{}{}Program prestavby ulic sponzorovaný {COMPANY} prinasi motoristum 6 mesicu utrpení!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (ve vystavbe)
@@ -1619,7 +1614,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...nepouzitelne místo
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Zde nemuzes vysadit strom...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...prilis mnoho popisku
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Zde nemuzes umistit nápis...
 STR_280A_SIGN                                                   :Nápis
@@ -1643,7 +1637,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Prilis mnoho autobusových zastávek
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Prilis mnoho zastávek nákladních automobilu
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Prilis blízko k jinému nadrazi nebo nákladové rampe
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Musis nejprve znicit stanici
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Prilis blízko k jinému letisti
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Musis nejprve znicit letiste
@@ -1676,8 +1670,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Prilis blizko k jiné nákladové rampe
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Musis nejprve znicit autobusovou zastávku
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Musis nejprve znicit nákladovou rampu
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} stanic
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} stanic
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...nepouzitelne místo
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Prilis blízko k jinému doku
@@ -1698,8 +1692,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolitní
 STR_305AB_LARGE                                                 :{BLACK}Mezinárodní
 STR_305B_SIZE                                                   :{BLACK}Velikost
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Nadrazi
 STR_305F_AIRCRAFT_HANGAR                                        :Hangár
 STR_3060_AIRPORT                                                :Letiste
@@ -1732,7 +1726,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Otevrit hru
 STR_4002_SAVE                                                   :{BLACK}Ulozit
 STR_4003_DELETE                                                 :{BLACK}Smazat
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} MB volných
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nemohu cist jednotku
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Ulozeni hry selhalo
@@ -1794,7 +1788,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkce minulý mesic:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% prepraveno)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% prepraveno)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Nastavit pohled na prumysl
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}{STRING} v konstrukci pobliz mesta {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nový {STRING} je vysazen pobliz mesta {TOWN}!
@@ -1874,45 +1868,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Beze jména{SKIP}
+STR_SV_UNNAMED                                                  :Beze jména
 STR_SV_TRAIN_NAME                                               :Vlak {COMMA}
 STR_SV_ROADVEH_NAME                                             :Silnicni vozidlo {COMMA}
 STR_SV_SHIP_NAME                                                :Lod {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Letadlo {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} sever
-STR_SV_STNAME_SOUTH                                             :{STRING} jih
-STR_SV_STNAME_EAST                                              :{STRING} východ
-STR_SV_STNAME_WEST                                              :{STRING} západ
-STR_SV_STNAME_CENTRAL                                           :{STRING} stred
-STR_SV_STNAME_TRANSFER                                          :{STRING} prestupni
-STR_SV_STNAME_HALT                                              :{STRING} zastávka
-STR_SV_STNAME_VALLEY                                            :{STRING} údolí
-STR_SV_STNAME_HEIGHTS                                           :{STRING} vysina
-STR_SV_STNAME_WOODS                                             :{STRING} polesí
-STR_SV_STNAME_LAKESIDE                                          :{STRING} jezero
-STR_SV_STNAME_EXCHANGE                                          :{STRING} centrála
-STR_SV_STNAME_AIRPORT                                           :{STRING} letiste
-STR_SV_STNAME_OILFIELD                                          :{STRING} ropná plosina
-STR_SV_STNAME_MINES                                             :{STRING} doly
-STR_SV_STNAME_DOCKS                                             :{STRING} pristav
-STR_SV_STNAME_BUOY_1                                            :{STRING} bojka 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} bojka 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} bojka 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} bojka 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} bojka 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} bojka 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} bojka 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} bojka 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} bojka 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} pripojne
-STR_SV_STNAME_SIDINGS                                           :{STRING} odstavné
-STR_SV_STNAME_BRANCH                                            :{STRING} odbocka
-STR_SV_STNAME_UPPER                                             :horni {STRING}
-STR_SV_STNAME_LOWER                                             :dolni {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} heliport
-STR_SV_STNAME_FOREST                                            :{STRING} les
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} sever
+STR_SV_STNAME_SOUTH                                             :{STRING1} jih
+STR_SV_STNAME_EAST                                              :{STRING1} východ
+STR_SV_STNAME_WEST                                              :{STRING1} západ
+STR_SV_STNAME_CENTRAL                                           :{STRING1} stred
+STR_SV_STNAME_TRANSFER                                          :{STRING1} prestupni
+STR_SV_STNAME_HALT                                              :{STRING1} zastávka
+STR_SV_STNAME_VALLEY                                            :{STRING1} údolí
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} vysina
+STR_SV_STNAME_WOODS                                             :{STRING1} polesí
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} jezero
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} centrála
+STR_SV_STNAME_AIRPORT                                           :{STRING1} letiste
+STR_SV_STNAME_OILFIELD                                          :{STRING1} ropná plosina
+STR_SV_STNAME_MINES                                             :{STRING1} doly
+STR_SV_STNAME_DOCKS                                             :{STRING1} pristav
+STR_SV_STNAME_BUOY_1                                            :{STRING1} bojka 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} bojka 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} bojka 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} bojka 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} bojka 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} bojka 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} bojka 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} bojka 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} bojka 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} pripojne
+STR_SV_STNAME_SIDINGS                                           :{STRING1} odstavné
+STR_SV_STNAME_BRANCH                                            :{STRING1} odbocka
+STR_SV_STNAME_UPPER                                             :horni {STRING1}
+STR_SV_STNAME_LOWER                                             :dolni {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} les
 
 ############ end of	savegame specific region!
 
@@ -1991,7 +1985,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(hrac {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nový oblicej
 STR_7005_COLOR_SCHEME                                           :{BLACK}Barva
@@ -2003,9 +1997,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Jméno prezidenta
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nemohu zmenit jméno spolecnosti...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nemohu zmenit jméno prezidenta...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finance {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finance {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Prijmy / výdaje
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Výstavba
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nové dopravní prostredky
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Provoz vlaku
@@ -2022,7 +2016,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Celkem:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf prijmu
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2047,8 +2041,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Stiskni vybrane barevne schema
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Pujcit si vice
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Splatit cast dluhu
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Prezident)
-STR_7038_INAUGURATED                                            :{GOLD}Zalozeno: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Prezident)
+STR_7038_INAUGURATED                                            :{GOLD}Zalozeno: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vozidla:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} vlak
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} vlaku
@@ -2076,18 +2070,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Hodnocení spolecnosti (nejvyssi hodnocení=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Hodnota spolecnosti
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Tabulka poradi spolecnosti
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Dopravni spolecnost ma problemy!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} bude prodana nebo vyhlasi bankrot pokud se brzy nezvysi vykonnost!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Prezident)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} bude prodana nebo vyhlasi bankrot pokud se brzy nezvysi vykonnost!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Prezident)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Sjednoceni dopravnich spolecnosti!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} byla prodana {STRING} za {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Hledame spolecnost ktera prevezme nasi spolecnost{}{}Chcete zakoupit {STRING} za {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} byla prodana {COMPANY} za {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Hledame spolecnost ktera prevezme nasi spolecnost{}{}Chcete zakoupit {COMPANY} za {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrot!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} byla zavrena veritely a podily byly prodany!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} byla zavrena veritely a podily byly prodany!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nová spolecnost zalozena!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} zacina stavet pobliz {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} zacina stavet pobliz {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nemohu koupit spolecnost...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Ceny za prepravu nákladu
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Doba prepravy ve dnech
@@ -2122,9 +2116,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Prodat 25% podíl v této spolecnosti
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nemohu koupit 25% podíl v této spolecnosti...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nemohu prodat 25% podíl v této spolecnosti...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastneno {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% vlastneno {STRING}{}   {COMMA}% vlastneno {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} byla prevzata {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastneno {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% vlastneno {COMPANY}{}   {COMMA}% vlastneno {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} byla prevzata {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Tato spolecnost zatím neobchoduje s akciemi...
 
 ##id 0x8000
@@ -2396,10 +2390,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}Zeleznicni depo {TOWN}
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První vlak dorazil do {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaily)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detaily)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}V ceste je vlak
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Jet do {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Jet do {STATION} (prelozit a nalozit jiný náklad)
 STR_8808_GO_TO_UNLOAD                                           :Jet do {STATION} (vylozit)
@@ -2431,7 +2425,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informace
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Prilis dlouhý vlak
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Vlaky lze menit, jen kdyz stojí uvnitr depa
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} vlaku
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} vlaku
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nové lokomotivy a vagony
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nové lokomotivy a vagony pro monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nové lokomotivy a vagony pro maglev
@@ -2443,14 +2437,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Jet do
 STR_8827_FULL_LOAD                                              :{BLACK}Nalozit
 STR_8828_UNLOAD                                                 :{BLACK}Vylozit
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Prikazy)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Konec prikazu - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Udrzba
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nemohu koupit vagon/lokomotivu...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUMU16}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Nakládání / Vykládání
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musí stát v depu
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nelze poslat vlak do depa...
@@ -2499,9 +2493,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Preskoc tento cil pokud neni potreba pravidelna udrzba
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Dalsi {STRING} je k dispozici!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Hmotnost: {COMMA}t{}Rychlost: {VELOCITY}  Výkon: {COMMA} koní{}Cena provozu: {CURRENCY} rocne{}Kapacita: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Hmotnost: {COMMA}t{}Rychlost: {VELOCITY}  Výkon: {COMMA} koní{}Cena provozu: {CURRENCY} rocne{}Kapacita: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Porucha
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING2}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Hmotnost: {LTBLUE}{COMMA}t  {BLACK}Výkon: {LTBLUE}{COMMA} koní{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
@@ -2524,8 +2518,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Silnicni vozidlo v ceste
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} silnicnich vozidel
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} silnicnich vozidel
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Garaze pro silnicni vozidla {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nová silnicni vozidla
 STR_9005_INFORMATION                                            :{BLACK}Informace
@@ -2533,14 +2527,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Koupit silnicni vozidlo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nemohu koupit nové silnicni vozidlo...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Musis nejprve postavit garaze
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detaily)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING2}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_900E_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok): {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupen: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupen: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...musi byt zastaven v garazi
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nemohu prodat silnicni vozidlo...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nemohu zastavit/rozjet silnicni vozidlo...
@@ -2565,7 +2558,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Koupit oznacene vozidlo
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nové silnicni vozidlo je k dispozici!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Rychlost: {VELOCITY}{}Cena provozu: {CURRENCY} rocne{}Kapacita: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Rychlost: {VELOCITY}{}Cena provozu: {CURRENCY} rocne{}Kapacita: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Prejmenovat silnicni vozidlo
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nelze prejmenovat silnicni vozidlo...
@@ -2588,7 +2581,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Zde nelze postavit pristav...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Lodní depo {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nové lode
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} lodí
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} lodí
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nemohu koupit lod...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Nejprve musis postavit lodní depo
 STR_9808_NEW_SHIPS                                              :{WHITE}Nové lode
@@ -2597,15 +2590,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Nelze prodat lod...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Nelze koupit lod...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Lod v ceste
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detaily)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING2}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_9813_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nelze rozjet/zastavit lod...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nelze poslat lod do depa...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nemohu najít místní depo
@@ -2629,7 +2621,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Ukázat detaily lodi
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nová lod je k dispozici!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {STRING}{}Cena provozu: {CURRENCY} rocne
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {STRING1}{}Cena provozu: {CURRENCY} rocne
 STR_982F_NAME_SHIP                                              :{BLACK}Prejmenovat lod
 
 STR_9831_NAME_SHIP                                              :{WHITE}Prejemnovat lod
@@ -2642,12 +2634,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Prejmenovat typ lodi
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nelze prejmenovat typ lodi...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Prestavet pro prevazeni jiného druhu nákladu
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Prestavet)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Prestavet)
 STR_983C_REFIT_SHIP                                             :{BLACK}Prestavet
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Zvolit druh nákladu, který bude lod prevazet
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Prestavet pro prevoz oznaceneho nákladu
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Zvolit druh nákladu:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING1}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nelze prestavet lod...
 STR_9842_REFITTABLE                                             :(lze prestavet)
 STR_GO_TO_SHIP_DEPOT                                            :Zajet do lodního depa {TOWN}
@@ -2662,15 +2654,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nové letadlo
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Koupit letadlo
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nelze koupit letadlo...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} letadel a helikoptér
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaily)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} letadel a helikoptér
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Prikazy)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Stari: {LTBLUE}{STRING2}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} rocne
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Prijem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Koupeno: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nelze poslat letadlo do hangáru...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Jedu do hangáru {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Jedu do hangáru {STATION}, {VELOCITY}
@@ -2679,8 +2671,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nemohu rozjet/zastavit letadlo...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Letadlo letí
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Musis nejprve postavit letiste
-STR_A019_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Letadlo musi být zastaveno v hangáru
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nelze prodat letadlo...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Stavba letiste
@@ -2715,12 +2707,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Prejmenovat typ letadla
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nelze prejmenovat typ letadla...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Prestavet letadlo pro prevoz jiného typu nákladu
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Prestavet)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Prestavet)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Prestavet letadlo
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Zvolit typ nákladu pro letadlo
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Prestavet letadlo pro prevoz oznaceneho typu nákladu
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Zvolit typ nákladu pro prevoz:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING1}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nelze prestavet letadlo....
 STR_A043_REFITTABLE                                             :(lze prestavet)
 STR_GO_TO_AIRPORT_HANGAR                                        :Poslat do hangáru {STATION}
@@ -2744,8 +2736,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Podrobne
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vozidla:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stanice:
@@ -2782,7 +2774,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddelovac:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Predpona:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Pripona:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Prechod k Euru: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Prechod k Euru: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Prechod k Euru: {ORANGE}nikdy
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Náhled: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zmenit parametry vlastní meny
@@ -2832,11 +2824,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{COMMA} t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Výkon: {GOLD}{COMMA} hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Provozní cena: {GOLD}{CURRENCY} rocne
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyvinuto: {GOLD}{NUMU16}{BLACK} Zivotnost: {GOLD}{COMMA} let
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyvinuto: {GOLD}{NUM}{BLACK} Zivotnost: {GOLD}{COMMA} let
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spolehlivost: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost: {GOLD}{COMMA} t  ({COMMA} t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rychlost: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{COMMA} cestujících, {COMMA} baliku posty
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanene vagony: {GOLD}+{COMMA} hp{BLACK} Hmotnost: {GOLD}+{COMMA} t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanene vagony: {GOLD}+{COMMA} hp{BLACK} Hmotnost: {GOLD}+{COMMA} t
\ No newline at end of file
--- a/lang/danish.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/danish.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Landet skal være flat
 STR_0008_WAITING                                                :{BLACK}Venter: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (på vej fra
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (på vej fra
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepterer: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepterer: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Kort - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spilindstillinger
 STR_00B2_MESSAGE                                                :{YELLOW}Besked
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Besked Fra {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Besked Fra {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Det kan jeg ikke....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan ikke rydde området....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle retigheder reserveret
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (miles)
 STR_013A_METRIC_KILOMETERS                                      :Meter (kilometer)
-STR_013B_OWNED_BY                                               :{WHITE}...ejes af {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...ejes af {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Last
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Lasteevner
 STR_013E_TOTAL_CARGO                                            :{BLACK}Samlet last
-STR_013F_CAPACITY                                               :{BLACK}Lasteevne: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Lasteevne: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Samlet last (lasteevne) på dette tog:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nyt Spil
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pause spillet
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Gem spillet, afslut spillet, afslut
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Vis en liste over selskabets stationer
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Pris for at rydde: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Pris for at rydde: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Ejer: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokal myndighed: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Ejer: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokal myndighed: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Navn
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Vælg Tutorial/Demonstration
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepteret last: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Accepteret last: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Accepteret last: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Accepteret last: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Accepteret last: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepteret last: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Nummer{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Bland
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programmer
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musik Program Valg
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Nummer Index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Ryd
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Opsætning for all beskeder (on/off/refereret)
 STR_MESSAGE_SOUND                                               :{YELLOW}Afspil lyd for refererede nyheder
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...for langt fra forrige destination
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Bedste virksomheder, som har nået {NUMU16}{}({STRING} Niveau)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Selskabsoversigt i {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Bedste virksomheder, som har nået {NUM}{}({STRING} Niveau)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Selskabsoversigt i {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Forretningsmand
 STR_0214_ENTREPRENEUR                                           :Entreprenør
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Århundredes Matador
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} får '{STRING}' status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} fra {STRING} får '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} får '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} fra {COMPANY} får '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Vælg bystørrelse
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Bystørrelse:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Vis sidste besked eller nyheds rapport
 STR_OFF                                                         :Fra
 STR_SUMMARY                                                     :Resume
 STR_FULL                                                        :Fuldt
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Byoversigt
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Køretøjsdesignnavne
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,88 +992,88 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Fra
 STR_CONFIG_PATCHES_ON                                           :Til
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Vis køretøjets fart i statusbaren: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Tillad bygning på skråninger og kyster: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Tillad mere realistisk størrelse på stationernes opland: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Tillad nedriving af industribygninger, flere veje, osv: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Aktiver bygning af meget lange tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Aktiver realistisk acceleration af tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forbyd skibe og tog at dreje 90 grader: {ORANGE}{STRING} {LTBLUE} (skal bruge NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Foren togstationer der bygges ved siden af hinanden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Forlad stationen hvis en slags last bliver fyldt, hvis 'fuld last': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Brug forbedret indlæsnings algoritme: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aflever kun last til en station hvis der er en forespørgsel: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillad bygning af meget lange broer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Tillad go til depot ordrer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Tillad opførslen af råmateriale industrier: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Tillad flere af samme slags industri per by: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Tillad at flere af samme slags industri kan være tæt på hinanden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Vis altid lang dato i statusbaren: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Vis signaler i kørselssiden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Vis finansvinduet i slutningen af året: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kombatibel nonstop håndtering: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Kø dannelse af lastbiler (med kvante effekt): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pannorer vindue når musen er ved kanten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillad bestikkelse af de lokale myndigheder: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Find nyt depot: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ikke uniforme stationer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Ny stifindingsalgoritme til tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny global ruteplanlægger (NPF, tilsidesætter NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Vis køretøjets fart i statusbaren: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Tillad bygning på skråninger og kyster: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Tillad mere realistisk størrelse på stationernes opland: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Tillad nedriving af industribygninger, flere veje, osv: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Aktiver bygning af meget lange tog: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Aktiver realistisk acceleration af tog: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forbyd skibe og tog at dreje 90 grader: {ORANGE}{STRING1} {LTBLUE} (skal bruge NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Foren togstationer der bygges ved siden af hinanden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Forlad stationen hvis en slags last bliver fyldt, hvis 'fuld last': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Brug forbedret indlæsnings algoritme: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aflever kun last til en station hvis der er en forespørgsel: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillad bygning af meget lange broer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Tillad go til depot ordrer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Tillad opførslen af råmateriale industrier: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Tillad flere af samme slags industri per by: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Tillad at flere af samme slags industri kan være tæt på hinanden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Vis altid lang dato i statusbaren: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Vis signaler i kørselssiden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Vis finansvinduet i slutningen af året: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kombatibel nonstop håndtering: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Kø dannelse af lastbiler (med kvante effekt): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pannorer vindue når musen er ved kanten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillad bestikkelse af de lokale myndigheder: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Find nyt depot: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ikke uniforme stationer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Ny stifindingsalgoritme til tog: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny global ruteplanlægger (NPF, tilsidesætter NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Tillad altid små lufthavne: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Tillad altid små lufthavne: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Et tog er faret vild hvis der ikke er sket fremskridt i: {ORANGE}{STRING} dage
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Et tog er faret vild hvis der ikke er sket fremskridt i: {ORANGE}{STRING1} dage
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Et tog er faret vild hvis der ikke er sket fremskridt i: {ORANGE}deaktiveret
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Kontroller køretøjers ordreliste: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Kontroller køretøjers ordreliste: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :Nej
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :Ja, på nær ved stoppet køretøjer
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :Ja, på alle køretøjer
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Advar hvis et tog har underskud: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Køretøjernes levealder udløber aldrig: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Advar hvis et tog har underskud: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Køretøjernes levealder udløber aldrig: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automatisk fornyelse af køretøjer når de bliver gamle
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Automatisk fornyelse når køretøj er {ORANGE}{STRING}{LTBLUE} måneder under/over max alder
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Antal penge i banken før automatisk fornyelse af køretøjer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Levetid for fejlmeddelser: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Vis byens indbyggertal i bynavnet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Usynlige træer (med gennemsigtige bygninger): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snelinjehøjden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station udbreddelse: {ORANGE}{STRING} {RED}Advarsel: Høj værdi gør spillet langsomt
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Automatisk service på helikopterlandingspladser: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks antal tog per spiller: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks antal lastbiler per spiller: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks antal fly per spiller: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks antal skibe per spiller: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Automatisk fornyelse når køretøj er {ORANGE}{STRING1}{LTBLUE} måneder under/over max alder
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Antal penge i banken før automatisk fornyelse af køretøjer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Levetid for fejlmeddelser: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Vis byens indbyggertal i bynavnet: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Usynlige træer (med gennemsigtige bygninger): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snelinjehøjden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station udbreddelse: {ORANGE}{STRING1} {RED}Advarsel: Høj værdi gør spillet langsomt
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Automatisk service på helikopterlandingspladser: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Deaktiver tog for computeren: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Deaktiver lastbiler for computeren: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Deaktiver fly for computeren: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Deaktiver skibe for computeren: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks antal tog per spiller: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks antal lastbiler per spiller: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks antal fly per spiller: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks antal skibe per spiller: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Slå den nye kunstige intelligents til (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Deaktiver tog for computeren: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Deaktiver lastbiler for computeren: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Deaktiver fly for computeren: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Deaktiver skibe for computeren: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standard service interval for tog: {ORANGE}{STRING} dage/%
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Slå den nye kunstige intelligents til (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standard service interval for tog: {ORANGE}{STRING1} dage/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Standard service interval for tog: {ORANGE}slået fra
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standard service interval for vejkøretøjer: {ORANGE}{STRING} dage/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standard service interval for vejkøretøjer: {ORANGE}{STRING1} dage/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Standard service interval for vejkøretøjer: {ORANGE}slået fra
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standard service interval for fly: {ORANGE}{STRING} dage/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standard service interval for fly: {ORANGE}{STRING1} dage/%
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Standard service interval for fly: {ORANGE}slået fra
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard service interval for skibe: {ORANGE}{STRING} dage/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard service interval for skibe: {ORANGE}{STRING1} dage/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Standard service interval for skibe: {ORANGE}slået fra
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Slå service fra, når nedbrud er sat til ingen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Slå service fra, når nedbrud er sat til ingen: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farvede nyheder dukker op i: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Start dato: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Afslut spillet i: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farvede nyheder dukker op i: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Start dato: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Afslut spillet i: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Aktiver rolig økonomi (flere små ændringer)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Tillad at købe aktier i andre selskaber
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging place signals every: {ORANGE}{STRING} tile(s)
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Placering af værktøjslinie: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging place signals every: {ORANGE}{STRING1} tile(s)
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Placering af værktøjslinie: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Venstre
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Center
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Højre
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Vinduernes sammenkoblings afstand: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Vinduernes sammenkoblings afstand: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Vinduernes sammenkoblings afstand: {ORANGE}slået fra
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Brugerflade
@@ -1088,7 +1084,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Modstandere
 
 STR_CONFIG_PATCHES_DISABLED                                     :deaktiveret
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Skift indstillingsværdi
@@ -1104,13 +1100,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Du er ved at forråde dine modstandere. Husk at dette vil blive husket i al evighed.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Forøg kassebeholdning med {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spil som spiller: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldozer (nedriv ting, som normalt ikke kan fjernes): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunneler kan krydse hinanden: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillad at bygge mens pause er aktiveret: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldozer (nedriv ting, som normalt ikke kan fjernes): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunneler kan krydse hinanden: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillad at bygge mens pause er aktiveret: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetfly vil ikke styrte (ofte) i små lufthavne: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Skift klima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ændre dato: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiver modifisering af produktion: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiver modifisering af produktion: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Retning mod {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Retning mod {WAYPOINT}, {VELOCITY}
@@ -1164,7 +1160,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... bøjen er i brug!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ikke fjerne en del af en station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan ikke konvertere togskinnetype her...
@@ -1202,19 +1198,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Byg Sukkermine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transporteret)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transporteret)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for tæt på en anden industribygning
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg toget til at køre med en anden slags last
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Ombyg)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Ombyg toget
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den slags last toget skal køre med
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Ombyg toget til at køre med den markerede slags last
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikke ombygge toget...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervaller er i procent: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervaller er i procent: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Velkommen til den nye kunstige intelligents, der er under udarbejdelse. Du kan forvente problemer. Når det sker, så lav et screenshot og sæt det på forummet
@@ -1253,7 +1248,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Klima:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Start dato:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuværende dato:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Beskyttet af kodeord!
@@ -1322,14 +1317,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}VIRKSOMHEDSINFO
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Virksomhedens navn:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Virksomhedens værdi:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuværende beholdning:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Sidste års indtægt:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationer:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stationer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Spillere:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Forbinder...
@@ -1345,8 +1340,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Fetching game info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching company info..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} klient(er) foran dig
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes hentet indtil videre
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(er) foran dig
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes hentet indtil videre
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Afbryd forbindelse
 
@@ -1364,7 +1359,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikke hente gemt spil
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Kunne ikke starte serveren
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kunne ikke forbinde
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Forbindelsen #{NUMU16} svare ikke
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Forbindelsen #{NUM} svare ikke
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Der opstod en protokol-fejl og forbindelse blev lukket
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Revisionen af denne klient passer ikke sammen med serverens revision
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Forkert kodeord
@@ -1417,8 +1412,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-størrelse af kort: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-størrelse af kort: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-størrelse af kort: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-størrelse af kort: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Pris: {CURRENCY}
@@ -1513,10 +1508,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Byer
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Det er nødvendigt at nedrive bygningen først
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Indbyggere: {ORANGE}{COMMA}{BLACK}  Huse: {ORANGE}{COMMA}
@@ -1549,23 +1544,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Vis information omkring de lokale myndigheder
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} lokal myndighed
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transportselskabsbedømmelse:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Specialaftaler
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Specialaftaler til udlicitering:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} fra {STRING} til {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} fra {STRING2} til {STRING2}
 STR_2028_BY                                                     :{YELLOW} (inden {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Ingen
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Specialaftaler der allerede er vundet:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, indtil {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Specialaftale udløbet:{}{}{STRING} fra {STRING} til {STRING} vil ikke længere udløse en bonus.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Specialaftale udløbet:{}{}{STRING} fra {STRING2} til {STRING2} vil ikke længere udløse en bonus.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Tilbud om specialaftale tilbagetrukket:{}{}{STRING} fragt fra {STATION} til {STATION} er ikke længere til udlicitering.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Tilbud om specialaftale:{}{}Første {STRING} fragt fra {STRING} til {STRING}  vil udløse et års bonus kontrakt med de lokale myndigheder!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {STRING}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give 50% mere i de næste 12 måneder!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {STRING}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give dobbelt udbytte i de næste 12 måneder!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {STRING}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give tredobbelt udbytte i de næste 12 måneder!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {STRING}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give firedobbelt udbytte i de næste 12 måneder!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Tilbud om specialaftale:{}{}Første {STRING} fragt fra {STRING2} til {STRING2}  vil udløse et års bonus kontrakt med de lokale myndigheder!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {COMPANY}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give 50% mere i de næste 12 måneder!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {COMPANY}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give dobbelt udbytte i de næste 12 måneder!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {COMPANY}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give tredobbelt udbytte i de næste 12 måneder!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Specialaftale tildelt {COMPANY}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give firedobbelt udbytte i de næste 12 måneder!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} de lokale myndigheder nægter at der bliver bygget en lufthavn mere i byen
 STR_2036_COTTAGES                                               :Hytter
 STR_2037_HOUSES                                                 :Huse
@@ -1599,7 +1594,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Betal for bygning af kommercielle bygninger i byen.{}  Pris: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Køb et års eksklusive rettigheder til transport i byen. De lokale myndigheder vil kun tillade passagerer og last at bruge dine stationer.{} Prist: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestik de lokale myndigheder til at høve din bedømmelse, med sandsynlighed for en stor straf hvis det bliver opdaget.{}  Pris: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i byen {TOWN}!{}{}Vejfornyelse betalt af {STRING} bringer 6 måneders kaos for trafikken!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i byen {TOWN}!{}{}Vejfornyelse betalt af {COMPANY} bringer 6 måneders kaos for trafikken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under konstruktion)
@@ -1617,7 +1612,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...placeringen er ikke egnet
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Kan ikke plante træer her...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...for mange skilte
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kan ikke placere skilt her...
 STR_280A_SIGN                                                   :Skilt
@@ -1641,7 +1635,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}For mange busterminaler
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}For mange lastbilsholdepladser
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}For tæt på en anden station/lasteplads
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Det er nødvendigt at rive stationen ned først
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}For tæt på en anden lufthavn
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Det er nødvendigt at rive lufthavnen ned først
@@ -1674,8 +1668,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}For tæt på en anden lastbilslasteplads
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Det er nødvendigt at rive rutebilsstationen ned først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Det er nødvendigt at rive lastbilslastepladsen ned først
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stationer
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stationer
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...placeringen er uegnet
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}For tæt på en anden havn
@@ -1696,7 +1690,7 @@
 STR_305AA_LARGE                                                 :{BLACK}National lufthavn
 STR_305AB_LARGE                                                 :{BLACK}International lufthavn
 STR_305B_SIZE                                                   :{BLACK}Størrelse
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Togstation
 STR_305F_AIRCRAFT_HANGAR                                        :Lufthavnshangar
 STR_3060_AIRPORT                                                :Lufthavn
@@ -1729,7 +1723,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Hent Spil
 STR_4002_SAVE                                                   :{BLACK}Gem
 STR_4003_DELETE                                                 :{BLACK}Slet
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes fri
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan ikke læse drevet
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Fejl under gemning af spil
@@ -1791,7 +1785,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion sidste måned:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporteret)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transporteret)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrer skærmen over placeringen af industrien
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ny {STRING} under konstruktion tæt på {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ny {STRING} bliver plantet tæt på {TOWN}!
@@ -1871,45 +1865,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Ikke navngivet{SKIP}
+STR_SV_UNNAMED                                                  :Ikke navngivet
 STR_SV_TRAIN_NAME                                               :Tog {COMMA}
 STR_SV_ROADVEH_NAME                                             :Lastbil {COMMA}
 STR_SV_SHIP_NAME                                                :Skib {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Fly {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nord
-STR_SV_STNAME_SOUTH                                             :{STRING} Syd
-STR_SV_STNAME_EAST                                              :{STRING} Øst
-STR_SV_STNAME_WEST                                              :{STRING} Vest
-STR_SV_STNAME_CENTRAL                                           :{STRING} Hovedbanegård
-STR_SV_STNAME_TRANSFER                                          :{STRING} Centrum
-STR_SV_STNAME_HALT                                              :{STRING} Stop
-STR_SV_STNAME_VALLEY                                            :{STRING} Dalen
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Bakke
-STR_SV_STNAME_WOODS                                             :{STRING} Park
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Sø
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Marked
-STR_SV_STNAME_AIRPORT                                           :{STRING} Lufthavn
-STR_SV_STNAME_OILFIELD                                          :{STRING} Oliefelt
-STR_SV_STNAME_MINES                                             :{STRING} Miner
-STR_SV_STNAME_DOCKS                                             :{STRING} Havn
-STR_SV_STNAME_BUOY_1                                            :{STRING} Bøje 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Bøje 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Bøje 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Bøje 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Bøje 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Bøje 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Bøje 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Bøje 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Bøje 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Forstad
-STR_SV_STNAME_SIDINGS                                           :{STRING} Sidespor
-STR_SV_STNAME_BRANCH                                            :{STRING} Torv
-STR_SV_STNAME_UPPER                                             :Øvre {STRING}
-STR_SV_STNAME_LOWER                                             :Nedre {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Helicopterplads
-STR_SV_STNAME_FOREST                                            :{STRING} Skov
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Syd
+STR_SV_STNAME_EAST                                              :{STRING1} Øst
+STR_SV_STNAME_WEST                                              :{STRING1} Vest
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Hovedbanegård
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Centrum
+STR_SV_STNAME_HALT                                              :{STRING1} Stop
+STR_SV_STNAME_VALLEY                                            :{STRING1} Dalen
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Bakke
+STR_SV_STNAME_WOODS                                             :{STRING1} Park
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Sø
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Marked
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Lufthavn
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Oliefelt
+STR_SV_STNAME_MINES                                             :{STRING1} Miner
+STR_SV_STNAME_DOCKS                                             :{STRING1} Havn
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Bøje 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Bøje 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Bøje 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Bøje 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Bøje 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Bøje 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Bøje 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Bøje 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Bøje 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Forstad
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Sidespor
+STR_SV_STNAME_BRANCH                                            :{STRING1} Torv
+STR_SV_STNAME_UPPER                                             :Øvre {STRING1}
+STR_SV_STNAME_LOWER                                             :Nedre {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Helicopterplads
+STR_SV_STNAME_FOREST                                            :{STRING1} Skov
 
 ############ end of	savegame specific region!
 
@@ -1988,7 +1982,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Spiller {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nyt Ansigt
 STR_7005_COLOR_SCHEME                                           :{BLACK}Farvetema
@@ -2000,9 +1994,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Direktørens Navn
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Kan ikke ændre firmaets navn...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Kan ikke ændre direktørens navn...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanser {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanser {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Udgifter/Indkomst
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Konstruktion
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nye Køretøjer
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Togkørselsudgift
@@ -2019,7 +2013,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Indkomst Graf
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2044,8 +2038,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Klik på det nye farvetema
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Forøg lånet
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Tilbagebetal en del af lånet
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Direktør)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Direktør)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Køretøjer:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tog
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} tog
@@ -2073,18 +2067,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Firmaets ydelsesrate (maksimal=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Selskabsværdier
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Selskabsoversigt
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transportfirma i vanskeligheder!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} vil blive erklæret bankerupt eller solgt hvis ikke ydelsen stiger snart!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Direktør)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} vil blive erklæret bankerupt eller solgt hvis ikke ydelsen stiger snart!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Direktør)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fussion mellem transportfirmaer!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} er blevet solgt til {STRING} for {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Vi leder efter et selskab til at overtage vores{}{}Vil du købe {STRING} for {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} er blevet solgt til {COMPANY} for {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Vi leder efter et selskab til at overtage vores{}{}Vil du købe {COMPANY} for {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankerupt!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} er blevet lukket af kreditorerne og alle ejendomme er solgt!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} er blevet lukket af kreditorerne og alle ejendomme er solgt!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nyt transportselskab er startet!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} starter konstruktion i nærheden af {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} starter konstruktion i nærheden af {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Kan ikke købe selskab...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Lastudbetalingsrater
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Antal dage undervejs
@@ -2119,9 +2113,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sælg 25% aktier i dette firma
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan ikke købe 25% aktier i dette firma...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikke sælge 25% aktier i dette firma...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ejes af {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% ejes af {STRING}{}   {COMMA}% ejes af {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} er blevet overtaget af {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ejes af {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% ejes af {COMPANY}{}   {COMMA}% ejes af {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} er blevet overtaget af {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Dette selskab sælger ikke aktier endnu...
 
 ##id 0x8000
@@ -2393,10 +2387,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} depot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerene fester . . .{}Første tog ankommer til {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaljer)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detaljer)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tog i vejen
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Gå til {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service i {TOWN} depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gå uden stop til {TOWN} depot
@@ -2416,7 +2410,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Toget er for langt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tog kan kun ændres når de er stoppet i et depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Tog
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Tog
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye Jernbanekøretøjer
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye Monorailkøretøjer
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye Magnetskinne køretøjer
@@ -2428,14 +2422,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Gå til
 STR_8827_FULL_LOAD                                              :{BLACK}Fuld Last
 STR_8828_UNLOAD                                                 :{BLACK}Aflæs
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordre)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordre)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Slut på ordre - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Service
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Kan ikke bygge jernbanekøretøj...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Værdi: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Læsser / Aflæsser
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Toget skal være stoppet inde i en remise
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan ikke sende toget til depot...
@@ -2484,9 +2478,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Spring denne ordre over hvis der ikke er behov for service
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ny {STRING} tilgængelig nu!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Pris: {CURRENCY} Vægt: {COMMA}t{}Hastighed: {VELOCITY}  Styrke: {COMMA}hp{}Kørselsomkostning: {CURRENCY}/år{}Kapacitet: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Pris: {CURRENCY} Vægt: {COMMA}t{}Hastighed: {VELOCITY}  Styrke: {COMMA}hp{}Kørselsomkostning: {CURRENCY}/år{}Kapacitet: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Gået i stykker
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vægt: {LTBLUE}{COMMA}t  {BLACK}Styrke: {LTBLUE}{COMMA}hp{BLACK} Maks hastighed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed {LTBLUE}{COMMA}%  {BLACK}nedbrud siden sidste service: {LTBLUE}{COMMA}
@@ -2507,8 +2501,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Lastbil i vejen
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Lastbiler
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Lastbiler
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Lastbilsdepot
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nye køretøjer
 STR_9005_INFORMATION                                            :{BLACK}Information
@@ -2516,14 +2510,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Byg køretøj
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan ikke bygge lastbil...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Det er nødvendigt at bygge lastbilsdepot først
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordre)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_900E_MAX_SPEED                                              :{BLACK}Maks hastighed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...skal være stoppet inde i et depot først
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan ikke sælge lastbil...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan ikke stoppe/starte lastbil...
@@ -2548,7 +2541,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Byg den markerede lastbil
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Ny lastbil er tilgængelig!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pris: {CURRENCY}{}Hastighed: {VELOCITY}{}Kørselsomkostning: {CURRENCY}/år{}Kapacitet: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pris: {CURRENCY}{}Hastighed: {VELOCITY}{}Kørselsomkostning: {CURRENCY}/år{}Kapacitet: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Giv lastbilen et navn
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Kan ikke give lastbilen et navn...
@@ -2571,7 +2564,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan ikke bygge en havn her...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skibsdepot
 STR_9804_NEW_SHIPS                                              :{BLACK}Nye skibe
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skibe
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Skibe
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan ikke bygge skibe...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Det er nødvendigt at bygge et skibsdepot først
 STR_9808_NEW_SHIPS                                              :{WHITE}Nye skibe
@@ -2580,15 +2573,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Kan ikke sælge skibet...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Kan ikke bygge skibet...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Der er et skib i vejen
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordre)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_9813_MAX_SPEED                                              :{BLACK}Maks hastighed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan ikke stoppe/starte skibet...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan ikke sende skibet til depot...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan ikke finde lokalt depot
@@ -2612,7 +2604,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Vis detaljer omkring skibet
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nyt skib er tilgængeligt!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pris: {CURRENCY} Maks Hastighed: {VELOCITY}{}Kapacitet: {STRING}{}Kørselsomkostning: {CURRENCY}/år
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pris: {CURRENCY} Maks Hastighed: {VELOCITY}{}Kapacitet: {STRING1}{}Kørselsomkostning: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Giv skibet et navn
 
 STR_9831_NAME_SHIP                                              :{WHITE}Giv skibet et navn
@@ -2625,12 +2617,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Omdøb skibstypen
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Kan ikke omdøbe skibstypen...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Ombyg skibet til at sejle med en anden slags last
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Ombyg)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Ombyg)
 STR_983C_REFIT_SHIP                                             :{BLACK}Ombyg skibet
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den slags last skibet skal sejle med
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Ombyg skibet til den markerede slags last
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vælg den lasttype der skal sejles med:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING1}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikke ombygge skib...
 STR_9842_REFITTABLE                                             :(ombygning mulig)
 STR_GO_TO_SHIP_DEPOT                                            :Sejl til {TOWN} Skip Depot
@@ -2645,15 +2637,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nyt fly
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Byg et fly
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan ikke bygge fly...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Fly
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordre)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Fly
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordre)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Kørselsomkostning: {LTBLUE}{CURRENCY}/år
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks hastighed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Dette års profit: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan ikke sende flyet til en hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Retning mod {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Retning mod {STATION} Hangar, {VELOCITY}
@@ -2662,8 +2654,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan ikke stoppe/starte fly...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Flyet er i luften
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Det er nødvendigt at bygge en lufthavn først
-STR_A019_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Flyet skal være stoppet i en flyhangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Kan ikke sælge flyet...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Lufthavnskonstruktion
@@ -2698,12 +2690,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Ømdøb flytypen
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Kan ikke omdøbe flytypen...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Ombyg flyet til at flyve med en anden slags last
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Ombyg)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Ombyg)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Ombyg fly
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den type last flyet skal flyve med
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Ombyg flyet til at flyve med den markerede slags last
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vælg den type last der skal flyves med:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Ombygningspris: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING1}{}{BLACK}Ombygningspris: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan ikke ombygge fly...
 STR_A043_REFITTABLE                                             :(ombygning mulig)
 STR_GO_TO_AIRPORT_HANGAR                                        :Flyv til {STATION} hangar
@@ -2727,8 +2719,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detailer
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Køretøjer:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stationer:
@@ -2765,7 +2757,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Tilskuer:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Præfiks:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Endetillæg:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Skift til Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Skift til Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Skift til Euro: {ORANGE}aldrig
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Eksempel: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Skift brugerdefineret møntfods parametre
@@ -2815,9 +2807,9 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Pris: {GOLD}{CURRENCY}{BLACK} Vægt: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighed: {GOLD}{VELOCITY}{BLACK}   Styrke: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Kørselsudgift: {GOLD}{CURRENCY}/år
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Lasteevne: {GOLD}{STRING} {STRING}
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Lasteevne: {GOLD}{STRING1} {STRING}
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Pålidelighed: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Pris: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vægt: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Pris: {GOLD}{CURRENCY}{BLACK} Hastighed: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Lasteevne: {GOLD}{COMMA} passagerer, {COMMA} sække post
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Lasteevne: {GOLD}{COMMA} passagerer, {COMMA} sække post
\ No newline at end of file
--- a/lang/dutch.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/dutch.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Vlak land nodig
 STR_0008_WAITING                                                :{BLACK}Wachtend: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (onderweg uit
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (onderweg uit
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepteert: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepteert: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Kaart - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spelopties
 STR_00B2_MESSAGE                                                :{YELLOW}Bericht
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Bericht van {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Bericht van {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan dit niet uitvoeren....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan gebied niet ontruimen....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Origineel copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rechten voorbehouden
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperiaal (mijlen)
 STR_013A_METRIC_KILOMETERS                                      :S.I. (kilometers)
-STR_013B_OWNED_BY                                               :{WHITE}...is van {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...is van {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Lading
 STR_013D_INFORMATION                                            :{BLACK}Informatie
 STR_013E_CAPACITIES                                             :{BLACK}Capaciteiten
 STR_013E_TOTAL_CARGO                                            :{BLACK}Totale lading
-STR_013F_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Totale lading (capaciteit) van deze trein:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nieuw spel
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauseer spel
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Spel opslaan, spel stoppen, afsluiten
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Toon lijst met stations van het bedrijf
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Sloopkosten: {LTBLUE}niet mogelijk
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Sloopkosten: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :(geen)
-STR_01A7_OWNER                                                  :{BLACK}Eigenaar: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Gemeente: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Eigenaar: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Gemeente: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Geen
 STR_01AA_NAME                                                   :{BLACK}Naam
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Kies uitleg/demonstratie
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepteert: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Accepteert: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Accepteert: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Accepteert: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Accepteert: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepteert: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Nummer{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Muziekprogrammakeuze
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Nummer index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Leeg
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Instelling voor alle berichttypes (aan/uit/samenvatting)
 STR_MESSAGE_SOUND                                               :{YELLOW}Speel een geluid af voor samengevatte nieuwsberichten
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...te ver van vorige bestemming
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top bedrijven die {NUMU16} bereikt hebben{}({STRING} Niveau)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Bedrijfswedstrijdtabel in {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top bedrijven die {NUM} bereikt hebben{}({STRING} Niveau)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Bedrijfswedstrijdtabel in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Zakenman
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnaat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon van de Eeuw
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} bereikt '{STRING}' status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} van {STRING} bereikt '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} bereikt '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} van {COMPANY} bereikt '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Kies stadsgrootte
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Stadsgrootte:
 
-STR_02B6                                                        :{STRING} - {STRING}
+STR_02B6                                                        :{STRING} - {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Laat laatste (nieuws)bericht zien
 STR_OFF                                                         :Uit
 STR_SUMMARY                                                     :Kort
 STR_FULL                                                        :Volledig
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Stedenlijst
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Voertuignamen
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Uit
 STR_CONFIG_PATCHES_ON                                           :Aan
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Geef snelheid in statusbalk weer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Bouwen op hellingen toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Gebruik realistisch handelsgebied: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Sta verwijderen van meer stedelijke wegen, bruggen, tunnels, enz. toe: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Zeer lange treinen toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistische acceleratie van treinen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Verbied schepen en treinen om 90 graden te draaien: {ORANGE}{STRING} {LTBLUE} (Vereist NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Stations samenvoegen als ze naast elkaar worden gebouwd: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Verlaat station wanneer één lading geladen is, met 'vol laden': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Gebruik verbeterde laad algorithme: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Lading alleen bezorgen aan een station als er vraag naar is: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Bouwen van zeer lange bruggen toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}'Ga naar depot' order toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Plaatsen van grondstofproducerende industrie toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Meerdere vergelijkbare industrieën per stad toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrieën van hetzelfde type dicht bij elkaar toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Altijd lange datum in statusbalk weergeven: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Seinen aan rijzijde plaatsen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Financieel overzicht aan het eind van het jaar weergeven: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch-compatibel nonstop-gebruik: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Rijvorming bij wegvoertuigen (met bijwerkingen): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Verschuif scherm als muis aan de rand is: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Omkopen van de gemeente toestaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nieuwe methode om het depot te vinden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Vrij gevormde stations: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nieuw algorithme voor routeplanning van treinen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nieuwe globale routeplanner (NPF, voorkeur over NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Geef snelheid in statusbalk weer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Bouwen op hellingen toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Gebruik realistisch handelsgebied: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Sta verwijderen van meer stedelijke wegen, bruggen, tunnels, enz. toe: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Zeer lange treinen toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistische acceleratie van treinen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Verbied schepen en treinen om 90 graden te draaien: {ORANGE}{STRING1} {LTBLUE} (Vereist NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Stations samenvoegen als ze naast elkaar worden gebouwd: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Verlaat station wanneer één lading geladen is, met 'vol laden': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Gebruik verbeterde laad algorithme: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Lading alleen bezorgen aan een station als er vraag naar is: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Bouwen van zeer lange bruggen toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}'Ga naar depot' order toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Plaatsen van grondstofproducerende industrie toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Meerdere vergelijkbare industrieën per stad toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrieën van hetzelfde type dicht bij elkaar toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Altijd lange datum in statusbalk weergeven: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Seinen aan rijzijde plaatsen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Financieel overzicht aan het eind van het jaar weergeven: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch-compatibel nonstop-gebruik: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Rijvorming bij wegvoertuigen (met bijwerkingen): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Verschuif scherm als muis aan de rand is: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Omkopen van de gemeente toestaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nieuwe methode om het depot te vinden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Vrij gevormde stations: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nieuw algorithme voor routeplanning van treinen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nieuwe globale routeplanner (NPF, voorkeur over NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Altijd kleine vliegvelden toestaan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Altijd kleine vliegvelden toestaan: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Een trein is verdwaald als er geen voortgang is binnen: {ORANGE}{STRING} dagen
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Een trein is verdwaald als er geen voortgang is binnen: {ORANGE}{STRING1} dagen
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Een trein is verdwaald wanneer er geen vooruitgang is in: {ORANGE}uit
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE} Herzie voertuigorders: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE} Herzie voertuigorders: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nee
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, maar sluit gestopte voertuigen uit
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :van alle voertuigen
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Waarschuw als het inkomen van een trein negatief is: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Voertuigen verlopen nooit: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Waarschuw als het inkomen van een trein negatief is: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Voertuigen verlopen nooit: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Vernieuw voertuig automatisch wanneer deze oud wordt
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Vernieuw voertuig automatisch {ORANGE}{STRING}{LTBLUE} maanden voor/na max. leeftijd
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimum benodigd geld voor automatisch vernieuwen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duur van foutmeldingen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Geef het inwoneraantal bij een stad weer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Onzichtbare bomen (met transparante gebouwen): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sneeuwhoogte: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale stationsomvang: {ORANGE}{STRING} {RED}Pas op: Hoge waarde vertraagt spel
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Helikopters automatisch repareren op helipads: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximaal aantal treinen per speler: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximaal aantal wegvoertuigen per speler: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximaal aantal vliegtuigen per speler: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximaal aantal schepen per speler: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Vernieuw voertuig automatisch {ORANGE}{STRING1}{LTBLUE} maanden voor/na max. leeftijd
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimum benodigd geld voor automatisch vernieuwen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duur van foutmeldingen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Geef het inwoneraantal bij een stad weer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Onzichtbare bomen (met transparante gebouwen): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sneeuwhoogte: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale stationsomvang: {ORANGE}{STRING1} {RED}Pas op: Hoge waarde vertraagt spel
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Helikopters automatisch repareren op helipads: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Treinen voor de computer uitschakelen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Wegvoertuigen voor de computer uitschakelen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Vliegtuigen voor de computer uitschakelen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Schepen voor de computer uitschakelen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximaal aantal treinen per speler: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximaal aantal wegvoertuigen per speler: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximaal aantal vliegtuigen per speler: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximaal aantal schepen per speler: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Nieuwe AI inschakelen (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Treinen voor de computer uitschakelen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Wegvoertuigen voor de computer uitschakelen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Vliegtuigen voor de computer uitschakelen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Schepen voor de computer uitschakelen: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standaard reparatie interval bij treinen: {ORANGE}{STRING} dagen
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Nieuwe AI inschakelen (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standaard reparatie interval bij treinen: {ORANGE}{STRING1} dagen
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Standaard reparatie interval voor treinen: {ORANGE}uit
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standaard reparatie interval bij wegvoertuigen: {ORANGE}{STRING} dagen
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standaard reparatie interval bij wegvoertuigen: {ORANGE}{STRING1} dagen
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Standaard reparatie interval voor voertuigen: {ORANGE}uit
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standaard reparatie interval bij vliegtuigen: {ORANGE}{STRING} dagen
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standaard reparatie interval bij vliegtuigen: {ORANGE}{STRING1} dagen
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Standaard reparatie interval voor vliegtuigen: {ORANGE}uit
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standaard reparatie interval bij schepen: {ORANGE}{STRING} dagen
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standaard reparatie interval bij schepen: {ORANGE}{STRING1} dagen
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Standaard reparatie interval voor schepen: {ORANGE}uit
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Schakel onderhoud uit wanneer defecten uit staan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Schakel onderhoud uit wanneer defecten uit staan: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Kleurenfoto's komen in: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Beginjaar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Stop spel in: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Kleurenfoto's komen in: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Beginjaar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Stop spel in: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Vloeiende economie inschakelen (meer, kleinere veranderingen)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Sta het kopen van aandelen toe
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Bij slepen, plaats seinen elke: {ORANGE}{STRING} tegel(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Sta automatische plaatsing van PBS-seinen toe: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Positie van hoofd knoppenbalk: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Bij slepen, plaats seinen elke: {ORANGE}{STRING1} tegel(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Sta automatische plaatsing van PBS-seinen toe: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Positie van hoofd knoppenbalk: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Links
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Midden
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Rechts
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Vaste plaats venster radius: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Vaste plaats venster radius: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Vaste plaats venster radius: {ORANGE}uit
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Tegenstanders
 
 STR_CONFIG_PATCHES_DISABLED                                     :uitgeschakeld
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Verander waarde
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Waarschuwing! Je staat op het punt je concurrenten te verraden. Denk eraan dat zo'n schande eeuwig onthouden wordt.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Verhoog geld met {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelend als speler: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magische bulldozer (industrieën en andere onverplaatsbare objecten verwijderen): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels mogen elkaar kruisen: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bouwen in gepauzeerde toestand: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magische bulldozer (industrieën en andere onverplaatsbare objecten verwijderen): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels mogen elkaar kruisen: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bouwen in gepauzeerde toestand: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetvliegtuigen storten niet (vaak) neer op kleine vliegvelden: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Verander klimaat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Verander datum: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Sta aanpassen productiewaarden toe: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Sta aanpassen productiewaarden toe: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Op weg naar {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Op weg naar {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... boei is in gebruik!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coördinaten: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coördinaten: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan deel van station niet weghalen...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan railtype hier niet veranderen...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Graaf suikermijn
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrielijst
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% vervoerd)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% vervoerd)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% vervoerd)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% vervoerd)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te dicht bij een andere industrie
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bouw trein om voor een ander ladingntype
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Omgebouwd}
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Bouw trein om
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies type lading om te transporteren
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Bouw trein om voor geselecteerde ladingtype
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan trein niet ombouwen...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Reparatie intervallen zijn in percentages: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Reparatie intervallen zijn in percentages: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Verander productie
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Welkom bij deze nieuwe AI, in aanbouw. Je kan problemen verwachten. Gebeurt dat, maak een screenshot en plaats die op het forum. Veel plezier!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Klimaat:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server versie:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adres:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adres:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Start datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Huidige datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Beveiligd met wachtwoord!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}BEDRIJFSINFORMATIE
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Bedrijfsnaam:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Begonnen in:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Begonnen in:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Bedrijfswaarde:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Huidige kas:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inkomen vorig jaar:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestatie:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestatie:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Voertuigen:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Voertuigen:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Spelers:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Verbinden...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Ophalen spelinformatie...
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Ophalen bedrijfsinformatie...
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} spelers(s) voor ons
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes gedownloaded
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} spelers(s) voor ons
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes gedownloaded
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Verbinding verbroken
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kon server-opgeslagen spel niet laden
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Kan server niet starten.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kan geen verbinding maken.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Verbinding #{NUMU16} duurde te lang.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Verbinding #{NUM} duurde te lang.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Er is een protocol-fout gemaakt en onze verbinding is gesloten.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} De revisie van deze client komt niet overeen met de revisie van de server.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Ongeldig wachtwoord.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-grootte van de kaart: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-grootte van de kaart: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-grootte van de kaart: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-grootte van de kaart: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kosten: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Steden
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebouw moet eerst gesloopt worden
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Bevolking: {ORANGE}{COMMA}{BLACK}  Huizen: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Geef informatie over de gemeente weer
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN}'s gemeenteraad
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Reputatie van transportbedrijven:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidies
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Beschikbare subsidies:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} van {STRING} naar {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} van {STRING2} naar {STRING2}
 STR_2028_BY                                                     :{YELLOW} (voor {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Geen
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Bestaande subsidies:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} van {STATION} naar {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} van {STATION} naar {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, tot {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING2} naar {STRING2} wordt nu niet meer gesubsidieerd.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidie teruggetrokken:{}{}{STRING}route van {STATION} naar {STATION} is nu niet meer gesubsidieerd.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidie aangeboden:{}{}Eerste {STRING}route van {STRING} naar {STRING} krijgt een jaar lang subsidie van de gemeente!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {STRING}!{}{}{STRING}route van {STATION} naar {STATION} krijgt 50% extra voor het volgende jaar!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {STRING}!{}{}{STRING}route van {STATION} naar {STATION} krijgt dubbele omzet voor het volgende jaar!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {STRING}!{}{}{STRING}route van {STATION} naar {STATION} krijgt driedubbele omzet voor het volgende jaar!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {STRING}!{}{}{STRING}route van {STATION} naar {STATION} krijgt vierdubbele omzet voor het volgende jaar!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidie aangeboden:{}{}Eerste {STRING}route van {STRING2} naar {STRING2} krijgt een jaar lang subsidie van de gemeente!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {COMPANY}!{}{}{STRING}route van {STATION} naar {STATION} krijgt 50% extra voor het volgende jaar!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {COMPANY}!{}{}{STRING}route van {STATION} naar {STATION} krijgt dubbele omzet voor het volgende jaar!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {COMPANY}!{}{}{STRING}route van {STATION} naar {STATION} krijgt driedubbele omzet voor het volgende jaar!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie uitgereikt aan {COMPANY}!{}{}{STRING}route van {STATION} naar {STATION} krijgt vierdubbele omzet voor het volgende jaar!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}De gemeenteraad van {TOWN} staat bouwen van nog een vliegveld niet toe
 STR_2036_COTTAGES                                               :Plattelandshuisjes
 STR_2037_HOUSES                                                 :Huizen
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Betaal de bouw van nieuwe commerciele gebouwen in de stad.{}  Kosten: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Koop 1 jaar exclusieve transportrechten in deze stad. De gemeenteraad staat passagiers en goederen toe alleen jouw stations te gebruiken.{} Kosten: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Koop het plaatselijk gezag om om je rang te verhogen, met het gevaar van een strenge sanctie, wanneer gepakt.{}  Kosten: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkeerschaos in {TOWN}!{}{}Wegreparatie betaald door {STRING} zorgt voor 6 maanden van irritatie bij weggebruikers!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkeerschaos in {TOWN}!{}{}Wegreparatie betaald door {COMPANY} zorgt voor 6 maanden van irritatie bij weggebruikers!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (in aanbouw)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...plek niet geschikt
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Kan hier geen boom planten...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...teveel borden
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kan hier geen bord plaatsen
 STR_280A_SIGN                                                   :Bord
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Te veel bushaltes
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel vrachtwagenstations
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Te dicht bij een andere (laad)station
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Verwijder eerst treinstation
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Te dicht bij een ander vliegveld
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Verwijder eerst vliegveld
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Te dicht bij een ander vrachtwagenstation
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Verwijder eerst bushalte
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Verwijder eerst vrachtwagenstation
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stations
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Geen -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...plaats ongeschikt
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Te dicht bij een andere dok
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Hoofdstedelijk vliegveld
 STR_305AB_LARGE                                                 :{BLACK}Internationaal vliegveld
 STR_305B_SIZE                                                   :{BLACK}Grootte
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Treinstation
 STR_305F_AIRCRAFT_HANGAR                                        :Vliegtuighangar
 STR_3060_AIRPORT                                                :Vliegveld
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Spel Laden
 STR_4002_SAVE                                                   :{BLACK}Opslaan
 STR_4003_DELETE                                                 :{BLACK}Verwijderen
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes vrij
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan niet lezen van schijf
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Opslaan Spel Mislukt
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Productie vorige maand:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% getransporteerd)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% getransporteerd)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreer het hoofdbeeld op de locatie van de industrie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nieuw {STRING} in aanbouw bij {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nieuw {STRING} in aanplant bij {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Geen naam{SKIP}
+STR_SV_UNNAMED                                                  :Geen naam
 STR_SV_TRAIN_NAME                                               :Trein {COMMA}
 STR_SV_ROADVEH_NAME                                             :Automobiel {COMMA}
 STR_SV_SHIP_NAME                                                :Schip {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Vliegtuig {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Noord
-STR_SV_STNAME_SOUTH                                             :{STRING} Zuid
-STR_SV_STNAME_EAST                                              :{STRING} Oost
-STR_SV_STNAME_WEST                                              :{STRING} West
-STR_SV_STNAME_CENTRAL                                           :{STRING} Centraal
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transferium
-STR_SV_STNAME_HALT                                              :{STRING} Halte
-STR_SV_STNAME_VALLEY                                            :{STRING} Vallei
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Hoogte
-STR_SV_STNAME_WOODS                                             :{STRING} Bossen
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Meerkant
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Uitwisseling
-STR_SV_STNAME_AIRPORT                                           :{STRING} Vliegveld
-STR_SV_STNAME_OILFIELD                                          :{STRING} Olieveld
-STR_SV_STNAME_MINES                                             :{STRING} Mijnen
-STR_SV_STNAME_DOCKS                                             :{STRING} Haven
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boei 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boei 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boei 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boei 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boei 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boei 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boei 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boei 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boei 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Bijbouw
-STR_SV_STNAME_SIDINGS                                           :{STRING} Zijspoor
-STR_SV_STNAME_BRANCH                                            :{STRING} Aftakking
-STR_SV_STNAME_UPPER                                             :Hoger {STRING}
-STR_SV_STNAME_LOWER                                             :Lager {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Helihaven
-STR_SV_STNAME_FOREST                                            :{STRING} Bossen
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Noord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Zuid
+STR_SV_STNAME_EAST                                              :{STRING1} Oost
+STR_SV_STNAME_WEST                                              :{STRING1} West
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Centraal
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transferium
+STR_SV_STNAME_HALT                                              :{STRING1} Halte
+STR_SV_STNAME_VALLEY                                            :{STRING1} Vallei
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Hoogte
+STR_SV_STNAME_WOODS                                             :{STRING1} Bossen
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Meerkant
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Uitwisseling
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Vliegveld
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Olieveld
+STR_SV_STNAME_MINES                                             :{STRING1} Mijnen
+STR_SV_STNAME_DOCKS                                             :{STRING1} Haven
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boei 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boei 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boei 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boei 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boei 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boei 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boei 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boei 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boei 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Bijbouw
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Zijspoor
+STR_SV_STNAME_BRANCH                                            :{STRING1} Aftakking
+STR_SV_STNAME_UPPER                                             :Hoger {STRING1}
+STR_SV_STNAME_LOWER                                             :Lager {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Helihaven
+STR_SV_STNAME_FOREST                                            :{STRING1} Bossen
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Speler {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nieuw gezicht
 STR_7005_COLOR_SCHEME                                           :{BLACK}Kleurenschema
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Naam van directeur
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Kan bedrijfsnaam niet veranderen...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Kan naam manager niet veranderen...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Financiën {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Financiën {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Uitgaven/inkomsten
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Bouwkosten
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nieuwe voertuigen
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Trein brandstofkosten
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Totaal:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Inkomstengrafiek
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Klik op geselecteerde nieuwe kleurenschema
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Vergroot lening
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Betaal deel van lening terug
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Directeur)
-STR_7038_INAUGURATED                                            :{GOLD}Gesticht: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Directeur)
+STR_7038_INAUGURATED                                            :{GOLD}Gesticht: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Voertuigen:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} trein
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} treinen
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Bedrijfs prestatie score (maximale score=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Bedrijfswaarde
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Bedrijfscompetitietabel
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transportbedrijf in de problemen!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} wordt verkocht of failliet verklaard tenzij finanicele situatie snel verbetert!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Directeur)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} wordt verkocht of failliet verklaard tenzij finanicele situatie snel verbetert!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Directeur)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transportbedrijf overgenomen!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} is verkocht aan {STRING} voor {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We zoeken voor een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {STRING} kopen voor {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} is verkocht aan {COMPANY} voor {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We zoeken voor een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {COMPANY} kopen voor {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Failliet!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} is gesloten door schuldeisers en alle eigendomen zijn verkocht!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} is gesloten door schuldeisers en alle eigendomen zijn verkocht!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nieuw transportbedrijf opgestart!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} begint werkzaamheden bij {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} begint werkzaamheden bij {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Kan bedrijf niet kopen...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Betalingsverhouding Vracht
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dagen onderweg
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Verkoop een aandeel van 25% in dit bedrijf
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan geen 25% aandeel in dit bedrijf kopen...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eigendom van {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% eigendom van {STRING}{}   {COMMA}% eigendom van {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} is overgenomen door {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eigendom van {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% eigendom van {COMPANY}{}   {COMMA}% eigendom van {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} is overgenomen door {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Treindepot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten... {}Eerste trein arriveert in {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Trein in de weg
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Ga naar {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ga naar {STATION} (Overladen en neem goederen)
 STR_8808_GO_TO_UNLOAD                                           :Ga naar {STATION} (Uit laden)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informatie
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trein te lang
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Treinen kunnen alleen aangepast worden wanneer ze gestopt zijn binnen een depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Treinen
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Treinen
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nieuwe spoorvoertuigen
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nieuwe monorailvoertuigen
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nieuwe maglevvoertuigen
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Ga naar
 STR_8827_FULL_LOAD                                              :{BLACK}Vol laden
 STR_8828_UNLOAD                                                 :{BLACK}Uitladen
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Orders)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Einde van orders - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Reparatie
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Kan spoorvoertuig niet bouwen...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}In- en uitladen
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trein moet gestopt zijn in depot
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan trein niet naar depot sturen...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Sla deze order over tenzij een reparatie nodig is
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nieuwe {STRING} nu beschikbaar!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prijs: {CURRENCY} Gewicht: {COMMA}t{}Snelheid: {VELOCITY}  Kracht: {COMMA}pk{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prijs: {CURRENCY} Gewicht: {COMMA}t{}Snelheid: {VELOCITY}  Kracht: {COMMA}pk{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Kapot
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING2}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Gewicht: {LTBLUE}{COMMA}t  {BLACK}Kracht: {LTBLUE}{COMMA}pk{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Wegvoertuig in de weg
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Wegvoertuigen
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Wegvoertuigen
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Bouw wegvoertuigdepot
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nieuwe voertuigen
 STR_9005_INFORMATION                                            :{BLACK}Informatie
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Bouw Voertuigen
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan het wegvoertuig niet bouwen...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Moet eerst wegvoertuig depot bouwen
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING2}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparaties: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...moet gestopt zijn binnen een wegvoertuig depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan dit wegvoertuig niet verkopen...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan wegvoertuig niet starten of stoppen...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bouw het geselecteerde wegvoertuig
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nieuw wegvoertuig nu beschikbaar!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Prijs: {CURRENCY}{}Snelheid: {VELOCITY}{}Brandstofkosten: {CURRENCY}/jr{}Capaciteit: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Prijs: {CURRENCY}{}Snelheid: {VELOCITY}{}Brandstofkosten: {CURRENCY}/jr{}Capaciteit: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Hernoem wegvoertuig
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Kan wegvoertuig niet hernoemen...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan hier geen dok bouwen...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Scheepswerf
 STR_9804_NEW_SHIPS                                              :{BLACK}Nieuwe schepen
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Schepen
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Schepen
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan geen schip bouwen...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Bouw eerst een scheepswerf
 STR_9808_NEW_SHIPS                                              :{WHITE}Nieuwe schepen
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Kan schip niet verkopen...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Kan schip niet kopen...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Schip in de weg
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING2}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan schip niet starten of stoppen...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan schip niet naar depot sturen...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan lokaal depot niet vinden
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Laat details van schip zien
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nieuw schip nu beschikbaar!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prijs: {CURRENCY} Max. snelheid: {VELOCITY}{}Capaciteit: {STRING}{}Brandstofkosten: {CURRENCY}/jr
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prijs: {CURRENCY} Max. snelheid: {VELOCITY}{}Capaciteit: {STRING1}{}Brandstofkosten: {CURRENCY}/jr
 STR_982F_NAME_SHIP                                              :{BLACK}Hernoem schip
 
 STR_9831_NAME_SHIP                                              :{WHITE}Hernoem schip
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Hernoem schiptype
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Kan schiptype niet hernoemen...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Bouw schip om om andere goederen te vervoeren
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Ombouwen)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Ombouwen)
 STR_983C_REFIT_SHIP                                             :{BLACK}Schip ombouwen
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer type goederen dat dit schip moet vervoeren
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Bouw schip om om geselecteerde goederen te vervoeren
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING1}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan schip niet ombouwen...
 STR_9842_REFITTABLE                                             :(ombouwbaar)
 STR_GO_TO_SHIP_DEPOT                                            :Ga naar {TOWN} Scheepswerf
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nieuw Vliegtuig
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Bouw Vliegtuig
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet bouwen...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Vliegtuigen
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Vliegtuigen
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING2}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bouwdatum: {LTBLUE}{NUMU16}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bouwdatum: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan vliegtuig niet naar hangar sturen...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Op weg naar {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Op weg naar {STATION} Hangar, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan vliegtuig niet stoppen/starten...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Vliegutig is in the lucht
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Moet eerst vliegveld bouwen
-STR_A019_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Vliegtuig moet gestopt zijn in een hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Kan vliegtuig niet verkopen...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Vliegveldbouw
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Hernoem vliegtuigtype
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Kan vliegtuigtype niet hernoemen...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Bouw vliegtuig om om andere goederen te vervoeren
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Omgebouwd)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Omgebouwd)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Vliegtuig ombouwen
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer goederentype om te vervoeren door het vliegtuig
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Bouw vliegtuig om om het geselecteerde goederentype te vervoeren
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING1}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet ombouwen...
 STR_A043_REFITTABLE                                             :(ombouwbaar)
 STR_GO_TO_AIRPORT_HANGAR                                        :Ga naar {STATION} hanger
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Voertuigen:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stations:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Scheidingsteken:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Voorvoegsel:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Achtervoegsel:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Overgaan op de Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Overgaan op de Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Overgaan op de Euro: {ORANGE}nooit
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Voorbeeld: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Verander aangepaste valuta optie
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Snelheid: {GOLD}{VELOCITY}{BLACK}   Kracht: {GOLD}{COMMA}pk
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Onderhoudskosten: {GOLD}{CURRENCY}/jr
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capaciteit: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUMU16}{BLACK} Levensduur: {GOLD}{COMMA} jaar
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capaciteit: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUM}{BLACK} Levensduur: {GOLD}{COMMA} jaar
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Betrouwbaarheid: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Snelheid: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capaciteit: {GOLD}{COMMA} passagiers, {COMMA} zakken post
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedreven wagons: {GOLD}+{COMMA}pk{BLACK} Gewicht: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedreven wagons: {GOLD}+{COMMA}pk{BLACK} Gewicht: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/english.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/english.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Flat land required
 STR_0008_WAITING                                                :{BLACK}Waiting: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (en-route from
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (en-route from
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepts: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepts: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Map - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Game Options
 STR_00B2_MESSAGE                                                :{YELLOW}Message
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message from {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message from {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Can't do this....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Can't clear this area....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (miles)
 STR_013A_METRIC_KILOMETERS                                      :Metric (kilometers)
-STR_013B_OWNED_BY                                               :{WHITE}...owned by {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...owned by {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Cargo
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Capacities
 STR_013E_TOTAL_CARGO                                            :{BLACK}Total Cargo
-STR_013F_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total cargo capacity of this train:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}New Game
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pause game
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Save game, abandon game, quit
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Display list of company's stations
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost to clear: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Owner: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Local authority: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Owner: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Local authority: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :None
 STR_01AA_NAME                                                   :{BLACK}Name
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -501,13 +501,7 @@
 STR_01CC_TOGGLE_LARGE_SMALL_MAP                                 :{BLACK}Toggle large/medium/small map size
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Select Tutorial/Demonstration
 
-############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Cargo accepted: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
-############ range for cargo acecpted ends
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Cargo accepted: {LTBLUE}
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
@@ -531,13 +525,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Track{SETX 88}Title
 STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programme
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Music Programme Selection
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Track Index
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programme - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Clear
@@ -575,8 +569,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Set all message types to: Off / Summary/ Full
 STR_MESSAGE_SOUND                                               :{YELLOW}Play sound for summarised news messages
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...too far from previous destination
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUMU16}{}({STRING} Level)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUM}{}({STRING} Level)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Businessman
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
@@ -585,10 +579,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon of the Century
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} achieves '{STRING}' status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} of {STRING} achieves '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +722,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Select town size
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Town size:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Show last message or news report
 STR_OFF                                                         :Off
 STR_SUMMARY                                                     :Summary
 STR_FULL                                                        :Full
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Town directory
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Vehicle design names
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +990,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Off
 STR_CONFIG_PATCHES_ON                                           :On
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Show vehicle speed in status bar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Allow removal of more town-owned roads, bridges, etc: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Enable building very long trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING} {LTBLUE} (requires NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Allow building very long bridges: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Allow goto depot orders: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Allow constructing raw material producing industries: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}New depot finding: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}New algorithm for train pathfinding (NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}New global pathfinding (NPF, overrides NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Show vehicle speed in status bar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Allow removal of more town-owned roads, bridges, etc: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Enable building very long trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING1} {LTBLUE} (requires NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Allow building very long bridges: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Allow goto depot orders: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Allow constructing raw material producing industries: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}New depot finding: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}New algorithm for train pathfinding (NTP): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}New global pathfinding (NPF, overrides NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Always allow small airports: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Always allow small airports: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A train is lost if no progress is made for: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A train is lost if no progress is made for: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}A train is lost if no progress is made for: {ORANGE}disabled
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :no
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :yes, but exclude stopped vehicles
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :of all vehicles
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warn if a train's income is negative: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehicles never expire: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warn if a train's income is negative: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehicles never expire: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autorenew vehicle when it gets old
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenew when vehice is {ORANGE}{STRING}{LTBLUE} months before/after max age
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duration of error message: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snow line height: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station spread: {ORANGE}{STRING} {RED}Warning: High setting slows game
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trains per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aircraft per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max ships per player: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenew when vehice is {ORANGE}{STRING1}{LTBLUE} months before/after max age
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duration of error message: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snow line height: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station spread: {ORANGE}{STRING1} {RED}Warning: High setting slows game
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disable trains for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trains per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aircraft per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max ships per player: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disable trains for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Default service interval for trains: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Default service interval for road vehicles: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Default service interval for aircraft: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Default service interval for ships: {ORANGE}disabled
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Coloured news appears in: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}End game in: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Coloured news appears in: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}End game in: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Enable smooth economy (more, smaller changes)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Allow buying shares from other companies
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging, place signals every: {ORANGE}{STRING} tile(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Allow automatic placement of pbs signals: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging, place signals every: {ORANGE}{STRING1} tile(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Allow automatic placement of pbs signals: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Left
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centre
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Right
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Window snap radius: {ORANGE}disabled
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1089,7 +1083,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competitors
 
 STR_CONFIG_PATCHES_DISABLED                                     :disabled
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Change setting value
@@ -1105,13 +1099,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetplanes will not crash (frequently) on small airports: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Switch climate: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Change date: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable modifying production values: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable modifying production values: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Heading for {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1159,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...buoy is in use!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Can't convert railtype here...
@@ -1203,19 +1197,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construct Sugar Mine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Refit train to carry a different cargo type
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Refit)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Refit train
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for train to carry
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Refit train to carry highlighted cargo type
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Can't refit train...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Change production
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Welcome to this new AI, a work in progress. You should expect problems. When you happen take a screenshot and post it in the forum. Enjoy!
@@ -1254,7 +1247,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
@@ -1323,14 +1316,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Company value:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Players:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connecting...
@@ -1346,8 +1339,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Fetching game info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching company info..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(s) in front of you
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes downloaded so far
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) in front of you
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes downloaded so far
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
 
@@ -1365,7 +1358,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Could not load savegame
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Could not start the server
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Could not connect
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUMU16} timed out
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUM} timed out
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} A protocol-error was made and the connection was closed
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} The revision of this client does not match the server's revision
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Wrong password
@@ -1418,8 +1411,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-size of map: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-size of map: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-size of map: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-size of map: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cost: {CURRENCY}
@@ -1517,10 +1510,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Towns
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Building must be demolished first
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
@@ -1553,23 +1546,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Show information on local authority
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} local authority
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transport company ratings:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidies
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidies on offer for services taking:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING} to {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING2} to {STRING2}
 STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}None
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidised:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, until {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING2} to {STRING2} will now not attract a subsidy.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidised.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING} to {STRING} will attract a year's subsidy from the local authority!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay triple rates for the next year!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay quadruple rates for the next year!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING2} to {STRING2} will attract a year's subsidy from the local authority!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay triple rates for the next year!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay quadruple rates for the next year!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} local authority refuses to allow another airport to be built in this town
 STR_2036_COTTAGES                                               :Cottages
 STR_2037_HOUSES                                                 :Houses
@@ -1603,7 +1596,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {COMPANY} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
@@ -1621,7 +1614,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Can't plant tree here...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...too many signs
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Can't place sign here...
 STR_280A_SIGN                                                   :Sign
@@ -1645,7 +1637,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Too many bus stops
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Too many lorry stations
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Too close to another station/loading area
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Must demolish railway station first
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Too close to another airport
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Must demolish airport first
@@ -1678,8 +1670,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Too close to another lorry station
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish lorry station first
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stations
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- None -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Too close to another dock
@@ -1700,8 +1692,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolitan airport
 STR_305AB_LARGE                                                 :{BLACK}International airport
 STR_305B_SIZE                                                   :{BLACK}Size
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Railway station
 STR_305F_AIRCRAFT_HANGAR                                        :Aircraft hangar
 STR_3060_AIRPORT                                                :Airport
@@ -1734,7 +1726,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Load Game
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed
@@ -1796,7 +1788,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transported)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transported)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centre the main view on industry location
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}New {STRING} under construction near {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}New {STRING} being planted near {TOWN}!
@@ -1876,45 +1868,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Unnamed{SKIP}
+STR_SV_UNNAMED                                                  :Unnamed
 STR_SV_TRAIN_NAME                                               :Train {COMMA}
 STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA}
 STR_SV_SHIP_NAME                                                :Ship {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} North
-STR_SV_STNAME_SOUTH                                             :{STRING} South
-STR_SV_STNAME_EAST                                              :{STRING} East
-STR_SV_STNAME_WEST                                              :{STRING} West
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :{STRING} Halt
-STR_SV_STNAME_VALLEY                                            :{STRING} Valley
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Heights
-STR_SV_STNAME_WOODS                                             :{STRING} Woods
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Lakeside
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Exchange
-STR_SV_STNAME_AIRPORT                                           :{STRING} Airport
-STR_SV_STNAME_OILFIELD                                          :{STRING} Oilfield
-STR_SV_STNAME_MINES                                             :{STRING} Mines
-STR_SV_STNAME_DOCKS                                             :{STRING} Docks
-STR_SV_STNAME_BUOY_1                                            :{STRING} Buoy 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Buoy 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Buoy 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Buoy 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Buoy 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Buoy 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Buoy 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Buoy 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Buoy 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annexe
-STR_SV_STNAME_SIDINGS                                           :{STRING} Sidings
-STR_SV_STNAME_BRANCH                                            :{STRING} Branch
-STR_SV_STNAME_UPPER                                             :Upper {STRING}
-STR_SV_STNAME_LOWER                                             :Lower {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Forest
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} North
+STR_SV_STNAME_SOUTH                                             :{STRING1} South
+STR_SV_STNAME_EAST                                              :{STRING1} East
+STR_SV_STNAME_WEST                                              :{STRING1} West
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :{STRING1} Halt
+STR_SV_STNAME_VALLEY                                            :{STRING1} Valley
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Heights
+STR_SV_STNAME_WOODS                                             :{STRING1} Woods
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Lakeside
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Exchange
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Airport
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Oilfield
+STR_SV_STNAME_MINES                                             :{STRING1} Mines
+STR_SV_STNAME_DOCKS                                             :{STRING1} Docks
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Buoy 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Buoy 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Buoy 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Buoy 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Buoy 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Buoy 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Buoy 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Buoy 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Buoy 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annexe
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Sidings
+STR_SV_STNAME_BRANCH                                            :{STRING1} Branch
+STR_SV_STNAME_UPPER                                             :Upper {STRING1}
+STR_SV_STNAME_LOWER                                             :Lower {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Forest
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1985,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Player {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}New Face
 STR_7005_COLOR_SCHEME                                           :{BLACK}Colour Scheme
@@ -2005,9 +1997,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Manager's Name
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Can't change company name...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Can't change manager's name...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finances {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finances {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Expenditure/Income
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construction
 STR_7012_NEW_VEHICLES                                           :{GOLD}New Vehicles
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Train Running Costs
@@ -2024,7 +2016,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Income Graph
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2041,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Click on desired colour scheme
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Increase size of loan
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Repay part of loan
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
@@ -2078,18 +2070,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Company performance ratings (maximum rating=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Company values
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Company League Table
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transport company in trouble!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} will be sold off or declared bankrupt unless performance increases soon!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Manager)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} will be sold off or declared bankrupt unless performance increases soon!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Manager)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transport company merger!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} has been sold to {STRING} for {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We are looking for a transport company to take-over our company.{}{}Do you want to purchase {STRING} for {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} has been sold to {COMPANY} for {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We are looking for a transport company to take-over our company.{}{}Do you want to purchase {COMPANY} for {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrupt!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} has been closed down by creditors and all assets sold off!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} has been closed down by creditors and all assets sold off!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}New transport company launched!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} starts construction near {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} starts construction near {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Can't buy company...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Cargo Payment Rates
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Days in transit
@@ -2124,9 +2116,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sell 25% share in this company
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Can't buy 25% share in this company...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {STRING}{}   {COMMA}% owned by {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} has been taken over by {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {COMPANY}{}   {COMMA}% owned by {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}This company is not old enough to trade shares yet...
 
 ##id 0x8000
@@ -2398,10 +2390,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Train Depot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Go to {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Go to {STATION} (Transfer and take cargo)
 STR_8808_GO_TO_UNLOAD                                           :Go to {STATION} (Unload)
@@ -2433,7 +2425,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train too long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trains can only be altered when stopped inside a depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2445,14 +2437,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Go To
 STR_8827_FULL_LOAD                                              :{BLACK}Full Load
 STR_8828_UNLOAD                                                 :{BLACK}Unload
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Orders)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - End of Orders - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Service
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Can't build railway vehicle...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Value: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Loading / Unloading
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Train must be stopped inside a depot
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Can't send train to depot...
@@ -2501,9 +2493,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Weight: {LTBLUE}{COMMA}t  {BLACK}Power: {LTBLUE}{COMMA}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
@@ -2526,8 +2518,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Road Vehicles
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Road Vehicles
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Road Vehicle Depot
 STR_9004_NEW_VEHICLES                                           :{BLACK}New Vehicles
 STR_9005_INFORMATION                                            :{BLACK}Information
@@ -2535,14 +2527,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Build Vehicle
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Can't build road vehicle...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Must build road vehicle depot first
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...must be stopped inside a road vehicle depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Can't sell road vehicle...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Can't stop/start road vehicle...
@@ -2567,7 +2558,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Build the highlighted road vehicle
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}New road vehicle now available!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Speed: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Speed: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name road vehicle
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Can't name road vehicle...
@@ -2590,7 +2581,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ship Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}New Ships
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Ships
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Ships
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Can't build ships...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Must build ship depot first
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2599,15 +2590,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Can't sell ship...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Can't build ship...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Ship in the way
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Can't stop/start ship...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Can't send ship to depot...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Unable to find local depot
@@ -2631,7 +2621,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Show ship details
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}New ship now available!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING}{}Running Cost: {CURRENCY}/yr
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING1}{}Running Cost: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Name ship
 
 STR_9831_NAME_SHIP                                              :{WHITE}Name ship
@@ -2644,12 +2634,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Rename ship type
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Can't rename ship type...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Refit cargo ship to carry a different cargo type
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_983C_REFIT_SHIP                                             :{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Refit ship to carry highlighted cargo type
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
 STR_GO_TO_SHIP_DEPOT                                            :Go to {TOWN} Ship Depot
@@ -2664,15 +2654,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Build Aircraft
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Can't build aircraft...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aircraft
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aircraft
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Can't send aircraft to hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Heading for {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Heading for {STATION} Hangar, {VELOCITY}
@@ -2681,8 +2671,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Can't stop/start aircraft...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aircraft is in flight
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Must build airport first
-STR_A019_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aircraft must be stopped in hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Can't sell aircraft...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Airport construction
@@ -2717,12 +2707,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Rename aircraft type
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Can't rename aircraft type...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry a different cargo type
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Refit aircraft
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for aircraft to carry
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry highlighted cargo type
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
 STR_A043_REFITTABLE                                             :(refittable)
 STR_GO_TO_AIRPORT_HANGAR                                        :Go to {STATION} Hangar
@@ -2746,8 +2736,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehicles:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stations:
@@ -2784,7 +2774,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Switch to Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Switch to Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Switch to Euro: {ORANGE}never
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Preview: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Change custom currency parameter
@@ -2834,8 +2824,8 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Running Cost: {GOLD}{CURRENCY}/yr
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUMU16}{BLACK} Life: {GOLD}{COMMA} years
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUM}{BLACK} Life: {GOLD}{COMMA} years
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{COMMA}t  ({COMMA}t)
--- a/lang/finnish.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/finnish.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Tarvitaan tasaista maata.
 STR_0008_WAITING                                                :{BLACK}Lähdössä: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (matkalla:
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (matkalla:
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Vastaanottaa: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Vastaanottaa: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Kartta - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Pelin asetukset
 STR_00B2_MESSAGE                                                :{YELLOW}Viesti
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Viesti: {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Viesti: {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ei onnistu....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Aluetta ei voi puhdistaa....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Alkuperäinen {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Brittiläinen (mailit)
 STR_013A_METRIC_KILOMETERS                                      :Metrinen (kilometrit)
-STR_013B_OWNED_BY                                               :{WHITE}...omistaja: {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...omistaja: {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Rahti
 STR_013D_INFORMATION                                            :{BLACK}Tietoja
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteetit
 STR_013E_TOTAL_CARGO                                            :{BLACK}Rahtia yhteensä
-STR_013F_CAPACITY                                               :{BLACK}Kapaisteetti: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapaisteetti: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kokonaisrahti (kapasiteetti):
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Uusi peli
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Tauko
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Pelin tallennus, hylkääminen ja lopetus.
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Näytä luettelo yhtiön asemista.
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Puhdistuksen kulu: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhdistuksen kulu: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Omistaja: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kunta: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Omistaja: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kunta: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ei mitään
 STR_01AA_NAME                                                   :{BLACK}Nimi
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Valitse pikaohje/esitys.
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Vastaanottaa rahtia: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Vastaanottaa rahtia: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Vastaanottaa rahtia: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Vastaanottaa rahtia: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Vastaanottaa rahtia: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Vastaanottaa rahtia: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Raita{SETX 88}Nimike
 STR_01E9_SHUFFLE                                                :{TINYFONT}Sekoita
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelmoi
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musiikkiohjelman valinta
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Raitaindeksi
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tyhjää
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Asetukset viestityypeille (päällä/pois/tiivistelmä)
 STR_MESSAGE_SOUND                                               :{YELLOW}Soita ääni tiivistetyn uutisviestin kohdalla
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...liian kaukana edellisestä määränpäästä
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Parhaat yhtiöt, jotka saavuttivat vuoden {NUMU16}{}(taso: {STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Yhtiökilpailutaulukko vuonna {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Parhaat yhtiöt, jotka saavuttivat vuoden {NUM}{}(taso: {STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Yhtiökilpailutaulukko vuonna {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Liikemies
 STR_0214_ENTREPRENEUR                                           :Yrittäjä
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnaatti
 STR_0218_MOGUL                                                  :Moguli
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Vuosisadan pohatta
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} saavuttaa arvon '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} yhtiöstä {STRING} saavuttaa arvon '{STRING}'!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} saavuttaa arvon '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Valitse kaupungin koko.
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Kaupungin koko:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Näytä viimeisin viesti tai uutisraportti.
 STR_OFF                                                         :Pois
 STR_SUMMARY                                                     :Tiivistetty
 STR_FULL                                                        :Täysi
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Kaupunkihakemisto
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Liikennevälineiden mallien nimet
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :pois
 STR_CONFIG_PATCHES_ON                                           :päällä
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Ajoneuvon nopeus tilapalkissa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Rakentaminen rinteisiin ja rannikolle sallittu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Realistisemman kokoiset vaikutusalueet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Kaupungin omistamien teiden, siltojen, jne. raivaaminen sallittu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Erittäin pitkien junien rakentaminen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Junat kiihdyttävät realistisesti: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Junat ja laivat: ei 90-asteen käännöksiä: {ORANGE}{STRING} {LTBLUE} (vaatii: NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Yhdistä vierekkäiset rautatieasemat: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Jätä asema, kun mikä tahansa rahti on täysi, jos 'täysi lastaus': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Käytä kehittyneempää lastausalgoritmia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflaatio: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Kuljeta rahti asemalle vain, kun on kysyntää: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Erittäin pitkien siltojen rakentaminen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Varikollemenomääräykset: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Raaka-aineteollisuuden rakentaminen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Kaupungissa voi olla useita samanlaisia teollisuustyyppejä: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Samantyyppistä teollisuutta voidaan rakentaa lähekkäin: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Näytä aina koko päiväys tilapalkissa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Näytä opastimet ajokaistalla: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Näytä rahoitusikkuna vuoden lopussa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch: Junat pysähtyvät vain aikataulun asemilla: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Ajoneuvojonotus (kvanttitehostein): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Vieritä ikkunaa, kun hiiri osuu reunaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Salli viranomaisten lahjominen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Uusi huoltoasemahaku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Epäyhtenäiset asemat: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Uusi algoritmi junien tienhaulle: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Uusi globaali tienhakualgor. (NPF, korvaa NTP:n): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Ajoneuvon nopeus tilapalkissa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Rakentaminen rinteisiin ja rannikolle sallittu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Realistisemman kokoiset vaikutusalueet: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Kaupungin omistamien teiden, siltojen, jne. raivaaminen sallittu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Erittäin pitkien junien rakentaminen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Junat kiihdyttävät realistisesti: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Junat ja laivat: ei 90-asteen käännöksiä: {ORANGE}{STRING1} {LTBLUE} (vaatii: NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Yhdistä vierekkäiset rautatieasemat: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Jätä asema, kun mikä tahansa rahti on täysi, jos 'täysi lastaus': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Käytä kehittyneempää lastausalgoritmia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflaatio: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Kuljeta rahti asemalle vain, kun on kysyntää: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Erittäin pitkien siltojen rakentaminen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Varikollemenomääräykset: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Raaka-aineteollisuuden rakentaminen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Kaupungissa voi olla useita samanlaisia teollisuustyyppejä: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Samantyyppistä teollisuutta voidaan rakentaa lähekkäin: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Näytä aina koko päiväys tilapalkissa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Näytä opastimet ajokaistalla: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Näytä rahoitusikkuna vuoden lopussa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch: Junat pysähtyvät vain aikataulun asemilla: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Ajoneuvojonotus (kvanttitehostein): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Vieritä ikkunaa, kun hiiri osuu reunaan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Salli viranomaisten lahjominen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Uusi huoltoasemahaku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Epäyhtenäiset asemat: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Uusi algoritmi junien tienhaulle: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Uusi globaali tienhakualgor. (NPF, korvaa NTP:n): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Salli aina pienet lentokentät: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Salli aina pienet lentokentät: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Juna on eksynyt, jos edistystä ei tapahdu: {ORANGE}{STRING} päivään
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Juna on eksynyt, jos edistystä ei tapahdu: {ORANGE}{STRING1} päivään
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Juna menetetään, jos edistystä ei tapahdu: {ORANGE}pois käytöstä
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Tarkista ajoneuvojen pysähdykset: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Tarkista ajoneuvojen pysähdykset: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :ei
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :kyllä, mutta ei pysäytetyille
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :kaikille ajoneuvoille
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varoita, jos junan tuotto on negatiivinen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Ajoneuvot eivät vanhene: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varoita, jos junan tuotto on negatiivinen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Ajoneuvot eivät vanhene: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Itseuudista ajoneuvo, kun se vanhenee
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Itseuudista {ORANGE}{STRING}{LTBLUE} kuukautta ennen/jälkeen enimmäisiän
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Pienin tarvittava rahamäärä itseuudistukseen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Virheilmoituksen kesto: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Näytä kaupungin asukasluku kaupungin nimessä: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Näkymättömät puut (näkymättömillä rakennuksilla): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Lumirajan korkeus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Suurin aseman levittäytyminen: {ORANGE}{STRING} {RED}Huom: korkea asetus hidastaa peliä
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Huolla helikopterit helikopterialustoilla automaattisesti: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Junia/pelaajaa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Ajoneuvoja/pelaajaa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Lentokoneita/pelaajaa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Laivoja/pelaajaa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Itseuudista {ORANGE}{STRING1}{LTBLUE} kuukautta ennen/jälkeen enimmäisiän
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Pienin tarvittava rahamäärä itseuudistukseen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Virheilmoituksen kesto: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Näytä kaupungin asukasluku kaupungin nimessä: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Näkymättömät puut (näkymättömillä rakennuksilla): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Lumirajan korkeus: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Suurin aseman levittäytyminen: {ORANGE}{STRING1} {RED}Huom: korkea asetus hidastaa peliä
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Huolla helikopterit helikopterialustoilla automaattisesti: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Tietokoneella ei ole junia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Tietokoneella ei ole ajoneuvoja: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Tietokoneella ei ole lentokoneita: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Tietokoneella ei ole laivoja: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Junia/pelaajaa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Ajoneuvoja/pelaajaa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Lentokoneita/pelaajaa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Laivoja/pelaajaa: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Ota käyttöön uusi AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Tietokoneella ei ole junia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Tietokoneella ei ole ajoneuvoja: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Tietokoneella ei ole lentokoneita: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Tietokoneella ei ole laivoja: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Oletushuoltoväli junille: {ORANGE}{STRING} päivää
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Ota käyttöön uusi AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Oletushuoltoväli junille: {ORANGE}{STRING1} päivää
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Oletushuoltoväli junille: {ORANGE}pois päältä
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Oletushuoltoväli ajoneuvoille: {ORANGE}{STRING} päivää
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Oletushuoltoväli ajoneuvoille: {ORANGE}{STRING1} päivää
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Oletushuoltoväli ajoneuvoille: {ORANGE}pois päältä
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Oletushuoltoväli lentokoneille: {ORANGE}{STRING} päivää
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Oletushuoltoväli lentokoneille: {ORANGE}{STRING1} päivää
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Oletushuoltoväli lentokoneille: {ORANGE}pois päältä
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Oletushuoltoväli laivoille: {ORANGE}{STRING} päivää
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Oletushuoltoväli laivoille: {ORANGE}{STRING1} päivää
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Oletushuoltoväli laivoille: {ORANGE}pois päältä
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Huollot pois käytöstä, kun rikkoutumiset on pois: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Huollot pois käytöstä, kun rikkoutumiset on pois: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Värjätyt uutiset: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Aloitusvuosi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Lopetusvuosi: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Värjätyt uutiset: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Aloitusvuosi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Lopetusvuosi: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Tasainen talous (enemmän pieniä muutoksia)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Osakkeiden ostaminen yhtiöistä
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Vedettäessä aseta opastimien väleiksi: {ORANGE}{STRING} ruutu(a)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Salli pbs-signaalien automaattinen sijoittaminen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Päätyökalupalkin sijainti: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Vedettäessä aseta opastimien väleiksi: {ORANGE}{STRING1} ruutu(a)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Salli pbs-signaalien automaattinen sijoittaminen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Päätyökalupalkin sijainti: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :vasen
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :keskellä
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :oikea
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}{STRING} piks.
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}{STRING1} piks.
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}pois päältä
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Käyttöliittymä
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Vastustajat
 
 STR_CONFIG_PATCHES_DISABLED                                     :pois käytöstä
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Muuta asetusarvo
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Varoitus! Olet juuri pettämässä kanssakilpailijoitasi. Pidä mielessä, että tällainen häväistys pidetään mielessä ikuisuuden ajan.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Anna lisää rahaa: {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Pelaa pelaajana: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Taikapuskutraktori (siirrä teollisuutta yms.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnelit voivat mennä ristiin: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Rakenna tauon aikana: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Taikapuskutraktori (siirrä teollisuutta yms.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnelit voivat mennä ristiin: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Rakenna tauon aikana: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Suihkukoneet eivät syöksy (usein) pienille lentokentille: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Vaihda ilmastoa: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Muuta päiväystä: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Muuntuvat tuotantoarvot: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Muuntuvat tuotantoarvot: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Kohde: {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Kohde: {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...poiju on käytössä!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinaatit: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordinaatit: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Aseman osaa ei voi poistaa...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Raidetyyppiä ei voi muuntaa...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Rakenna sokerikaivos.
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Teollisuusala
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% kuljetettu)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% kuljetettu)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liian lähellä toista teollisuutta.
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Sovita juna kuljettamaan erityyppistä rahtia.
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Sovita)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Sovita juna
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse junan rahtityyppi
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Sovita juna kuljettamaan valittua rahtityyppiä.
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Junaa ei voi sovittaa...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Huoltovälit ovat prosentteina: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Huoltovälit ovat prosentteina: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Aloita tuotanto
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Tervetuloa käyttämään uutta tekoälyä (kehitysversio). Ongelmia voi esiintyä, ja kun sellainen tulee vastaan, ota kuvankaappaus ja lähetä se keskustelualueelle. Pidä hauskaa!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Ruudusto:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Palvelimen versio:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Palvelimen osoite:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Palvelimen osoite:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Aloitusvuosi:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Päivämäärä:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Salasanasuojattu!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}YHTIÖN TIEDOT
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Yhtiön nimi:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Perustettu:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Perustettu:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Yhtiön arvo:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nykyinen kate:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Viime vuoden tulot:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Suorituskyky:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Suorituskyky:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Liikenneväl.:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Asemat:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Liikenneväl.:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Asemat:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Pelaajat:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Yhdistetään...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Haetaan pelitiedot..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Haetaan yhtiötiedot...
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} pelaajaa jonossa
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kt ladattu
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} pelaajaa jonossa
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kt ladattu
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Pura yhteys
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Palvelimen pelitallennetta ei voi ladata.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Palvelinta ei voitu käynnistää.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Yhdistäminen ei onnistunut.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Yhteys #{NUMU16} aikakatkaistiin.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Yhteys #{NUM} aikakatkaistiin.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Teimme protokollavirheen ja yhteys katkesi.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Tämän asiakkaan revisio ei vastaa palvelimen revisiota.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Väärä salasana.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Kartan x-koko: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Kartan y-koko: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Kartan x-koko: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Kartan y-koko: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kulu: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Kaupungit
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Rakennus täytyy tuhota ensin.
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Asukasluku: {ORANGE}{COMMA}{BLACK}  Taloja: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Näytä tietoja paikallisviranomaisista.
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN}: viranomaiset
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Kuljetusyhtiön arvioinnit:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Tuet
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjolla olevat tuet palveluille:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} välille {STRING}-{STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} välille {STRING2}-{STRING2}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Ei mitään
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Käytetyt tuet palveluille:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, {DATE_SHORT} asti)
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING} - {STRING} ei sisällä enää tukia.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING2} - {STRING2} ei sisällä enää tukia.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Tuki vedetty pois:{}{}{STRING} kuljetuspalvelu välille {STATION}-{STATION} ei ole enää tuettu.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Tuki tarjottu:{}{}Ensimmäisen {STRING}kuljetuksen tuottaminen välille {STRING} - {STRING} tarkoittaa vuoden mittaisen tuen saamista paikallisviranomaisilta!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {STRING}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa 50% enemmän seuraavan vuoden ajan!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {STRING}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa tuplaten seuraavan vuoden ajan!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {STRING}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa kolminkertaisesti seuraavan vuoden ajan!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {STRING}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa nelinkertaisesti seuraavan vuoden ajan!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Tuki tarjottu:{}{}Ensimmäisen {STRING}kuljetuksen tuottaminen välille {STRING2} - {STRING2} tarkoittaa vuoden mittaisen tuen saamista paikallisviranomaisilta!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa 50% enemmän seuraavan vuoden ajan!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa tuplaten seuraavan vuoden ajan!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa kolminkertaisesti seuraavan vuoden ajan!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa nelinkertaisesti seuraavan vuoden ajan!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: paikallisviranomaiset eivät salli toisen lentokentän rakentamista tähän kaupunkiin.
 STR_2036_COTTAGES                                               :Mökkiä
 STR_2037_HOUSES                                                 :Taloa
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Rahoita uusien kaupparakennusten rakentamista kaupungissa.{}  Kulu: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Osta vuoden yksinoikeudet kaupungin liikennöintiin. Paikallisviranomaiset eivät salli muiden yhtiöiden kuljettaa matkustajia ja rahtia.{} Kulu: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Lahjo viranomaisia lisätäksesi arviotasi; rangaistus voi olla kuitenkin suuri, jos jäät kiinni.{}  Kulu: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN}: liikenne on kaaoksessa!{}{}{STRING} rahoittaa katujen kunnostuksen; autoilijoille odotettavissa kuusi kuukautta kurjuutta!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN}: liikenne on kaaoksessa!{}{}{COMPANY} rahoittaa katujen kunnostuksen; autoilijoille odotettavissa kuusi kuukautta kurjuutta!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (rakennetaan)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...paikka sopimaton.
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Puuta ei voi istuttaa...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...liian monta kylttiä.
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kylttiä ei voi sijoittaa...
 STR_280A_SIGN                                                   :Kyltti
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Liian monta linja-autopysäkkiä.
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Liian monta lastauslaituria.
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Liian lähellä toista asemaa/lastausaluetta.
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Rautatieasema pitää tuhota ensin.
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Liian lähellä toista lentokenttää.
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Lentokenttä pitää tuhota ensin.
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Liian lähellä toista lastauslaituria.
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Linja-autoasema pitää tuhota ensin.
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää tuhota ensin.
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} asemaa
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} asemaa
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ei mitään -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...paikka sopimaton.
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Liian lähellä toista satamaa.
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Suurkaupungin lentokenttä
 STR_305AB_LARGE                                                 :{BLACK}Kansainvälinen lentokenttä
 STR_305B_SIZE                                                   :{BLACK}Koko
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Rautatieasema
 STR_305F_AIRCRAFT_HANGAR                                        :Lentokonesuoja
 STR_3060_AIRPORT                                                :Lentokenttä
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Lataa peli
 STR_4002_SAVE                                                   :{BLACK}Tallenna
 STR_4003_DELETE                                                 :{BLACK}Poista
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megatavua vapaana
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Asemaa ei voi lukea.
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Tallennus epäonnistui.
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Tuotto viime kuussa:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% kuljetettu)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% kuljetettu)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Keskitä päänäkymä teollisuuden sijaintiin.
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Uusi {STRING} rakennetaan kaupungin {TOWN} lähistölle!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Uusi {STRING} istutetaan kaupungin {TOWN} lähistölle!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Nimetön{SKIP}
+STR_SV_UNNAMED                                                  :Nimetön
 STR_SV_TRAIN_NAME                                               :Juna {COMMA}
 STR_SV_ROADVEH_NAME                                             :Ajoneuvo {COMMA}
 STR_SV_SHIP_NAME                                                :Laiva {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Lentokone {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :Pohjois-{STRING}
-STR_SV_STNAME_SOUTH                                             :Etelä-{STRING}
-STR_SV_STNAME_EAST                                              :Itä-{STRING}
-STR_SV_STNAME_WEST                                              :Länsi-{STRING}
-STR_SV_STNAME_CENTRAL                                           :Keski-{STRING}
-STR_SV_STNAME_TRANSFER                                          :{STRING}, vaihtoasema
-STR_SV_STNAME_HALT                                              :{STRING}, seisake
-STR_SV_STNAME_VALLEY                                            :{STRING}, laakso
-STR_SV_STNAME_HEIGHTS                                           :{STRING}, kukkulat
-STR_SV_STNAME_WOODS                                             :{STRING}, metsä
-STR_SV_STNAME_LAKESIDE                                          :{STRING}, järvenranta
-STR_SV_STNAME_EXCHANGE                                          :{STRING}, vaihde ##
-STR_SV_STNAME_AIRPORT                                           :{STRING}, lentokenttä
-STR_SV_STNAME_OILFIELD                                          :{STRING}, öljykenttä
-STR_SV_STNAME_MINES                                             :{STRING}, kaivokset
-STR_SV_STNAME_DOCKS                                             :{STRING}, satama
-STR_SV_STNAME_BUOY_1                                            :{STRING}, poiju 1
-STR_SV_STNAME_BUOY_2                                            :{STRING}, poiju 2
-STR_SV_STNAME_BUOY_3                                            :{STRING}, poiju 3
-STR_SV_STNAME_BUOY_4                                            :{STRING}, poiju 4
-STR_SV_STNAME_BUOY_5                                            :{STRING}, poiju 5
-STR_SV_STNAME_BUOY_6                                            :{STRING}, poiju 6
-STR_SV_STNAME_BUOY_7                                            :{STRING}, poiju 7
-STR_SV_STNAME_BUOY_8                                            :{STRING}, poiju 8
-STR_SV_STNAME_BUOY_9                                            :{STRING}, poiju 9
-STR_SV_STNAME_ANNEXE                                            :{STRING}, sivuasema
-STR_SV_STNAME_SIDINGS                                           :{STRING}, sivuraide
-STR_SV_STNAME_BRANCH                                            :{STRING}, haarautuma
-STR_SV_STNAME_UPPER                                             :Ylä-{STRING}
-STR_SV_STNAME_LOWER                                             :Ala-{STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING}, helikopterikenttä
-STR_SV_STNAME_FOREST                                            :{STRING}, metsä
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :Pohjois-{STRING1}
+STR_SV_STNAME_SOUTH                                             :Etelä-{STRING1}
+STR_SV_STNAME_EAST                                              :Itä-{STRING1}
+STR_SV_STNAME_WEST                                              :Länsi-{STRING1}
+STR_SV_STNAME_CENTRAL                                           :Keski-{STRING1}
+STR_SV_STNAME_TRANSFER                                          :{STRING1}, vaihtoasema
+STR_SV_STNAME_HALT                                              :{STRING1}, seisake
+STR_SV_STNAME_VALLEY                                            :{STRING1}, laakso
+STR_SV_STNAME_HEIGHTS                                           :{STRING1}, kukkulat
+STR_SV_STNAME_WOODS                                             :{STRING1}, metsä
+STR_SV_STNAME_LAKESIDE                                          :{STRING1}, järvenranta
+STR_SV_STNAME_EXCHANGE                                          :{STRING1}, vaihde ##
+STR_SV_STNAME_AIRPORT                                           :{STRING1}, lentokenttä
+STR_SV_STNAME_OILFIELD                                          :{STRING1}, öljykenttä
+STR_SV_STNAME_MINES                                             :{STRING1}, kaivokset
+STR_SV_STNAME_DOCKS                                             :{STRING1}, satama
+STR_SV_STNAME_BUOY_1                                            :{STRING1}, poiju 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1}, poiju 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1}, poiju 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1}, poiju 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1}, poiju 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1}, poiju 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1}, poiju 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1}, poiju 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1}, poiju 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1}, sivuasema
+STR_SV_STNAME_SIDINGS                                           :{STRING1}, sivuraide
+STR_SV_STNAME_BRANCH                                            :{STRING1}, haarautuma
+STR_SV_STNAME_UPPER                                             :Ylä-{STRING1}
+STR_SV_STNAME_LOWER                                             :Ala-{STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1}, helikopterikenttä
+STR_SV_STNAME_FOREST                                            :{STRING1}, metsä
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Pelaaja {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Uudet kasvot
 STR_7005_COLOR_SCHEME                                           :{BLACK}Väriteema
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Pääjohtajan nimi
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Yhtiön nimeä ei voi muuttaa...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Pääjohtajan nimeä ei voi muuttaa...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Talous {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Talous {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Menot/tulot
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Rakentaminen
 STR_7012_NEW_VEHICLES                                           :{GOLD}Uudet ajoneuvot
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Junien käyttökust.
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Yhteensä:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Tulokuvaaja
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Napsauta valitussa väriteemassa.
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Ota lisää lainaa.
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Lyhennä lainaa.
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(pääjohtaja)
-STR_7038_INAUGURATED                                            :{GOLD}Avattu: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(pääjohtaja)
+STR_7038_INAUGURATED                                            :{GOLD}Avattu: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Liikennevälineet:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} juna
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} junaa
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Yhtiön suorituskykyarvio (enimmäisarvio=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Yhtiöiden arvot
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Yhtiökilpataulukko
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Kuljetusyhtiö vaikeuksissa!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} myydään tai julistetaan konkurssiin, ellei suorituskyky lisäänny pian!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(pääjohtaja)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} myydään tai julistetaan konkurssiin, ellei suorituskyky lisäänny pian!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(pääjohtaja)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Kuljetusyhtiöiden sulautuminen!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} on myyty yhtiölle {STRING} hintaan {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Etsimme kuljetusyhtiötä, joka ottaisi haltuunsa yhtiömme{}{}Haluatko ostaa yhtiön {STRING} hintaan {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} on myyty yhtiölle {COMPANY} hintaan {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Etsimme kuljetusyhtiötä, joka ottaisi haltuunsa yhtiömme{}{}Haluatko ostaa yhtiön {COMPANY} hintaan {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Konkurssi!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} on suljettu velkojien toimesta ja kaikki omaisuus on myyty pois!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} on suljettu velkojien toimesta ja kaikki omaisuus on myyty pois!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Uusi kuljetusyhtiö perustettu!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} aloittaa rakentamisen kaupugin {TOWN} lähistölle!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} aloittaa rakentamisen kaupugin {TOWN} lähistölle!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Yhtiötä ei voi ostaa...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Rahtimaksutaksat
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Päivää kauttakulussa
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Myy 25%:n osuus tästä yhtiöstä
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Tästä yhtiöstä ei voi ostaa 25%:n osuutta...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Tästä yhtiöstä ei voi myydä 25%:n osuutta...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}%:n omistus: {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}%:n omistus: {STRING}{}   {COMMA}%:n omistus {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Yhtiön {STRING} on ottanut haltuun {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}%:n omistus: {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}%:n omistus: {COMPANY}{}   {COMMA}%:n omistus {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Yhtiön {COMPANY} on ottanut haltuun {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN}: veturitalli
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupungilaiset juhlivat . . .{}Ensimmäinen juna saapuu asemalle ({STATION})!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (yksityiskohdat)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (yksityiskohdat)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Juna matkalla
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Asemalle {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Mene asemalle {STATION} (Siirrä ja ota rahti)
 STR_8808_GO_TO_UNLOAD                                           :Mene asemalle {STATION} (Pura rahti)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Tietoja
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Juna on liian pitkä.
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Junia voi muunnella vain, kun ne ovat pysähdyksissä veturitallilla.
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} junaa
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} junaa
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Uusi juna
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Uusi yksiraidejuna
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Uusi MagLev-juna
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Mene
 STR_8827_FULL_LOAD                                              :{BLACK}Täysi lasti
 STR_8828_UNLOAD                                                 :{BLACK}Pura lasti
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (aikataulu)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (aikataulu)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - aikataulun loppu - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Huolto
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Veturia/vaunua ei voi rakentaa...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Arvo: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Lastataan/puretaan
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Juna täytyy pysäyttää veturitallin sisällä
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Junan lähettäminen veturitalliin ei onnistu...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Ohita tämä määräys, ellei palvelua tarvita.
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Uusi {STRING} saatavilla!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kulu: {CURRENCY} Paino: {COMMA}t{}Nopeus: {VELOCITY}  Teho: {COMMA}hv{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kulu: {CURRENCY} Paino: {COMMA}t{}Nopeus: {VELOCITY}  Teho: {COMMA}hv{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Rikki
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING2}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Paino: {LTBLUE}{COMMA}t  {BLACK}Teho: {LTBLUE}{COMMA}hv{BLACK} Huippunopeus: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuotto tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Ajoneuvo tiellä.
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} ajoneuvoa
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} ajoneuvoa
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} huoltoasema
 STR_9004_NEW_VEHICLES                                           :{BLACK}Uusia ajoneuvoja
 STR_9005_INFORMATION                                            :{BLACK}Tietoja
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Rakenna ajoneuvo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Ajoneuvoa ei voi rakentaa...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Huoltoasema pitää rakentaa ensin.
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (aikataulu)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (yksityiskohdat)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustanukset: {LTBLUE}{CURRENCY}/vuosi
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (yksityiskohdat)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING2}{BLACK}   Käyttökustanukset: {LTBLUE}{CURRENCY}/vuosi
 STR_900E_MAX_SPEED                                              :{BLACK}Huippunopeus: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuottoa tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Toimintavarmuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...sen pitää olla pysähtyneenä huoltoasemalle.
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Ajoneuvoa ei voi myydä...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Ajoneuvoa ei voi pysäyttää/laitta liikkeelle...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Rakenna valittu ajoneuvo.
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Uusi ajoneuvo on saatavilla!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kulu: {CURRENCY}{}Nopeus: {VELOCITY}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kulu: {CURRENCY}{}Nopeus: {VELOCITY}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nimeä ajoneuvo
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Ajoneuvoa ei voi nimetä...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Satamaa ei voi rakentaa tähän...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN}, telakka
 STR_9804_NEW_SHIPS                                              :{BLACK}Uusia laivoja
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} laivaa
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} laivaa
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Laivoja ei voi rakentaa...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Telakka pitää rakentaa ensin.
 STR_9808_NEW_SHIPS                                              :{WHITE}Uusia laivoja
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Laivaa ei voi myydä...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Laivaa ei voi rakentaa...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Laiva on tiellä.
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (aikataulu)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (tiedot)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (tiedot)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING2}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
 STR_9813_MAX_SPEED                                              :{BLACK}Huippunopeus: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuottoa tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Toimintavarmuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Laivaa ei voi pysäyttää/laittaa liikkeelle...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Laivaa ei voi lähettää telakalle...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Paikallista telakkaa ei löydy
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Näytä laivan tiedot.
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Uusi laiva saatavilla!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kulu: {CURRENCY} Huippunopeus: {VELOCITY}{}Kapasiteetti: {STRING}{}Käyttökustannukset: {CURRENCY}/vuosi
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kulu: {CURRENCY} Huippunopeus: {VELOCITY}{}Kapasiteetti: {STRING1}{}Käyttökustannukset: {CURRENCY}/vuosi
 STR_982F_NAME_SHIP                                              :{BLACK}Nimeä laiva
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nimeä laiva
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Nimeä laivatyyppi uudelleen.
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Laivatyyppin uudelleennimeäminen ei onnistu...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Sovita rahtilaiva eri rahtityypille.
-STR_983B_REFIT                                                  :{WHITE}{STRING} (sovita)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (sovita)
 STR_983C_REFIT_SHIP                                             :{BLACK}Sovita laiva
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse laivan kuljettama rahtityyppi.
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Sovita laiva korostetulle rahtityypille.
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kulu: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING1}{}{BLACK}Sovituksen kulu: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Laivaa ei voi sovittaa...
 STR_9842_REFITTABLE                                             :(sovitettava)
 STR_GO_TO_SHIP_DEPOT                                            :Aseta kohteeksi telakka, {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Uusi lentokone
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Rakenna lentokone
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi rakentaa...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} lentokonetta
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (aikataulu)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (tiedot)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannuket: {LTBLUE}{CURRENCY}/vuosi
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} lentokonetta
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (aikataulu)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (tiedot)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING2}{BLACK}   Käyttökustannuket: {LTBLUE}{CURRENCY}/vuosi
 STR_A00E_MAX_SPEED                                              :{BLACK}Huippunopeus: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuotto tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUMU16}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Lentokonetta ei voi lähettää lentokonehalliin...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Suuntana lentokonehalli, {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Lentokonetta ei voi pysäyttää/laittaa liikkeelle...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lentokone on lennossa.
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Lentokenttä pitää rakentaa ensin.
-STR_A019_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapasiteetti: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Lentokoneen pitää olla pysähdyksissä lentokonehallissa.
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Lentokonetta ei voi myydä...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Lentokentän rakentaminen
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Nimeä lentokonetyyppi uudelleen.
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Lentokonetyyppiä ei voi uudelleennimetä...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Sovita lentokone eri rahtityypille.
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (sovita)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (sovita)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Sovita lentokone
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse kuljetettavan rahdin tyyppi.
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Sovita lentokone kuljettamaan valittua rahtityyppiä.
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kulu: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING1}{}{BLACK}Sovituksen kulu: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi sovittaa...
 STR_A043_REFITTABLE                                             :(sovitettava)
 STR_GO_TO_AIRPORT_HANGAR                                        :Aseta kohteeksi lentokonehalli, {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Yksityiskohta
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Liikennevälineitä:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Asemia:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Välimerkki:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Etuliite:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Jälkiliite:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Vaihda euroon: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Vaihda euroon: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Vaihda euroon: {ORANGE}ei koskaan
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Esikatselu: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Vaihda oman valuutan parametria.
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Paino: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus: {GOLD}{VELOCITY}{BLACK}   Teho: {GOLD}{COMMA}hv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Käyttökulu: {GOLD}{CURRENCY}/vuosi
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteetti: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUMU16}{BLACK} Elinikä: {GOLD}{COMMA} vuotta
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteetti: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUM}{BLACK} Elinikä: {GOLD}{COMMA} vuotta
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Enimmäisluotettavuus: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kulu: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Paino: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Nopeus: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasiteetti: {GOLD}{COMMA} matkustajaa, {COMMA} säkkiä postia
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moottoroidut vaunut: {GOLD}+{COMMA}hv{BLACK} Paino: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moottoroidut vaunut: {GOLD}+{COMMA}hv{BLACK} Paino: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/french.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/french.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Terrain plat requis
 STR_0008_WAITING                                                :{BLACK}En attente: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (venant de
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (venant de
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepte: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepte: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Carte - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Options
 STR_00B2_MESSAGE                                                :{YELLOW}Message
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message de {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message de {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Impossible d'exécuter....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Impossible de balayer....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tous droits réservés
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Impérial (miles)
 STR_013A_METRIC_KILOMETERS                                      :Métrique (kilomètres)
-STR_013B_OWNED_BY                                               :{WHITE}...appartient à {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...appartient à {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Cargaison
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Capacités
 STR_013E_TOTAL_CARGO                                            :{BLACK}Charge totale
-STR_013F_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Capacité totale de ce train:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nouvelle Partie
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Suspendre la partie
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Sauvegarder, abandonner, quitter
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afficher la liste des stations de la compagnie
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Coût du balayage: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coût du balayage: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
-STR_01A7_OWNER                                                  :{BLACK}Propriétaire: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Municipalité: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Propriétaire: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Municipalité: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Aucun
 STR_01AA_NAME                                                   :{BLACK}Nom
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Choisir Didacticiel/Démonstration
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Cargaison acceptée: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Cargaison acceptée: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Cargaison acceptée: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Cargaison acceptée: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Cargaison acceptée: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Cargaison acceptée: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Piste{SETX 88}Titre
 STR_01E9_SHUFFLE                                                :{TINYFONT}Aléatoire
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programme
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selection du Programme Musical
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Index de Piste
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programme - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Balayer
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Pour tout types de messages (aucun/sommaire/complet)
 STR_MESSAGE_SOUND                                               :{YELLOW}Emettre son pour les bulletins sommaires
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...trop loin de la destination précédente
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Meilleures compagnies, qui ont atteint {NUMU16}{}({STRING} niveau)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tableau du Championnat des compagnies en {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Meilleures compagnies, qui ont atteint {NUM}{}({STRING} niveau)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tableau du Championnat des compagnies en {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Homme d'affaires
 STR_0214_ENTREPRENEUR                                           :Entrepreneur
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon du Siècle
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} atteint le niveau de '{STRING}' !
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} atteint le niveau de '{STRING}' !
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} atteint le niveau de '{STRING}' !
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atteint le niveau de '{STRING}' !
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Sélectionnez la taille de la ville
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Taille:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Afficher le dernier message ou bulletin
 STR_OFF                                                         :Aucun
 STR_SUMMARY                                                     :Sommaire
 STR_FULL                                                        :Complet
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Annuaire des villes
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Noms de conception des Véhicules
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Inactif
 STR_CONFIG_PATCHES_ON                                           :Actif
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afficher vitesse du véhicule dans la barre d'état: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Construction côtière et sur pentes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Autoriser des zones de désserte plus réalistes : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permettre le retrait de plus d'éléments possédés par une ville: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permettre les trains plus longs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permettre les accélérations réalistes pour les trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Interdire aux trains et navires les virages à 90° : {ORANGE}{STRING} {LTBLUE} (Nécessite le NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Joindre les gares juxtaposées: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Pleine cargaison par un seul type, si 'chargement complet': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Utiliser l'algorithme amélioré de chargement : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livrer cargaison seulement sur demande: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permettre la construction de longs ponts: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permettre l'ordre d'aller au dépôt: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permettre la construction de ressources primaires: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permettre plusieurs industries similaires par ville: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Permettre plusieurs industries similaires à proximité: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Afficher la date complète dans la barre d'état: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Signaux ferroviaires du côté du sens de conduite: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Afficher le bilan de finances en fin d'année: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Compatibilité TTDPatch "nonstop handling": {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (avec effets quantiques): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Défiler la vue horizontalement avec le pointeur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permettre la corruption de la municipalité: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nouvelle recherche de dépôt: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Gares non uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nouvel algorithme de recherche de route: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nouvelle recherche de chemin globale (NPF, écrase NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afficher vitesse du véhicule dans la barre d'état: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Construction côtière et sur pentes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Autoriser des zones de désserte plus réalistes : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permettre le retrait de plus d'éléments possédés par une ville: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permettre les trains plus longs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permettre les accélérations réalistes pour les trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Interdire aux trains et navires les virages à 90° : {ORANGE}{STRING1} {LTBLUE} (Nécessite le NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Joindre les gares juxtaposées: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Pleine cargaison par un seul type, si 'chargement complet': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Utiliser l'algorithme amélioré de chargement : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livrer cargaison seulement sur demande: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permettre la construction de longs ponts: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permettre l'ordre d'aller au dépôt: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permettre la construction de ressources primaires: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permettre plusieurs industries similaires par ville: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Permettre plusieurs industries similaires à proximité: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Afficher la date complète dans la barre d'état: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Signaux ferroviaires du côté du sens de conduite: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Afficher le bilan de finances en fin d'année: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Compatibilité TTDPatch "nonstop handling": {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (avec effets quantiques): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Défiler la vue horizontalement avec le pointeur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permettre la corruption de la municipalité: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nouvelle recherche de dépôt: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Gares non uniformes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nouvel algorithme de recherche de route: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nouvelle recherche de chemin globale (NPF, écrase NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Toujours permettre les petits aéroports: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Toujours permettre les petits aéroports: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un train est perdu si aucun progrès n'est fait pendant: {ORANGE}{STRING} jours
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un train est perdu si aucun progrès n'est fait pendant: {ORANGE}{STRING1} jours
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Un train est perdu si aucun progrès n'est fait pendant: {ORANGE} inactif
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Vérification des ordres des véhicules : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Vérification des ordres des véhicules : {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :non
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :de tous, sauf ceux stoppés
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :de tous les véhicules
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Alerte en cas de profit négatif pour un train: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Les véhicules n'expirent jamais: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Alerte en cas de profit négatif pour un train: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Les véhicules n'expirent jamais: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Renouveler automatiquement les véhicules quand ils sont vieux
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Auto-renouveler les véhicules {ORANGE}{STRING}{LTBLUE} mois avant/après l'âge maximum
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Argent nécessaire pour l'auto-renouvelement : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Temps d'affichage des messages d'erreur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Montrer la population d'une ville dans son label : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Arbres invisibles (quand les bâtiments sont transparents) : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitude d'enneigement: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Etendue max. des stations: {ORANGE}{STRING} {RED}Attention: Valeur élevée = jeu lent
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Entretenir automatiquement les hélicoptères à l'heliport: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nombre de trains max. par joueur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nombre de véhicules routiers max. par joueur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nombre d'aéronefs max. par joueur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nombre de navires max. par joueur: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Auto-renouveler les véhicules {ORANGE}{STRING1}{LTBLUE} mois avant/après l'âge maximum
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Argent nécessaire pour l'auto-renouvelement : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Temps d'affichage des messages d'erreur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Montrer la population d'une ville dans son label : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Arbres invisibles (quand les bâtiments sont transparents) : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitude d'enneigement: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Etendue max. des stations: {ORANGE}{STRING1} {RED}Attention: Valeur élevée = jeu lent
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Entretenir automatiquement les hélicoptères à l'heliport: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Désactiver les trains pour l'ordinateur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Désactiver les véhicules routiers pour l'ordinateur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Désactiver les aéronefs pour l'ordinateur: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Désactiver les navires pour l'ordinateur: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nombre de trains max. par joueur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nombre de véhicules routiers max. par joueur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nombre d'aéronefs max. par joueur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nombre de navires max. par joueur: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activer la nouvelle IA (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Désactiver les trains pour l'ordinateur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Désactiver les véhicules routiers pour l'ordinateur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Désactiver les aéronefs pour l'ordinateur: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Désactiver les navires pour l'ordinateur: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Entretien des trains tous les: {ORANGE}{STRING} jours
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activer la nouvelle IA (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Entretien des trains tous les: {ORANGE}{STRING1} jours
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Entretien des trains tous les: {ORANGE}inactif
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Entretien des véhicules routiers tous les: {ORANGE}{STRING} jours
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Entretien des véhicules routiers tous les: {ORANGE}{STRING1} jours
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Entretien des véhicules routiers tous les: {ORANGE}inactif
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Entretien des aéronefs tous les: {ORANGE}{STRING} jours
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Entretien des aéronefs tous les: {ORANGE}{STRING1} jours
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Entretien des aéronefs tous les: {ORANGE}inactif
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Entretien des navires tous les: {ORANGE}{STRING} jours
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Entretien des navires tous les: {ORANGE}{STRING1} jours
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Entretien des navires tous les: {ORANGE}inactif
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Désactiver les réparations quand les pannes sont inactives: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Désactiver les réparations quand les pannes sont inactives: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Les journaux en couleur apparaissent en: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Date de départ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Date de fin: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Les journaux en couleur apparaissent en: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Date de départ: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Date de fin: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Permettre une économie stable (plus de petits changements)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permettre d'acheter des actions d'autres compagnies
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Espacements des signaux en mode drag & drop : {ORANGE}{STRING} case(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permettre pose automatique signaux PBS: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position de la barre d'outils principale: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Espacements des signaux en mode drag & drop : {ORANGE}{STRING1} case(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permettre pose automatique signaux PBS: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position de la barre d'outils principale: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :À gauche
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centrée
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :À droite
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Rayon d'attraction des fenêtres : {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Rayon d'attraction des fenêtres : {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Rayon d'attraction des fenêtres : {ORANGE}inactif
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Compétiteurs
 
 STR_CONFIG_PATCHES_DISABLED                                     :inactif
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Changer valeur du paramètre
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Attention ! Vous êtes sur le point de trahir vos adversaires. Gardez en tête qu'une telle honte sera gardée en mémoire pour l'éternité.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Augmenter l'argent de {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jouer en tant que joueur n°: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer magique (enlèvement industries et objets fixes): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Les tunnels peuvent se croiser: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construire pendant le mode pause: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer magique (enlèvement industries et objets fixes): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Les tunnels peuvent se croiser: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construire pendant le mode pause: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Les jets ne se crashent plus (fréquemment) sur les petites aéroports: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Changer de climat : {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Changer la date: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permettre la modification des valeurs de production : {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permettre la modification des valeurs de production : {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}En route pour {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}En route pour {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... bouée utilisée !
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordonnées: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordonnées: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Impossible de supprimer une partie de la gare...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Impossible de convertir le type de rail...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construire une mine de sucre
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transporté)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporté)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transporté)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transporté)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...trop proche d'une autre industrie
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Réamenager le train pour d'autres marchandises
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Réaménager)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Réaménager le train
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choix du type de marchandises à transporter
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Réaménager le train pour les marchandises sélectionnées
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Impossible de réaménager le train...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Les intervalles de service sont en pourcentage: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Les intervalles de service sont en pourcentage: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Changer la production
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Bienvenue dans la nouvelle IA, en élaboration. Copiez l'écran des problèmes et postez-le sur le forum. Bonne partie!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Terrain:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte :  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Version du serveur :  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresse du serveur :  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresse du serveur :  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Date de début :  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Date courante :  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protégée par mot de passe !
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO DE LA COMPAGNIE
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom de la compagnie :  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration :  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration :  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valeur de la compagnie :  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Argent courant :  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Revenus de l'année dernière :  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance :  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance :  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Véhicules :  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations :  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Véhicules :  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations :  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Joueurs :  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connection en cours...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Rapatriement des infos sur le jeu..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Rapatriement des infos sur la compagnie..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(s) avant nous
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} ko déjà téléchargés
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) avant nous
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} ko déjà téléchargés
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Déconnecter
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} La sauvegarde serveur n'a pas pu être chargée.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Le serveur n'a pas pu être démarré.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Connection échouée.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connection #{NUMU16} a dépassé le temps d'attente.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connection #{NUM} a dépassé le temps d'attente.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Il y a eu une erreur de protocole et la connection est donc fermée.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La révision de ce client ne correspond pas à celle du serveur.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Mot de passe incorrect.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Taille X de la carte : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Taille Y de la carte : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Taille X de la carte : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Taille Y de la carte : {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Coût: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Villes
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}L'édifice doit d'abord être démolit
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Maisons: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Afficher des informations sur la municipalité
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Municipalité de {TOWN}
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Réputation de la compagnie de transport:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventions
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Offres de subvention pour le transport de:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} à {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING2} à {STRING2}
 STR_2028_BY                                                     :{YELLOW} (avant {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Aucune
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Subventions déjà accordées:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} à {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} à {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, jusqu'à {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offre de subvention expirée:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est désormais plus subventionné.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offre de subvention expirée:{}{}Le transport de {STRING} entre {STRING2} et {STRING2} n'est désormais plus subventionné.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Abandon de la subvention:{}{}Le transport de {STRING} entre {STATION} et {STATION} n'est plus subventionné.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Offre de subvention:{}{}Le premier service de {STRING} entre {STRING} et {STRING} sera subventionné pendant un an!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {STRING}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera 50% de plus l'année prochaine!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {STRING}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera double l'année prochaine!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {STRING}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera triple l'année prochaine!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {STRING}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera quadruple l'année prochaine!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Offre de subvention:{}{}Le premier service de {STRING} entre {STRING2} et {STRING2} sera subventionné pendant un an!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {COMPANY}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera 50% de plus l'année prochaine!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {COMPANY}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera double l'année prochaine!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {COMPANY}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera triple l'année prochaine!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention accordée à {COMPANY}!{}{}Le transport de {STRING} entre {STATION} et {STATION} rapportera quadruple l'année prochaine!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}La municipalité de {TOWN} refuse la construction d'un autre aéroport dans la ville
 STR_2036_COTTAGES                                               :Petites maisons
 STR_2037_HOUSES                                                 :Maisons
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financer la construction de nouveaux immeubles commerciaux.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Acheter les droits de transports exclusifs dans cette ville pour 1 an. Seules vos ligness seront autorisées dans la ville.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompre la municipalité pour améliorer votre réputation. Risque de pénalisation si le pot-de-vin est dévoilé.{}  Coût: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Problèmes de traffic à {TOWN}!{}{}La reconstruction des routes financée par {STRING} provoque 6 mois de problèmes aux automobilistes!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Problèmes de traffic à {TOWN}!{}{}La reconstruction des routes financée par {COMPANY} provoque 6 mois de problèmes aux automobilistes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (en contruction)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...l'endroit ne convient pas
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Plantation impossible...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...trop de panneaux
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Place du panneau impossible...
 STR_280A_SIGN                                                   :Panneau
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Trop d'arrêts d'autobus
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Trop d'aires de chargement
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Trop près d'une autre gare
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Vous devez d'abord détruire la gare
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Trop près d'un autre aéroport
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Vous devez d'abord détruire l'aéroport
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Trop près d'une autre gare
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Détruisez d'abord l'arrêt d'autobus
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Détruisez d'abord la station
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stations
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Aucun -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...l'endroit ne convient pas
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Trop près d'un autre port
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Aéroport métropolitain
 STR_305AB_LARGE                                                 :{BLACK}Aéroport international
 STR_305B_SIZE                                                   :{BLACK}Taille
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Gare
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar d'aéronefs
 STR_3060_AIRPORT                                                :Aéroport
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Charger une partie
 STR_4002_SAVE                                                   :{BLACK}Sauvegarder
 STR_4003_DELETE                                                 :{BLACK}Supprimer
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Mo libres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Impossible d'accéder au disque
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}La sauvegarde à échoué
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production le mois dernier:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporté)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transporté)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrer la vue sur l'industrie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Un(e) nouveau(elle) {STRING} en construction près de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Un(e) nouveau(elle) {STRING} s'implante près de {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Non nommé{SKIP}
+STR_SV_UNNAMED                                                  :Non nommé
 STR_SV_TRAIN_NAME                                               :Train {COMMA}
 STR_SV_ROADVEH_NAME                                             :Véhicule {COMMA}
 STR_SV_SHIP_NAME                                                :Navire {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aéronef {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nord
-STR_SV_STNAME_SOUTH                                             :{STRING} Sud
-STR_SV_STNAME_EAST                                              :{STRING} Est
-STR_SV_STNAME_WEST                                              :{STRING} Ouest
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfert
-STR_SV_STNAME_HALT                                              :{STRING} Halte
-STR_SV_STNAME_VALLEY                                            :{STRING} Vallée
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Hauteurs
-STR_SV_STNAME_WOODS                                             :{STRING} Bois
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Bords de lac
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Echange
-STR_SV_STNAME_AIRPORT                                           :{STRING} Aéroport
-STR_SV_STNAME_OILFIELD                                          :{STRING} Gisement pétrolifère
-STR_SV_STNAME_MINES                                             :{STRING} Mines
-STR_SV_STNAME_DOCKS                                             :{STRING} Docks
-STR_SV_STNAME_BUOY_1                                            :{STRING} Bouée 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Bouée 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Bouée 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Bouée 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Bouée 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Bouée 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Bouée 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Bouée 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Bouée 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annexe
-STR_SV_STNAME_SIDINGS                                           :{STRING} Voies de garage
-STR_SV_STNAME_BRANCH                                            :{STRING} Embranchement
-STR_SV_STNAME_UPPER                                             :Haut {STRING}
-STR_SV_STNAME_LOWER                                             :Bas {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Forêt
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sud
+STR_SV_STNAME_EAST                                              :{STRING1} Est
+STR_SV_STNAME_WEST                                              :{STRING1} Ouest
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfert
+STR_SV_STNAME_HALT                                              :{STRING1} Halte
+STR_SV_STNAME_VALLEY                                            :{STRING1} Vallée
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Hauteurs
+STR_SV_STNAME_WOODS                                             :{STRING1} Bois
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Bords de lac
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Echange
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Aéroport
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Gisement pétrolifère
+STR_SV_STNAME_MINES                                             :{STRING1} Mines
+STR_SV_STNAME_DOCKS                                             :{STRING1} Docks
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Bouée 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Bouée 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Bouée 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Bouée 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Bouée 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Bouée 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Bouée 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Bouée 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Bouée 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annexe
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Voies de garage
+STR_SV_STNAME_BRANCH                                            :{STRING1} Embranchement
+STR_SV_STNAME_UPPER                                             :Haut {STRING1}
+STR_SV_STNAME_LOWER                                             :Bas {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Forêt
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Joueur {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nouveau visage
 STR_7005_COLOR_SCHEME                                           :{BLACK}Couleur
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nom du P.D.G.
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Impossible de changer le nom de compagnie...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Impossible de changer le nom du P.D.G. ...
-STR_700E_FINANCES                                               :{WHITE}Finances: {STRING} {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}Finances: {COMPANY} {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Dépenses/Revenus
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construction
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nouveaux Véhicules
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Entretien des trains
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graphique du Revenu
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Cliquez pour choisir une couleur
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Augmenter le prêt
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Rembourser une partie du prêt
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
-STR_7038_INAUGURATED                                            :{GOLD}Inauguré en: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(President)
+STR_7038_INAUGURATED                                            :{GOLD}Inauguré en: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Véhicules:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Historique de performace (performance max=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valeur de la compagnie
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Classement des compagnies
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}La compagnie de transport à des ennuis!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} va être en banqueroute si ses performances ne s'améliorent pas!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Président)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} va être en banqueroute si ses performances ne s'améliorent pas!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Président)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fusion de compagnies de transport!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} à été vendue à {STRING} pour {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Nous sommes à la recherche d'un acheteur pour notre compagnie{}{}Voulez vous acheter {STRING} pour {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} à été vendue à {COMPANY} pour {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Nous sommes à la recherche d'un acheteur pour notre compagnie{}{}Voulez vous acheter {COMPANY} pour {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Banqueroute!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} à été fermée par ses créanciers et tous ses actifs vendus!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} à été fermée par ses créanciers et tous ses actifs vendus!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nouvelle compagnie de transport crée!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} commence à construire près de {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} commence à construire près de {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Impossible d'acheter la compagnie...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Valeur des cargaisons
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Jours de transit
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendre 25% de la compagnie
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Impossible d'acheter des parts...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Impossible de vendre des parts...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% détenus par {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% détenus par {STRING}{}   {COMMA}% détenus par {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} a été rachetée par {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% détenus par {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% détenus par {COMPANY}{}   {COMMA}% détenus par {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} a été rachetée par {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Dépôt ferroviaire
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Arrivée du premier train à {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Détails)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Détails)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train présent
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Aller à {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Aller à {STATION} (Transférer et charger)
 STR_8808_GO_TO_UNLOAD                                           :Aller à {STATION} (Décharger)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train trop long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Les trains peuvent être manipulés qu'une fois stoppés au dépôt
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nouveaux véhicules ferroviaires
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nouveaux véhicules monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nouveaux véhicules magnétiques
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Aller à
 STR_8827_FULL_LOAD                                              :{BLACK}Charger
 STR_8828_UNLOAD                                                 :{BLACK}Décharger
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordres)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordres)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fin des ordres - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Entretien
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Impossible de construire le véhicule ferroviaire...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit en: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valeur: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Chargement/déchargement
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Le train doit être stoppé dans un dépôt
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Impossible d'envoyer le train au dépôt...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nouveau(elle) {STRING} disponible!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prix: {CURRENCY} Poids: {COMMA}t{}Vitesse: {VELOCITY}  Puissance: {COMMA}ch{}Coût d'entretien: {CURRENCY}/an{}Capacité: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Prix: {CURRENCY} Poids: {COMMA}t{}Vitesse: {VELOCITY}  Puissance: {COMMA}ch{}Coût d'entretien: {CURRENCY}/an{}Capacité: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}En panne
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING2}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Poids: {LTBLUE}{COMMA}t  {BLACK}Puissance: {LTBLUE}{COMMA}ch{BLACK} Vitesse max.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit cette année: {LTBLUE}{CURRENCY}  (année précédente: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Véhicule Routier présent
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Véhicules routiers
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Véhicules routiers
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Dépôt routier de {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nouveaux Véhicules
 STR_9005_INFORMATION                                            :{BLACK}Information
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construire
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Impossible de construire le véhicule...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Vous devez d'abord construire un dépôt routier
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordres)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING2}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 STR_900E_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit de cette année: {LTBLUE}{CURRENCY}  (année dernière: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit en: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...doit être à l'arrêt dans un dépôt routier
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Impossible de vendre le véhicule...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Impossible de démarrer/stopper le véhicule...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construire le véhicule sélectionné
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nouveau véhicule disponible!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Prix: {CURRENCY}{}Vitesse: {VELOCITY}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Prix: {CURRENCY}{}Vitesse: {VELOCITY}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renommer le véhicule
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Impossible de renommer le véhicule...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Impossible de construire port ici...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Dépôt naval
 STR_9804_NEW_SHIPS                                              :{BLACK}Nouveaux navires
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Navires
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Navires
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Impossible de construire navire...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Doit d'abord construire un dépôt naval
 STR_9808_NEW_SHIPS                                              :{WHITE}Nouveaux navires
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Impossible de vendre navire...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Impossible de construire navire...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Navire présent
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordres)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Détails)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'Opération: {LTBLUE}{CURRENCY}/an
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Détails)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING2}{BLACK}   Coût d'Opération: {LTBLUE}{CURRENCY}/an
 STR_9813_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit cette année: {LTBLUE}{CURRENCY}  (l'an dernier: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Impossible d'arrêter/démarrer le navire...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Impossible d'envoyer le navire au dépôt...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Impossible de trouver dépôt local
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afficher détails du navire
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nouveau navire maintenant disponible!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coût: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {STRING}{}Coût d'Opération: {CURRENCY}/an
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coût: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {STRING1}{}Coût d'Opération: {CURRENCY}/an
 STR_982F_NAME_SHIP                                              :{BLACK}Nommer navire
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nommer navire
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Renommer type de navire
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Impossbile de renommer type de navire...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Réaménager navire pour transporter une cargaison différente
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Réaménager)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Réaménager)
 STR_983C_REFIT_SHIP                                             :{BLACK}Réaménager navire
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choisissez le type de cargaisons à transporter
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Réaménager le navire pour transporter la cargaison sélectionnée
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selectionnez cargaison à transporter:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacité: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacité: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Impossible de réaménager le navire...
 STR_9842_REFITTABLE                                             :(réaménageable)
 STR_GO_TO_SHIP_DEPOT                                            :Aller au dépôt naval de {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nouvel Aéronef
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construire aéronef
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Impossible de construire l'aéronef...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aéronef
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordres)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Détails)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'opération: {LTBLUE}{CURRENCY}/an
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aéronef
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordres)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Détails)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING2}{BLACK}   Coût d'opération: {LTBLUE}{CURRENCY}/an
 STR_A00E_MAX_SPEED                                              :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profits cette année: {LTBLUE}{CURRENCY} (l'an dernier: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%   {BLACK}Cafouillages depuis le dernier service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Impossible d'envoyer l'aéronef au hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}En route pour le hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}En route pour le hangar de {STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Impossible d'arrêter/démarrer aéronef...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}L'aéronef est en vol
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Doit d'abord construire un aéroport
-STR_A019_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aéronef doit être arrêté au hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Impossible de vendre l'aéronef...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construction d'aéroport
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Renommer type d'aéronef
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Impossible de renommer type d'aéronef...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Réaménager aéronef pour transporter un différent type de cargaison
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Réaménager aéronef
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choisir type de cargaison à transporter
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Réaménager aéronef pour transporter type de cargaison sélectionné
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selectionner type de cargaison à transporter:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacité: {GOLD}{STRING}{}{BLACK}Prix du réaménagement: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacité: {GOLD}{STRING1}{}{BLACK}Prix du réaménagement: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Impossible de réaménager l'aéronef...
 STR_A043_REFITTABLE                                             :(réaménageable)
 STR_GO_TO_AIRPORT_HANGAR                                        :Aller au hangar {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Détail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Véhicules :
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stations :
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separateur :
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Préfixe :
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffixe :
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Passer à l'Euro : {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Passer à l'Euro : {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Passer à l'Euro : {ORANGE}jamais
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prévisualisation : {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Changer les paramètres de devises personnalisées
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Poids: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Vitesse: {GOLD}{VELOCITY}{BLACK}   Puissance: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coûts d'entretien: {GOLD}{CURRENCY}/an
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacité: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concu en: {GOLD}{NUMU16}{BLACK}Durée de vie: {GOLD}{COMMA} ans
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacité: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concu en: {GOLD}{NUM}{BLACK}Durée de vie: {GOLD}{COMMA} ans
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilité Max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Prix: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Poids: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Vitesse: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacité: {GOLD}{COMMA} passagers, {COMMA} sacs de courrier
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Wagons Motorisés: {GOLD}+{COMMA}hp{BLACK} Poids: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Wagons Motorisés: {GOLD}+{COMMA}hp{BLACK} Poids: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/galician.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/galician.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Necesitas terreo chan
 STR_0008_WAITING                                                :{BLACK}Esperando: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (en ruta dende
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (en ruta dende
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Acepta: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Acepta: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opcións da Partida
 STR_00B2_MESSAGE                                                :{YELLOW}Mensaxe
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensaxe de {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensaxe de {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Non podes facer eso....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Non podes limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright Orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (millas)
 STR_013A_METRIC_KILOMETERS                                      :Métrico (quilómetros)
-STR_013B_OWNED_BY                                               :{WHITE}...É propiedade de {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...É propiedade de {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Información
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
-STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidade) deste tren:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nova Partida
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pausar Partida
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Grabar partida, abandonar partida, saír
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Amosa-la lista das estacións da compañía
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Coste de limpar: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coste de limpar: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
-STR_01A7_OWNER                                                  :{BLACK}Propietario: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Propietario: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ningún
 STR_01AA_NAME                                                   :{BLACK}Nome
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demostración
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Pista{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Mezclar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selección do Programa de Música
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de Pistas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Limpar
@@ -574,8 +570,8 @@
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Información xeral
 STR_MESSAGES_ALL                                                :{YELLOW}Configuración para tódolos tipos de mesaxes (off/sumario/completo)
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Demasiado lonxe do destino anterior
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Mellores compañías que chegaron ó {NUMU16}{}(Nivel {STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Táboa da Liga de Compañías en {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Mellores compañías que chegaron ó {NUM}{}(Nivel {STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Táboa da Liga de Compañías en {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Home de negocios
 STR_0214_ENTREPRENEUR                                           :Empresario
@@ -584,10 +580,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate da Centuria
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}¡{STRING} logra o status de '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}¡{STRING} de {STRING} logra o status '{STRING}'!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}¡{COMPANY} logra o status de '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}¡{PLAYERNAME} de {COMPANY} logra o status '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -726,12 +722,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Selecciona o tamaño da cidade:
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Tamaño da cidade:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Amosa-la última mesaxe ou noticia
 STR_OFF                                                         :Apagado
 STR_SUMMARY                                                     :Sumario
 STR_FULL                                                        :Completo
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Directorio de cidades
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nomes dos deseños dos vehículos
 STR_02BD                                                        :{BLACK}{STRING}
@@ -991,87 +987,87 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Off
 STR_CONFIG_PATCHES_ON                                           :On
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostra-la velocidade do vehículo na barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permiti-la construción en rampas e costas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir áreas de captura máis realistas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permiti-la eliminación de máis estradas, etc... das cidades: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permiti-la construcción de trens moi largos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Habilita-la aceleración realista nos trens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibir os trens e os barcos facer xiros de 90 grados: {ORANGE}{STRING} {LTBLUE} (require NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Xunta-las estacións construídas xuntas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Saír se calquera carga está chea,cando 'Carga chea': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usa-lo algoritmo de carga mellorado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflación: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Descarga-la carga só cando haxa demanda: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permiti-la construcción de pontes moi longas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permiti-las ordes de ir ó depósito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permiti-la construccion de industrias de materiales: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permitir múltiples industrias similares en cada cidade: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Permiti-la construcción de industrias iguais cercanas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre a data longa na barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado de conducción: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostra-la fiestra de finanzas ó final do ano: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Manexo de nonstop compatible con TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Cola para vehículos de estrada (con efectos cuánticos): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Desplaza-la fiestra cando o ratón esté no borde: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permiti-la chantaxe as autoridades locales: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Novo sistema para atopar depósito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estacións non uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novo algoritmo para atopa-las rutas para os trens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova búsqueda de ruta global (NPF, invalida NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostra-la velocidade do vehículo na barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permiti-la construción en rampas e costas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir áreas de captura máis realistas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permiti-la eliminación de máis estradas, etc... das cidades: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permiti-la construcción de trens moi largos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Habilita-la aceleración realista nos trens: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibir os trens e os barcos facer xiros de 90 grados: {ORANGE}{STRING1} {LTBLUE} (require NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Xunta-las estacións construídas xuntas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Saír se calquera carga está chea,cando 'Carga chea': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usa-lo algoritmo de carga mellorado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflación: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Descarga-la carga só cando haxa demanda: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permiti-la construcción de pontes moi longas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permiti-las ordes de ir ó depósito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permiti-la construccion de industrias de materiales: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permitir múltiples industrias similares en cada cidade: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Permiti-la construcción de industrias iguais cercanas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre a data longa na barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado de conducción: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostra-la fiestra de finanzas ó final do ano: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Manexo de nonstop compatible con TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Cola para vehículos de estrada (con efectos cuánticos): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Desplaza-la fiestra cando o ratón esté no borde: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permiti-la chantaxe as autoridades locales: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Novo sistema para atopar depósito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estacións non uniformes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novo algoritmo para atopa-las rutas para os trens: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova búsqueda de ruta global (NPF, invalida NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren está perdido se non progresa durante: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren está perdido se non progresa durante: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Un tren está perdido se non progresa durante: {ORANGE}deshabilitado
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Revisa-las ordes do vehículo: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Revisa-las ordes do vehículo: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :no
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :si, pero exclúe os vehículos parados
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :de tódolos vehículos
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Advertir se os ingresos dun tren son negativos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Os vehículos nunca caducan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Advertir se os ingresos dun tren son negativos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Os vehículos nunca caducan: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autorenova-los vehículos cando envellezan
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenovar {ORANGE}{STRING}{LTBLUE} meses antes/despois da idade máxima
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Diñeiro mínimo necesario para a autorenovación: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duración das mensaxes de error: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra-la poboación da cidade na etiqueta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árbores invisibles (con edificios transparentes): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura da liña de neve: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Extensión Max. Estación: {ORANGE}{STRING} {RED}Aviso: Valores altos reducen rendemento
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Face-lo servicio os helicópteros no heliporto automáticam.: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenovar {ORANGE}{STRING1}{LTBLUE} meses antes/despois da idade máxima
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Diñeiro mínimo necesario para a autorenovación: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duración das mensaxes de error: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra-la poboación da cidade na etiqueta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árbores invisibles (con edificios transparentes): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura da liña de neve: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Extensión Max. Estación: {ORANGE}{STRING1} {RED}Aviso: Valores altos reducen rendemento
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Face-lo servicio os helicópteros no heliporto automáticam.: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nº máximo de trens por xogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nº máximo de vehículos de estrada por xogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nº máximo de aeronaves por xogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nº máximo de barcos por xogador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nº máximo de trens por xogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nº máximo de vehículos de estrada por xogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nº máximo de aeronaves por xogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nº máximo de barcos por xogador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Deshabilita-los trens para o ordenador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Deshabilita-los vehículos de estrada para o ordenador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Deshabilita-las aeronaves para o ordenador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Deshabilita-los barcos para o ordenador: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nova AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Deshabilita-los trens para o ordenador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Deshabilita-los vehículos de estrada para o ordenador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Deshabilita-las aeronaves para o ordenador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Deshabilita-los barcos para o ordenador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de servicio para os trens: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nova AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de servicio para os trens: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervalo de servicio para os trens: {ORANGE}deshabilitado
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de servicio para os vehículos de estrada: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de servicio para os vehículos de estrada: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Intervalo de servicio para os vehículos de estrada: {ORANGE}deshabilitado
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de servicio para as aeronaves: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de servicio para as aeronaves: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Intervalo de servicio para as aeronaves: {ORANGE}deshabilitado
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de servicio para os barcos: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de servicio para os barcos: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalo de servicio para os barcos: {ORANGE}deshabilitado
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Data de aparición das noticias en color: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data de comezo: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Terminar partida en: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Data de aparición das noticias en color: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data de comezo: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Terminar partida en: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Habilita-la economía "suave"(máis cambios, pero máis pequenos)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permiti-la compra de accións por outras compañías
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Cando se arrastre, colocar siniais cada: {ORANGE}{STRING} cadrado(s)
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posición da barra de ferramentas principal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Cando se arrastre, colocar siniais cada: {ORANGE}{STRING1} cadrado(s)
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posición da barra de ferramentas principal: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Esquerda
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centro
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Dereita
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Radio de agarre da fiestra: {ORANGE}desactivado
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1082,7 +1078,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competidores
 
 STR_CONFIG_PATCHES_DISABLED                                     :deshabilitado
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Cambia-lo valor
@@ -1098,9 +1094,9 @@
 STR_CHEATS_WARNING                                              :{BLACK}¡Advertencia! Estás a piques de traizoa-los teus oponentes. Ten en conta que unha desgracia coma esta se lembrará eternamente.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementa-lo diñeiro en {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Xogar coma xogador: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Escavadora máxica(Elimina industrias, non eliminables): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os tuneis poden cruzarse entre eles: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permiti-la construcción en modo pausa: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Escavadora máxica(Elimina industrias, non eliminables): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os tuneis poden cruzarse entre eles: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permiti-la construcción en modo pausa: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Os avíons de jet no se estrelarán (frecuentemente) nos aeroportos pequenos: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Cambiar clima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Cambiar data: {ORANGE} {DATE_SHORT}
@@ -1157,7 +1153,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...a boia está en uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Non se pode eliminar parte da estación...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Non se pode converti-lo tipo de vía aí...
@@ -1195,19 +1191,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construír Mina de Azucre
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN}: {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cerca doutra industria
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Reaxusta-lo tren para un tipo de carga diferente
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Reauxstar)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Reaxustar tren
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de carga que levará o tren
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Reaxusta-lo tren para o tipo de carga seleccionado
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}No se pode reaxusta-lo tren...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervalos de servicio en porcentaxes: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervalos de servicio en porcentaxes: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar producción
 
 TEMP_AI_ACTIVATED                                               :{WHITE}¡Advertencia: esta nova AI esta en estado alfa! ¡ Neste momento só funcionan os camións e os buses!
@@ -1245,7 +1240,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Set de Terreo:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión do servidor:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección do servidor:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección do servidor:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de comezo:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}¡Protexido con clave!
@@ -1314,14 +1309,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMACIÓN DA COMPAÑÍA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da compañía:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguración:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguración:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valor da compañía:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balance actual:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingresos do ano pasado:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendemento:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendemento:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehículos:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estacións:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehículos:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estacións:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Xogadores:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
@@ -1337,8 +1332,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Descargando información da partida..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Descargando información da compañía..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} cliente(s) diante túa
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes descargados
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) diante túa
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descargados
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectar
 
@@ -1356,7 +1351,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Non se pode carga-la partida
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Non se pode arrinca-lo servidor
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Non se pode conectar
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Conexión #{NUMU16} fora de tempo
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Conexión #{NUM} fora de tempo
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} A protocol-error was made and the connection was closed
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} A revisión deste cliente no e igual ca revisión do servidor.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Contrasinal errónea
@@ -1408,8 +1403,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Tamaño X do mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Tamaño Y do mapa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Tamaño X do mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Tamaño Y do mapa: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Coste: {CURRENCY}
@@ -1504,10 +1499,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Debes demole-lo edificio primeiro
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Poboación: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
@@ -1540,23 +1535,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Mostra-la información sobre a autoridade local
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Autoridade local de {TOWN}
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Puntuacións das compañías de transporte:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidios
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Sibsidios en oferta para sevicios que transporten:
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} dende {STRING} ata {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} dende {STRING2} ata {STRING2}
 STR_2028_BY                                                     :{YELLOW} (antes de {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Ningún
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servicios que xa teñen subsidio:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} dende {STATION} ata {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} dende {STATION} ata {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, ata {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferta de subsidio esgotada:{}{}{STRING} dende {STRING} ata {STRING} non será subsidiada.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferta de subsidio esgotada:{}{}{STRING} dende {STRING2} ata {STRING2} non será subsidiada.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidio retirado:{}{}O servicio de transporte de {STRING} dende {STATION} ata {STATION} xa non ten subsidio.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}¡Oferta de subsidio:{}{}O primeiro servicio de transporte de {STRING} dende {STRING} ata {STRING} será subsidiado pola autoridade local!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {STRING}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase un 50% máis durante o próximo ano!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {STRING}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase o dobre durante o próximo ano!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {STRING}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase o triple durante o próximo ano!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {STRING}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase o cuádruple durante o próximo ano!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}¡Oferta de subsidio:{}{}O primeiro servicio de transporte de {STRING} dende {STRING2} ata {STRING2} será subsidiado pola autoridade local!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {COMPANY}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase un 50% máis durante o próximo ano!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {COMPANY}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase o dobre durante o próximo ano!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {COMPANY}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase o triple durante o próximo ano!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subsidio concedido a {COMPANY}!{}{}Polo servicio de transporte de {STRING} dende {STATION} ata {STATION} pagarase o cuádruple durante o próximo ano!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}A autoridade local de {TOWN} négase a permiti-la construcción doutro aeroporto
 STR_2036_COTTAGES                                               :Casiñas de campo
 STR_2037_HOUSES                                                 :Casas
@@ -1590,7 +1585,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Subvencina-la construcción de novos edificios comerciais na cidade.{}  Coste: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compra-los dereitos exclusivos de transporte na cidade durante 1 ano. A autoridade só permitirá que os pasaxeiros e as mercadorías usen as estacións da túa compañía.{} Coste: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Suborna-la autoridade local para mellora-la túa puntuación, co risco dunha gran penalización se o descobren.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}¡Caos no tráfico de {TOWN}!{}{}¡O programa de reconstrucción das estradas subvencionado por {STRING} trae 6 meses de miseria para os motoristas!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}¡Caos no tráfico de {TOWN}!{}{}¡O programa de reconstrucción das estradas subvencionado por {COMPANY} trae 6 meses de miseria para os motoristas!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (en construcción)
@@ -1608,7 +1603,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...emprazamento inadecuado
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Non se pode plantar unha árbore aí...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...demasiados sinais
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Non se pode situa-lo sinal aí...
 STR_280A_SIGN                                                   :Sinal
@@ -1632,7 +1626,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paradas de bus
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas estacions de camións
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Demasiado cerca doutra estación ou área de carga
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Debes demole-la estación de ferrocarril primeiro
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Demasiado cerca doutro aeroporto
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Debes demole-lo aeroporto primeiro
@@ -1665,8 +1659,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Demasiado cerca doutra estación de camións
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Debes demole-la estación de autobús primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Debes demole-la estación de camións primeiro
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estacións
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estacións
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ningún -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...emprazamento inadecuado
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Demasiado cerca doutro peirao
@@ -1687,7 +1681,7 @@
 STR_305AA_LARGE                                                 :{BLACK}Aeroporto Metropolitano
 STR_305AB_LARGE                                                 :{BLACK}Aeroporto Internacional
 STR_305B_SIZE                                                   :{BLACK}Tamaño
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Estación de ferrocarril
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar de aeronaves
 STR_3060_AIRPORT                                                :Aeroporto
@@ -1720,7 +1714,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Cargar Partida
 STR_4002_SAVE                                                   :{BLACK}Grabar
 STR_4003_DELETE                                                 :{BLACK}Borrar
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes libres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}No se pode lee-la unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Grabación da partida fallida
@@ -1782,7 +1776,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producción no último mes:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra-la vista principal na situación da industria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}¡Nova {STRING} en construcción cerca de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}¡Nova {STRING} cerca de {TOWN}!
@@ -1862,45 +1856,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Sen Nome{SKIP}
+STR_SV_UNNAMED                                                  :Sen Nome
 STR_SV_TRAIN_NAME                                               :Tren {COMMA}
 STR_SV_ROADVEH_NAME                                             :Vehículo de estrada {COMMA}
 STR_SV_SHIP_NAME                                                :Barco {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Norte
-STR_SV_STNAME_SOUTH                                             :{STRING} Sur
-STR_SV_STNAME_EAST                                              :{STRING} Este
-STR_SV_STNAME_WEST                                              :{STRING} Oeste
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transferencia
-STR_SV_STNAME_HALT                                              :{STRING} Alto
-STR_SV_STNAME_VALLEY                                            :{STRING} Val
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Lombas
-STR_SV_STNAME_WOODS                                             :{STRING} Bosques
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Ribeira de lago
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Cambio
-STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING}
-STR_SV_STNAME_OILFIELD                                          :{STRING} Campo de petróleo
-STR_SV_STNAME_MINES                                             :{STRING} Minas
-STR_SV_STNAME_DOCKS                                             :Peirao de {STRING}
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boia 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boia 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boia 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boia 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boia 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boia 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boia 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boia 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boia 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Anexo
-STR_SV_STNAME_SIDINGS                                           :{STRING} Apartadeiro
-STR_SV_STNAME_BRANCH                                            :{STRING} Rama
-STR_SV_STNAME_UPPER                                             :Superior {STRING}
-STR_SV_STNAME_LOWER                                             :Inferior {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliporto
-STR_SV_STNAME_FOREST                                            :{STRING} Bosque
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Norte
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sur
+STR_SV_STNAME_EAST                                              :{STRING1} Este
+STR_SV_STNAME_WEST                                              :{STRING1} Oeste
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transferencia
+STR_SV_STNAME_HALT                                              :{STRING1} Alto
+STR_SV_STNAME_VALLEY                                            :{STRING1} Val
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Lombas
+STR_SV_STNAME_WOODS                                             :{STRING1} Bosques
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Ribeira de lago
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Cambio
+STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING1}
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Campo de petróleo
+STR_SV_STNAME_MINES                                             :{STRING1} Minas
+STR_SV_STNAME_DOCKS                                             :Peirao de {STRING1}
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boia 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boia 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boia 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boia 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boia 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boia 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boia 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boia 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boia 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Anexo
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Apartadeiro
+STR_SV_STNAME_BRANCH                                            :{STRING1} Rama
+STR_SV_STNAME_UPPER                                             :Superior {STRING1}
+STR_SV_STNAME_LOWER                                             :Inferior {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliporto
+STR_SV_STNAME_FOREST                                            :{STRING1} Bosque
 
 ############ end of	savegame specific region!
 
@@ -1979,7 +1973,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Xogador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema de Cor
@@ -1991,9 +1985,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nome Do Presidente
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Non se pode cambia-lo nome da compañía...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Non se pode cambia-lo nome do presidente...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanzas {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanzas {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Gastos/Ingresos
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construccción
 STR_7012_NEW_VEHICLES                                           :{GOLD}Novos Vehículos
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Mantemento dos Trens
@@ -2010,7 +2004,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Ingresos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2034,8 +2028,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Pincha no novo esquema de cor
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Incrementa-lo préstamo
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Pagar parte do préstamo
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehículos:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trens
@@ -2063,18 +2057,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Puntuación de rendemento da compañía (Máximo=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valor da Compañía
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Tabla da Liga de Compañías
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}¡Compañía de transporte en problemas!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} vai ser vendida ou declarada en bancarrota se non mellora o seu rendemento pronto!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Presidente)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} vai ser vendida ou declarada en bancarrota se non mellora o seu rendemento pronto!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Presidente)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}¡Fusión de compañías de transporte!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} foi vendida a {STRING} por {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Buscamos unha compañía de transporte para adquiri-la nosa compañía{}{}¿Queres comprar {STRING} por {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} foi vendida a {COMPANY} por {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Buscamos unha compañía de transporte para adquiri-la nosa compañía{}{}¿Queres comprar {COMPANY} por {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}¡Bancarrota!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} foi pechada polos acreedores e vendéronse tódalas posesións!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} foi pechada polos acreedores e vendéronse tódalas posesións!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}¡Lanzada unha nova compañía de transporte!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} comeza a construcción cerca de {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} comeza a construcción cerca de {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Non se pode compra-la compañía...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Taxas de Pagamento por Carga
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Días en tránsito
@@ -2109,9 +2103,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender un 25% das accións desta compañía
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Non se pode comprar un 25% das accións nesta compañía...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Non se pode vender un 25% das accións desta compañía...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedade de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propiedade de {STRING}{}   {COMMA}% propiedade de {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} comprada por  {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedade de {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propiedade de {COMPANY}{}   {COMMA}% propiedade de {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} comprada por  {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Esta compañía todavía non comercia con accións...
 
 ##id 0x8000
@@ -2383,10 +2377,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}Depósito de Tren de {TOWN}
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebración cidadá . . .{}Chega o primeiro tren a {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalles)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detalles)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Hai un tren no camiño
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Ir a {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Face-lo servicio no Depósito de Trens de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sen paradas o Depósito de Trens de {TOWN}
@@ -2406,7 +2400,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Información
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}O tren é demasiado longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os trens só se poden alterar cando estean parados nunha estación
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trens
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trens
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Vehículos de Ferrocarril
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Vehículos de Monorraíl
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Vehículos de Maglev
@@ -2418,14 +2412,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Ir a
 STR_8827_FULL_LOAD                                              :{BLACK}Encher
 STR_8828_UNLOAD                                                 :{BLACK}Descarga
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordes)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordes)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fin das Ordes - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Servicio
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}No se pode construí-lo vehículo de ferrocarril...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Cargando / Descargando
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}O tren debe estar parado nun depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}No se pode envía-lo tren o depósito...
@@ -2474,9 +2468,9 @@
 STR_SERVICE_HINT                                                :{BLACK}saltar esta orde a non ser que sexa necesario o servicio
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}¡Nov@ {STRING} dispoñible!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potencia: {COMMA}hp{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potencia: {COMMA}hp{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Roto
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potencia: {LTBLUE}{COMMA}cv{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficios este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
@@ -2497,8 +2491,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Haí un vehículo de estrada no camiño
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vehículos de Estrada
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehículos de Estrada
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Depósito de Vehículos de Estrada de {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novos Vehículos
 STR_9005_INFORMATION                                            :{BLACK}Información
@@ -2506,14 +2500,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construír Vehículo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}No se pode construí-lo vehículo de estrada...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Debes construír un depósito de vehículos de estrada primeiro
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordes)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detalles)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...debe estar parado dentro dun depósito de vehículos de estrada
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Non se pode vende-lo vehículo de estrada...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No se pode parar/arrincar o vehículo de estrada...
@@ -2538,7 +2531,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construí-lo vehículo de estrada seleccionado
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}¡Novo vehículo de estrada dispoñible!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Coste: {CURRENCY}{}Velocidade: {VELOCITY}{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Coste: {CURRENCY}{}Velocidade: {VELOCITY}{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renomear vehículo de estrada
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Non se pode renomea-lo vehículo de estrada...
@@ -2561,7 +2554,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Non se pode construí-lo peirao aí...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Depósito de Barcos de {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Novos Barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}No se pode construí-los barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Debes construír un depósito de barcos primeiro
 STR_9808_NEW_SHIPS                                              :{WHITE}Novos Barcos
@@ -2570,15 +2563,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}No se pode vende-lo barco...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Non se construí-lo barco...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Hay un barco no camiño
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordes)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detalles)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_9813_MAX_SPEED                                              :{BLACK}Velodidade Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Non se pode parar/arrincar o barco...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Non se pode envia-lo barco o depósito...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}No se pode atopar unha ruta ó depósito local
@@ -2602,7 +2594,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostra-los detalles do barco
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}¡Novo barco dispoñible!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidade Máx: {VELOCITY}{}Capacidade: {STRING}{}Coste de Mantemento: {CURRENCY}/ano
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidade Máx: {VELOCITY}{}Capacidade: {STRING1}{}Coste de Mantemento: {CURRENCY}/ano
 STR_982F_NAME_SHIP                                              :{BLACK}Renomear barco
 
 STR_9831_NAME_SHIP                                              :{WHITE}Renomear barco
@@ -2615,12 +2607,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Renomear tipo de barco
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Non se pode renomear-lo tipo de barco...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Reaxusta-lo barco para levar un tipo diferente de mercadoría
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Reaxustar)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Reaxustar)
 STR_983C_REFIT_SHIP                                             :{BLACK}Reaxustar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de mercadoría que vai levar
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Reaxusta-lo barco para leva-lo tipo de mercacdoría seleccionada
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona-lo tipo de carga a levar:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova Capacidade: {GOLD}{STRING}{}{BLACK}Coste do reaxuste: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova Capacidade: {GOLD}{STRING1}{}{BLACK}Coste do reaxuste: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Non se pode reaxusta-lo barco...
 STR_9842_REFITTABLE                                             :(reax.)
 STR_GO_TO_SHIP_DEPOT                                            :Ir ó Depósito de Barcos de {TOWN}
@@ -2635,15 +2627,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construír Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Non se pode construí-lo avíon...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronave
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordes)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalles)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronave
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordes)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Roturas dende o último serivicio: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Non se pode envia-la aeronave ó hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Diríxese ó hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Diríxese ó hangar de {STATION}, {VELOCITY}
@@ -2652,8 +2644,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Non se pode parar/arrincar a aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}A aeronave esta voando
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Debes construír un aeroporto primeiro
-STR_A019_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}A aeronave debe estar parada no hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Non se pode vende-la aeronave...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construcción de Aeroporto
@@ -2688,12 +2680,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Renomea-lo tipo de aeronave
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Non se pode renomea-lo tipo de aeronave...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Reaxusta-la aeronave para levar un tipo distinto de carga
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Reaxustar)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Reaxustar)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Reaxustar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de carga que levará
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Reaxusta-la aeronave para levar o tipo de carga seleccionada
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona o tipo de carga a levar:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Cose do reaxuste: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING1}{}{BLACK}Cose do reaxuste: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Non se pode reaxusta-la aeronave...
 STR_A043_REFITTABLE                                             :(reax.)
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir ó hangar de {STATION}
@@ -2717,8 +2709,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalle
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehículos:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estacións:
@@ -2752,7 +2744,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Cambiar a Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Cambiar a Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Camiar a Euro: {ORANGE}nunca
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Vista previa: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Cambia-lo parámetro de moeda personalizada
@@ -2795,4 +2787,4 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}  Potencia: {GOLD}{COMMA}cv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Mantemento: {GOLD}{CURRENCY}/ano
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} pasaxeiros, {COMMA} sacos de correo
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} pasaxeiros, {COMMA} sacos de correo
\ No newline at end of file
--- a/lang/german.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/german.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Ebenes Land erforderlich
 STR_0008_WAITING                                                :{BLACK}Wartend:  {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (unterwegs von
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (unterwegs von
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Akzeptiert: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Akzeptiert: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Karte - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spieleinstellungen
 STR_00B2_MESSAGE                                                :{YELLOW}Nachricht
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Nachricht von {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Nachricht von {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kann dies nicht tun....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kann das Gebiet nicht räumen....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle Rechte vorbehalten
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (Meilen)
 STR_013A_METRIC_KILOMETERS                                      :Metrisch (Kilometer)
-STR_013B_OWNED_BY                                               :{WHITE}...Eigentum von {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...Eigentum von {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Fracht
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Kapazitäten
 STR_013E_TOTAL_CARGO                                            :{BLACK}Frachtübersicht
-STR_013F_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Frachtkapazität dieses Zuges:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}{CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Neues Spiel
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Spiel anhalten
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Spiel speichern, Spiel laden, Spiel verlassen, Beenden
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Liste der Firmenbahnhöfe anzeigen
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kosten für die Räumung: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kosten für die Räumung: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Eigentümer: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Gehört zur Gemeinde: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Eigentümer: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Gehört zur Gemeinde: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Keine
 STR_01AA_NAME                                                   :{BLACK}Name
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Einführung / Demonstration wählen
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Akzeptierte Fracht: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Akzeptierte Fracht: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Akzeptierte Fracht: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Akzeptierte Fracht: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Akzeptierte Fracht: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Akzeptierte Fracht: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Track{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Mischen
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programm
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musik-Programmauswahl
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Track Inhalt
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programm - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Bereinigen
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Einstellung für alle Nachrichtenarten (an/aus/Ticker)
 STR_MESSAGE_SOUND                                               :{YELLOW}Sound für Tickermeldungen abspielen
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...zu weit vom vorherigen Bestimmungsort entfernt
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Beste Unternehmen, die {NUMU16} erreichten{}(Schwierigkeitsgrad {STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Firmentabelle in {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Beste Unternehmen, die {NUM} erreichten{}(Schwierigkeitsgrad {STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Firmentabelle in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Geschäftsmann
 STR_0214_ENTREPRENEUR                                           :Unternehmer
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon des Jahrhunderts
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} erreicht '{STRING}' Status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} von {STRING} erreicht '{STRING}' Status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} erreicht '{STRING}' Status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} von {COMPANY} erreicht '{STRING}' Status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Stadtgröße bestimmen
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Stadtgröße:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Letzte Nachricht oder letzten Bericht anzeigen
 STR_OFF                                                         :Aus
 STR_SUMMARY                                                     :Ticker
 STR_FULL                                                        :Zeitung
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Städteverzeichnis
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Fahrzeugnamen
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Aus
 STR_CONFIG_PATCHES_ON                                           :An
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Zeige Fahrzeuggeschwindigkeit in der Statusleiste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Erlaube das Bauen an Hängen und Küsten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Aktiviere realistische Einzugsgebiete: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Erlaube die Entfernung von Industrien, weiteren Straßen usw.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Erlaube das Bauen von sehr langen Zügen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistische Zugbeschleunigung aktivieren: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Verbiete Zügen und Schiffen 90 Grad Kurven: {ORANGE}{STRING} {LTBLUE} (erfordert NWF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Bahnhöfe vereinigen, die nebeneinander gebaut werden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Verlasse die Station, wenn eine Fracht vollgeladen ist: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Verbessertes Beladeverfahren nutzen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Liefere Fracht nur, wenn die Station diese annimmt: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Erlaube das Bauen von sehr langen Brücken: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Erlaube "Gehe zum Depot"-Aufträge im Fahrplan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Erlaube das Bauen von rohstoffproduzierenden Industrien: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Erlaube mehrere gleichartige Industrien pro Stadt: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Gleiche Industrien können nahe beieinander gebaut werden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Lange Datumsanzeige in der Statusleiste (links unten): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Zeige Signale auf der selben Seite wie den Straßenverkehr: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Zeige Firmenfinanzen am Ende des Jahres: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompatibles "Nonstop"-Verhalten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fahrzeugwarteschlange (mit Überlagerung): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Karte scrollen, wenn die Maus am Bildrand anstößt: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Bestechen der Stadtverwaltung erlauben: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Neues Wegfinden für Depots: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ungleichmäßige Bahnhöfe: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Neuen Algorithmus zur Wegfindung nur für Züge benutzen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Neue globale Wegfindung für alle Fahrzeuge: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Zeige Fahrzeuggeschwindigkeit in der Statusleiste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Erlaube das Bauen an Hängen und Küsten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Aktiviere realistische Einzugsgebiete: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Erlaube die Entfernung von Industrien, weiteren Straßen usw.: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Erlaube das Bauen von sehr langen Zügen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistische Zugbeschleunigung aktivieren: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Verbiete Zügen und Schiffen 90 Grad Kurven: {ORANGE}{STRING1} {LTBLUE} (erfordert NWF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Bahnhöfe vereinigen, die nebeneinander gebaut werden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Verlasse die Station, wenn eine Fracht vollgeladen ist: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Verbessertes Beladeverfahren nutzen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Liefere Fracht nur, wenn die Station diese annimmt: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Erlaube das Bauen von sehr langen Brücken: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Erlaube "Gehe zum Depot"-Aufträge im Fahrplan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Erlaube das Bauen von rohstoffproduzierenden Industrien: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Erlaube mehrere gleichartige Industrien pro Stadt: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Gleiche Industrien können nahe beieinander gebaut werden: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Lange Datumsanzeige in der Statusleiste (links unten): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Zeige Signale auf der selben Seite wie den Straßenverkehr: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Zeige Firmenfinanzen am Ende des Jahres: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompatibles "Nonstop"-Verhalten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fahrzeugwarteschlange (mit Überlagerung): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Karte scrollen, wenn die Maus am Bildrand anstößt: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Bestechen der Stadtverwaltung erlauben: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Neues Wegfinden für Depots: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ungleichmäßige Bahnhöfe: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Neuen Algorithmus zur Wegfindung nur für Züge benutzen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Neue globale Wegfindung für alle Fahrzeuge: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Kleine Flughäfen immer erlauben: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Kleine Flughäfen immer erlauben: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Ein Zug ist verirrt, wenn kein Fortschritt seit: {ORANGE}{STRING} Tagen
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Ein Zug ist verirrt, wenn kein Fortschritt seit: {ORANGE}{STRING1} Tagen
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Ein Zug ist verirrt, wenn kein Fortschritt seit: {ORANGE}ausgeschaltet
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Fahrpläne prüfen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Fahrpläne prüfen: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nein
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, aber ohne gestoppte Fahrzeuge
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :für alle Fahrzeuge
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warnung anzeigen, wenn ein Zug negative Einnahmen hat: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Fahrzeuge veralten nie: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warnung anzeigen, wenn ein Zug negative Einnahmen hat: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Fahrzeuge veralten nie: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Fahrzeug erneuern, wenn es veraltet
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Erneuere Fahrzeug {ORANGE}{STRING}{LTBLUE} Monate vor/nach Maximalalter
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimaler Kontostand für automatisches Erneuern: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Dauer der Fehlermeldungen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zeige die Einwohnerzahl der Stadt im Label: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Unsichtbare Bäume (bei transparenten Gebäuden): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Höhe der Schneegrenze: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale Stationsgröße: {ORANGE}{STRING} {RED}Achtung: Große Werte verlangsamen das Spiel
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Hubschrauber auf Helipads automatisch warten: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximale Anzahl der Züge pro Spieler: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximale Anzahl der Straßenfahrzeuge pro Spieler: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximale Anzahl der Flugzeuge pro Spieler: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximale Anzahl der Schiffe pro Spieler: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Erneuere Fahrzeug {ORANGE}{STRING1}{LTBLUE} Monate vor/nach Maximalalter
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimaler Kontostand für automatisches Erneuern: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Dauer der Fehlermeldungen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zeige die Einwohnerzahl der Stadt im Label: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Unsichtbare Bäume (bei transparenten Gebäuden): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Höhe der Schneegrenze: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale Stationsgröße: {ORANGE}{STRING1} {RED}Achtung: Große Werte verlangsamen das Spiel
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Hubschrauber auf Helipads automatisch warten: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Züge für den Computer abschalten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Straßenfahrzeuge für den Computer abschalten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Flugzeuge für den Computer abschalten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Schiffe für den Computer abschalten: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximale Anzahl der Züge pro Spieler: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximale Anzahl der Straßenfahrzeuge pro Spieler: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximale Anzahl der Flugzeuge pro Spieler: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximale Anzahl der Schiffe pro Spieler: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Aktiviere neue KI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Züge für den Computer abschalten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Straßenfahrzeuge für den Computer abschalten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Flugzeuge für den Computer abschalten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Schiffe für den Computer abschalten: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Vorgegebener Wartungsintervall für Züge: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Aktiviere neue KI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Vorgegebener Wartungsintervall für Züge: {ORANGE}{STRING1} Tage
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Vorgegebener Wartungsintervall für Züge: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Vorgegebener Wartungsintervall für Straßenfahrzeuge: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Vorgegebener Wartungsintervall für Straßenfahrzeuge: {ORANGE}{STRING1} Tage
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Vorgegebener Wartungsintervall für Fahrzeuge: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebener Wartungsintervall für Flugzeuge: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebener Wartungsintervall für Flugzeuge: {ORANGE}{STRING1} Tage
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vorgegebener Wartungsintervall für Flugzeuge: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vorgegebener Wartungsintervall für Schiffe: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vorgegebener Wartungsintervall für Schiffe: {ORANGE}{STRING1} Tage
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vorgegebener Wartungsintervall für Schiffe: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Wartung deaktivieren, wenn Pannen abgeschaltet: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Wartung deaktivieren, wenn Pannen abgeschaltet: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farbige Nachrichten erscheinen ab: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Startdatum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Spiel beenden: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farbige Nachrichten erscheinen ab: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Startdatum: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Spiel beenden: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Feinere Wirtschaft aktivieren (mehrere, kleinere Veränderungen)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Erlaube Anteile an anderen Firmen zu kaufen
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Errichte Signale alle {ORANGE}{STRING} Felder beim Ziehen mit der Maus
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Erlaube automatische Errichtung von Fahrstraßen-Signalen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position der Haupttoolbar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Errichte Signale alle {ORANGE}{STRING1} Felder beim Ziehen mit der Maus
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Erlaube automatische Errichtung von Fahrstraßen-Signalen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position der Haupttoolbar: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Links
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Mitte
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Rechts
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Fenster schnappen aneinander, wenn näher als: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Fenster schnappen aneinander, wenn näher als: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Fenster schnappen aneinander, wenn näher als: {ORANGE}ausgeschaltet
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Oberfläche
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Gegenspieler
 
 STR_CONFIG_PATCHES_DISABLED                                     :ausgeschaltet
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Einstellungswert ändern
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Achtung! Du bist im Begriff, deine Mitspieler zu betrügen. Denke daran, dass dies niemals vergessen werden wird.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Kontostand um {CURRENCY64} erhöhen
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Folgenden Spieler steuern: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Mächtigeres Abrisswerkzeug: {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnel dürfen sich kreuzen {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bauen im Pausenmodus: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Mächtigeres Abrisswerkzeug: {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnel dürfen sich kreuzen {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bauen im Pausenmodus: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Flugzeuge stürzen auf kleinen Flughäfen nicht häufiger ab: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Wechsle Klima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ändere Datum: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiviere Veränderung der Produktionswerte: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiviere Veränderung der Produktionswerte: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Fahre zu {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Fahre zu {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... Boje wird genutzt!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinaten: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordinaten: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kann den Teil des Bahnhofs nicht entfernen...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Kann Gleistyp hier nicht verändern...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Zuckermine errichten
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrien
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportiert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportiert)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportiert)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportiert)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zu nah an einer anderen Industrie
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Umrüstung des Zuges zur Beförderung anderer Frachten
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Umrüsten)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Zug umrüsten
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wähle die Frachten aus, die der Zug befördern soll
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Umrüstung des Zuges auf die ausgewählte Frachtart
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kann den Zug nicht umrüsten...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Wartungsintervalle in Prozent: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Wartungsintervalle in Prozent: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Produktion ändern
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Willkommen bei der neuen KI. Erwarte Fehler. Falls du einen findest, mache einen Screenshot und berichte im Forum. Viel Spaß!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Landschaft:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartengröße:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server Adresse:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server Adresse:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Startdatum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aktuelles Datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Passwort geschützt!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}Firmenprofil
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Firmenname:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Gründung:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Gründung:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Firmenwert:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Kontostand:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Einkommen (letzes Jahr):  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Leistung:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Leistung:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Fahrzeuge:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationen:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Fahrzeuge:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stationen:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Spieler:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Verbinde...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Hole Spielinformationen..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hole Firmeninformationen..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} Client(en) vor uns
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} KB bisher heruntergeladen
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Client(en) vor uns
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} KB bisher heruntergeladen
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Trennen
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Spielstand konnte nicht vom Server geladen werden.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Server konnte nicht gestartet werden.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Verbindung konnte nicht hergestellt werden.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Verbindung #{NUMU16} abgelaufen.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Verbindung #{NUM} abgelaufen.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Protokollfehler: Die Verbindung musste getrennt werden.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Ihre Version entspricht nicht der Serverversion.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Falsches Passwort.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-Abmessung der Karte: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-Abmessung der Karte: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-Abmessung der Karte: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-Abmessung der Karte: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kosten: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Städte
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebäude muss erst abgerissen werden
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Bevölkerung: {ORANGE}{COMMA}{BLACK}  Häuser: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Zeige Einzelheiten der Stadtverwaltung
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} Stadtverwaltung
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Bewertung der Transportfirma:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventionen
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subventionsangebot für:
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} von {STRING} nach {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} von {STRING2} nach {STRING2}
 STR_2028_BY                                                     :{YELLOW} (bis {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Keine
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Bereits vergebene Subventionen:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} von {STATION} nach {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} von {STATION} nach {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, bis {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subventionsangebot abgelaufen:{}{}{STRING} von {STRING} nach {STRING} wird nicht mehr subventioniert.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subventionsangebot abgelaufen:{}{}{STRING} von {STRING2} nach {STRING2} wird nicht mehr subventioniert.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subventionsende: {}{}{STRING} Dienstleistung von {STATION} nach {STATION} wird nicht mehr subventioniert.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subventionsangebot {}{}Erster {STRING}transport von {STRING} nach {STRING} wird ein Jahr von der Stadtverwaltung subventioniert!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {STRING}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr einen 50% höheren Frachtpreis!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {STRING}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr den doppelten Frachtpreis!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {STRING}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr den dreifachen Frachtpreis!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {STRING}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr den vierfachen Frachtpreis!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subventionsangebot {}{}Erster {STRING}transport von {STRING2} nach {STRING2} wird ein Jahr von der Stadtverwaltung subventioniert!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {COMPANY}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr einen 50% höheren Frachtpreis!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {COMPANY}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr den doppelten Frachtpreis!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {COMPANY}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr den dreifachen Frachtpreis!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention wird vergeben an {COMPANY}!{}{}{STRING}transport von {STATION} nach {STATION} bringt im nächsten Jahr den vierfachen Frachtpreis!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} Die Stadtverwaltung erlaubt nicht den Bau eines weiteren Flughafens in der Stadt
 STR_2036_COTTAGES                                               :Landhaus
 STR_2037_HOUSES                                                 :Haus
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Finanzieren Sie den Bau kommerzieller Gebäude im Ort.{}Kosten: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Kaufen Sie für 1 Jahre die exklusiven Transportrechte der Stadt. Die Stadtverwaltung erlaubt nur Passagier- und Frachttransporte Ihres Unternehmens.{}Kosten: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Bestechen Sie die Stadtverwaltung, um Ihre Bewertung zu verbessern. Dabei riskieren Sie allerdings eine harte Strafe, falls Sie ertappt werden.{}Kosten: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkehrschaos in {TOWN}!{}{}Straßensanierungsprogramm finanziert durch {STRING} wird 6 Monate lang Verzögerungen im Verkehr bewirken!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkehrschaos in {TOWN}!{}{}Straßensanierungsprogramm finanziert durch {COMPANY} wird 6 Monate lang Verzögerungen im Verkehr bewirken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (in Bearbeitung)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...ungeeignetes Gelände
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Baum kann hier nicht gepflanzt werden...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...zu viele Schilder
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Schild kann hier nicht aufgestellt werden...
 STR_280A_SIGN                                                   :Schild
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Zu viele Busbahnhöfe
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Zu viele Lkw-Ladeplätze
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Stationen/Ladeplätze liegen zu dicht beisammen
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Bahnhof muss erst abgerissen werden
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Zu dicht an einem anderen Flughafen
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Flughafen muss erst abgerissen werden
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Zu dicht an einer anderen Lkw-Ladestation
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Der Busbahnhof muss erst abgerissen werden
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Der Lkw-Ladeplatz muss erst abgerissen werden
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Haltestellen
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Haltestellen
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Keine -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...Gelände ungeeignet
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Zu dicht an einem anderen Hafen
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Großstädtischer Flughafen
 STR_305AB_LARGE                                                 :{BLACK}Internationaler Flughafen
 STR_305B_SIZE                                                   :{BLACK}Größe
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Bahnhof
 STR_305F_AIRCRAFT_HANGAR                                        :Flugzeughangar
 STR_3060_AIRPORT                                                :Flughafen
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Spiel laden
 STR_4002_SAVE                                                   :{BLACK}Speichern
 STR_4003_DELETE                                                 :{BLACK}Löschen
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Megabytes frei
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kann vom Laufwerk nicht lesen
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Spielspeicherung fehlgeschlagen
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion im letzten Monat:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% befördert)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% befördert)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Zentriere die Ansicht auf das Industriegebiet
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Neue(r/s) {STRING} wird nahe {TOWN} gebaut!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Neue(r) {STRING} wird nahe {TOWN} aufgeforstet!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Unbenannt{SKIP}
+STR_SV_UNNAMED                                                  :Unbenannt
 STR_SV_TRAIN_NAME                                               :Zug {COMMA}
 STR_SV_ROADVEH_NAME                                             :Fahrzeug {COMMA}
 STR_SV_SHIP_NAME                                                :Schiff {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Flugzeug {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nord
-STR_SV_STNAME_SOUTH                                             :{STRING} Süd
-STR_SV_STNAME_EAST                                              :{STRING} Ost
-STR_SV_STNAME_WEST                                              :{STRING} West
-STR_SV_STNAME_CENTRAL                                           :{STRING} Zentral
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :{STRING} Halt
-STR_SV_STNAME_VALLEY                                            :{STRING} Tal
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Höhe
-STR_SV_STNAME_WOODS                                             :{STRING} Wald
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Seeblick
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Zentral
-STR_SV_STNAME_AIRPORT                                           :{STRING} Flughafen
-STR_SV_STNAME_OILFIELD                                          :{STRING} Ölfeld
-STR_SV_STNAME_MINES                                             :{STRING} Mine
-STR_SV_STNAME_DOCKS                                             :{STRING} Hafen
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boje 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boje 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boje 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boje 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boje 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boje 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boje 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boje 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boje 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Anbau
-STR_SV_STNAME_SIDINGS                                           :{STRING} Nebengleis
-STR_SV_STNAME_BRANCH                                            :{STRING} Zweig
-STR_SV_STNAME_UPPER                                             :Obere {STRING}
-STR_SV_STNAME_LOWER                                             :Untere {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Wald
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Süd
+STR_SV_STNAME_EAST                                              :{STRING1} Ost
+STR_SV_STNAME_WEST                                              :{STRING1} West
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Zentral
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :{STRING1} Halt
+STR_SV_STNAME_VALLEY                                            :{STRING1} Tal
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Höhe
+STR_SV_STNAME_WOODS                                             :{STRING1} Wald
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Seeblick
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Zentral
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Flughafen
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Ölfeld
+STR_SV_STNAME_MINES                                             :{STRING1} Mine
+STR_SV_STNAME_DOCKS                                             :{STRING1} Hafen
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boje 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boje 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boje 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boje 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boje 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boje 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boje 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boje 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boje 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Anbau
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Nebengleis
+STR_SV_STNAME_BRANCH                                            :{STRING1} Zweig
+STR_SV_STNAME_UPPER                                             :Obere {STRING1}
+STR_SV_STNAME_LOWER                                             :Untere {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Wald
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Spieler {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Neues Gesicht
 STR_7005_COLOR_SCHEME                                           :{BLACK}Farbauswahl
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Name des Managers
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Firmenname kann nicht geändert werden...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Managername kann nicht geändert werden...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanzen {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanzen {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Ausgaben / Einnahmen
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Baukosten
 STR_7012_NEW_VEHICLES                                           :{GOLD}Neue Fahrzeuge
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Betriebskosten Züge
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Gesamt:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Einkommensdiagramm
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Auf die gewünschte Farbe klicken
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Kredit aufnehmen
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Kredit abzahlen
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
-STR_7038_INAUGURATED                                            :{GOLD}Gegründet: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
+STR_7038_INAUGURATED                                            :{GOLD}Gegründet: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Fahrzeuge:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} Zug
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} Züge
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Bewertung der Firmenleistung (Höchstwert = 1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Firmenwertdiagramm
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Firmentabelle
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transportfirma in der Krise!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} Falls die Firmenleitung sich nicht bessert, wird der Verkauf oder die Insolvenz eingeleitet!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Manager)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} Falls die Firmenleitung sich nicht bessert, wird der Verkauf oder die Insolvenz eingeleitet!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Manager)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transportfirmen fusionieren!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} ist verkauft worden an {STRING} für {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Wir suchen jemanden, der die Firma übernimmt.{}{}Nehmen Sie das Angebot an und kaufen {STRING} für {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} ist verkauft worden an {COMPANY} für {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Wir suchen jemanden, der die Firma übernimmt.{}{}Nehmen Sie das Angebot an und kaufen {COMPANY} für {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Insolvenz!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} ist von den Gläubigern geschlossen worden, alles Vermögen wurde veräussert!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} ist von den Gläubigern geschlossen worden, alles Vermögen wurde veräussert!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Neue Transportfirma gegründet!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} startet bei {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} startet bei {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Kann die Firma nicht kaufen...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Frachtbeförderungspreise
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Tage unterwegs
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Verkaufe 25% Anteil an dieser Firma
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kann 25% Anteil an dieser Firma nicht kaufen...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kann 25% Anteil an dieser Firma nicht verkaufen...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% Eigentum von {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% Eigentum von {STRING}{}   {COMMA}% Eigentum von {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} wurde von {STRING} übernommen!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% Eigentum von {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% Eigentum von {COMPANY}{}   {COMMA}% Eigentum von {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} wurde von {COMPANY} übernommen!
 STR_7080_PROTECTED                                              :{WHITE}Dieses Unternehmen handelt noch nicht mit Anteilen...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Zugdepot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Stadt feiert . . .{}Der erste Zug erreicht {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Zug ist im Weg
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Fahre nach {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Fahre nach {STATION} (Umladen und beladen)
 STR_8808_GO_TO_UNLOAD                                           :Fahre nach {STATION} (Entladen)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Zug zu lang
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Züge können nur verändert werden, wenn sie im Depot halten
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Züge
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Züge
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Neues Schienenfahrzeug
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Neue Monorailzüge
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Neue Magnetzüge
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Nach
 STR_8827_FULL_LOAD                                              :{BLACK}Beladen
 STR_8828_UNLOAD                                                 :{BLACK}Entladen
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Aufträge)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Aufträge)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Ende der Aufträge - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Wartung
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Kann Schienenfahrzeug nicht bauen...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebaut: {LTBLUE}{NUMU16}{BLACK}  Wert: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebaut: {LTBLUE}{NUM}{BLACK}  Wert: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Wert: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Laden / Entladen
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Zug muss im Depot angehalten sein
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kann den Zug nicht ins Depot schicken...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Überspringe diesen Auftrag, sofern keine Wartung benötigt wird
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Neue {STRING} ist jetzt verfügbar!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kosten: {CURRENCY}   Gewicht: {COMMA}t{}Geschwindigk.: {VELOCITY} Leistung: {COMMA} PS {}Betriebskosten: {CURRENCY}/Jahr{}Kapazität: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kosten: {CURRENCY}   Gewicht: {COMMA}t{}Geschwindigk.: {VELOCITY} Leistung: {COMMA} PS {}Betriebskosten: {CURRENCY}/Jahr{}Kapazität: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Panne
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING2}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Gewicht: {LTBLUE}{COMMA}t   {BLACK}Leistung: {LTBLUE}{COMMA} PS {BLACK}   Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Ausfälle seit letzter Wartung: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Fahrzeug ist im Weg
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Fahrzeuge
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Fahrzeuge
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Fahrzeugdepot
 STR_9004_NEW_VEHICLES                                           :{BLACK}Neue Fahrzeuge
 STR_9005_INFORMATION                                            :{BLACK}Information
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Baue Fahrzeug
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kann das Fahrzeug nicht bauen...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Erst muss ein Fahrzeugdepot gebaut werden
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Aufträge)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Einzelheiten)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Einzelheiten)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING2}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}  Gebaut: {LTBLUE}{NUMU16}{BLACK} Wert: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}  Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...muss in einem Fahrzeugdepot angehalten werden
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kann das Fahrzeug nicht verkaufen...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kann das Fahrzeug nicht anhalten/starten...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Baue das ausgewählte Fahrzeug
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Neues Fahrzeug jetzt erhältlich!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kosten: {CURRENCY}{}Geschwindigk.: {VELOCITY}{}Betriebskosten: {CURRENCY}/Jahr{}Capacity: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kosten: {CURRENCY}{}Geschwindigk.: {VELOCITY}{}Betriebskosten: {CURRENCY}/Jahr{}Capacity: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name des Fahrzeuges
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Kann das Fahrzeug nicht benennen...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kann den Hafen hier nicht bauen...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Werft
 STR_9804_NEW_SHIPS                                              :{BLACK}Neue Schiffe
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Schiffe
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Schiffe
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kann das Schiff nicht bauen...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Erst muss eine Werft gebaut werden
 STR_9808_NEW_SHIPS                                              :{WHITE}Neue Schiffe
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Kann das Schiff nicht verkaufen...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Kann das Schiff nicht bauen...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Schiff ist im Weg
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Aufträge)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Einzelheiten)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Einzelheiten)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING2}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Gebaut: {LTBLUE}{NUMU16}{BLACK}   Wert: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Gebaut: {LTBLUE}{NUM}{BLACK}   Wert: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kann das Schiff nicht anhalten/starten...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kann das Schiff nicht in die Werft schicken...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kann keine Werft finden
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Zeige Schiffs Einzelheiten
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Neues Schiff ist erhältlich!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosten: {CURRENCY}   Max. Geschwindigk.: {VELOCITY}{}Kapazität: {STRING}{}Betriebskosten: {CURRENCY}/Jahr
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosten: {CURRENCY}   Max. Geschwindigk.: {VELOCITY}{}Kapazität: {STRING1}{}Betriebskosten: {CURRENCY}/Jahr
 STR_982F_NAME_SHIP                                              :{BLACK}Schiffsname
 
 STR_9831_NAME_SHIP                                              :{WHITE}Schiffsname
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Schiff umbenennen
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Kann das Schiff nicht umbenennen...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Umrüstung des Schiffes zur Beförderung anderer Frachtarten
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Umrüsten)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Umrüsten)
 STR_983C_REFIT_SHIP                                             :{BLACK}Schiff umrüsten
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wähle die Frachtart aus, die das Schiff befördern soll
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Umrüstung des Schiffes auf die ausgewählte Frachtart
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wähle Frachtart für die Beförderung:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazität: {GOLD}{STRING}{}{BLACK}Kosten der Umrüstung: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazität: {GOLD}{STRING1}{}{BLACK}Kosten der Umrüstung: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kann das Schiff nicht umrüsten...
 STR_9842_REFITTABLE                                             :(umrüstbar)
 STR_GO_TO_SHIP_DEPOT                                            :Fahre zu {TOWN} Schiffswerft
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Neues Flugzeug
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Flugzeug bauen
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kann das Flugzeug nicht bauen...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Flugzeuge
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Aufträge)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Einzelheiten)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Flugzeuge
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Aufträge)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Einzelheiten)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING2}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. Geschwindigk.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY}  (letztes Jahr: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Pannen seit letzter Wartung: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Gebaut: {LTBLUE}{NUMU16}{BLACK}   Wert: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Gebaut: {LTBLUE}{NUM}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kann das Flugzeug nicht in den Hangar schicken...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Unterwegs zu {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Unterwegs zu {STATION} Hangar, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kann das Flugzeug nicht anhalten/starten...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Das Flugzeug ist in der Luft
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Erst muss ein Flugzeug gebaut werden
-STR_A019_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Flugzeug muss im Hangar angehalten werden
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Kann das Flugzeug nicht verkaufen...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Flugzeugbau
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Flugzeug umbenennen
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Kann das Flugzeug nicht umbenennen...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Umrüstung des Flugzeuges zum Transport anderer Frachten
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Umrüstung)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Umrüstung)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Flugzeug umrüsten
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wähle die Fracht, die das Flugzeug transportieren soll
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Umrüstung des Flugzeuges auf die ausgewählte Frachtart
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wähle Frachtart für Umrüstung aus:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazität: {GOLD}{STRING}{}{BLACK}Kosten der Umrüstung: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazität: {GOLD}{STRING1}{}{BLACK}Kosten der Umrüstung: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kann das Flugzeug nicht umrüsten...
 STR_A043_REFITTABLE                                             :(umrüstbar)
 STR_GO_TO_AIRPORT_HANGAR                                        :Fliege zu {STATION} Hangar
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Details
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Fahrzeuge:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stationen:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Trennsymbol:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Präfix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Umstellung auf Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Umstellung auf Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Umstellung auf Euro: {ORANGE}nie
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Vorschau: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Parameter für eigene Währung ändern
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Geschwindigk.: {GOLD}{VELOCITY}{BLACK}   Leistung: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Betriebskosten: {GOLD}{CURRENCY}/Jahr
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapazität: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUMU16}{BLACK} Lebensdauer: {GOLD}{COMMA} Jahre
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapazität: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUM}{BLACK} Lebensdauer: {GOLD}{COMMA} Jahre
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Zuverlässigkeit: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Geschwindigk.: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapazität: {GOLD}{COMMA} Passagiere, {COMMA} Postsäcke
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Angetriebene Waggons: {GOLD}+{COMMA}PS{BLACK} Gewicht: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Angetriebene Waggons: {GOLD}+{COMMA}PS{BLACK} Gewicht: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/hungarian.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/hungarian.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Sima föld szükséges
 STR_0008_WAITING                                                :{BLACK}Várakozik: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW} (elvitelre
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW} (elvitelre
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Elfogad:{WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Elfogad:{GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Térkép - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Beállítások
 STR_00B2_MESSAGE                                                :{YELLOW}Üzenet
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}{STRING} üzenete
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}{STRING1} üzenete
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nem teheted ezt...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nem tisztíthatod meg a területet...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Mérföld
 STR_013A_METRIC_KILOMETERS                                      :Kilométer
-STR_013B_OWNED_BY                                               :{WHITE}... {STRING} tulajdona
+STR_013B_OWNED_BY                                               :{WHITE}... {STRING2} tulajdona
 STR_013C_CARGO                                                  :{BLACK}Rakomány
 STR_013D_INFORMATION                                            :{BLACK}Információ
 STR_013E_CAPACITIES                                             :{BLACK}Kapacitás
 STR_013E_TOTAL_CARGO                                            :{BLACK}Teljes rakomány
-STR_013F_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Teljes rakománya (kapacitása) ennek a vonatnak:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Új játék
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Játék szüneteltetése
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Játék mentése, kilépés a játékból, kilépés
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Állomások listája
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}{LTBLUE}Nem lehet lerombolni
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}A megtisztítás költsége: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Nincs
-STR_01A7_OWNER                                                  :{BLACK}Tulajdonos: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Helyi önkormányzat: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Tulajdonos: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Helyi önkormányzat: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Nincs
 STR_01AA_NAME                                                   :{BLACK}Név
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Válassz egy tanítást/demót
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Elfogad: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Elfogad: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Elfogad: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Elfogad: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Elfogad: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Elfogad: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Szám{SETX 88}Cím
 STR_01E9_SHUFFLE                                                :{TINYFONT}Kever
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Mûsor
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Zenei mûsor kiválasztása
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA}   "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA}   "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Számlista
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}"{STRING}" mûsora
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Törlés
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Összes üzenettípus beállítása (be/rövid/ki)
 STR_MESSAGE_SOUND                                               :{YELLOW}Figyelmeztetõ hang lejátszása rövid üzenetnél
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...túl távol van az elõzõ céltól
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Legjobb cégek melyek elérték a {NUMU16}{}({STRING} Szintet)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Cégdicsõség tábla {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Legjobb cégek melyek elérték a {NUM}{}({STRING} Szintet)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Cégdicsõség tábla {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Üzletember
 STR_0214_ENTREPRENEUR                                           :Vállalkozó
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Mágnás
 STR_0218_MOGUL                                                  :Fejes
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Az évszázad iparmágnása
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} elérte a '{STRING}' rangot!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} - {STRING} elérte a '{STRING}' rangot!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} elérte a '{STRING}' rangot!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} - {COMPANY} elérte a '{STRING}' rangot!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}A város méretének kiválasztása
 STR_02A5_TOWN_SIZE                                              :{YELLOW}A város mérete:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Utolsó üzenet vagy újsághír megmutatása
 STR_OFF                                                         :Ki
 STR_SUMMARY                                                     :Kivonat
 STR_FULL                                                        :Teljes
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Városlista
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Jármûvek márkanevei
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Ki
 STR_CONFIG_PATCHES_ON                                           :Be
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Jármûvek sebességének kijelzése: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Lejtõre es partokra építés: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Élethûbben méretezett befogadókörzetek bekapcsolása: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Engedélyezi az ipari létesítmények és utak rombolását, stb: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Óriásvonatok engedélyezése: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Vonatok valósághû gyorsulása: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}A vonatok és a hajók nem tehetnek 90 fokos kanyart: {ORANGE}{STRING} {LTBLUE} (NPF szükséges)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Egymás mellé építhetõ vonatállomások: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Bármelyik rakomány telipakolása esetén induljon a jármû: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}A továbbfejlesztett betöltés használata: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Infláció: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Csak akkor szállítson árut az állomásra, ha ott van rá kereslet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Nagyon hosszú hidak engedélyezése: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}'Menj a garázsba' engedélyezés a menetrendben: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Nyersanyagtermelõ ipari épületek építési lehetõsége: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Több hasonló ipari épület egy városon belül: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Több ugyanolyan gyár építhetõ közel egymáshoz: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mindig teljes dátum a képernyõn: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Közlekedési lámpák a menetirány szerinti oldalon legyenek: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Pénzügyi összesítés minden év végén: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompatibilis nonstop kezelés: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Közúti jármûvek sorbanállása (quantum effektektus): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Ablakmozgatás, ha az egér a képernyõ szélén van: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Önkormányzatok lefizethetõsége: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Új garázskeresés: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Különbözõ vágánytípusok engedélyezése egy állomáson: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Új algoritmus a vonatok útkeresésére: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Új útvonalkeresõ (NPF, felülbírálja az NTP-t): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Jármûvek sebességének kijelzése: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Lejtõre es partokra építés: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Élethûbben méretezett befogadókörzetek bekapcsolása: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Engedélyezi az ipari létesítmények és utak rombolását, stb: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Óriásvonatok engedélyezése: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Vonatok valósághû gyorsulása: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}A vonatok és a hajók nem tehetnek 90 fokos kanyart: {ORANGE}{STRING1} {LTBLUE} (NPF szükséges)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Egymás mellé építhetõ vonatállomások: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Bármelyik rakomány telipakolása esetén induljon a jármû: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}A továbbfejlesztett betöltés használata: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Infláció: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Csak akkor szállítson árut az állomásra, ha ott van rá kereslet: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Nagyon hosszú hidak engedélyezése: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}'Menj a garázsba' engedélyezés a menetrendben: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Nyersanyagtermelõ ipari épületek építési lehetõsége: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Több hasonló ipari épület egy városon belül: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Több ugyanolyan gyár építhetõ közel egymáshoz: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mindig teljes dátum a képernyõn: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Közlekedési lámpák a menetirány szerinti oldalon legyenek: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Pénzügyi összesítés minden év végén: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompatibilis nonstop kezelés: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Közúti jármûvek sorbanállása (quantum effektektus): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Ablakmozgatás, ha az egér a képernyõ szélén van: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Önkormányzatok lefizethetõsége: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Új garázskeresés: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Különbözõ vágánytípusok engedélyezése egy állomáson: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Új algoritmus a vonatok útkeresésére: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Új útvonalkeresõ (NPF, felülbírálja az NTP-t): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Mindig engedélyezze a kis repülõtereket: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Mindig engedélyezze a kis repülõtereket: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A vonat eltévedt, ha az úton töltött napok száma legalább : {ORANGE}{STRING} nap
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A vonat eltévedt, ha az úton töltött napok száma legalább : {ORANGE}{STRING1} nap
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}A vonat eltévedt ha nem halad elõre: {ORANGE}kikapcsolva
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Jármûvek menetrendjének ellenõrzése: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Jármûvek menetrendjének ellenõrzése: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nem
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :igen, de nem az álló jármûvekre
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :minden jármûre
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Figyelmeztetés, ha a vonat veszteséges: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Jármûvek sose avuljanak el: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Figyelmeztetés, ha a vonat veszteséges: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Jármûvek sose avuljanak el: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automatán felújítja a jármûvet ha elöregedik
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Automatán felújítja a jármûvet {ORANGE}{STRING}{LTBLUE} hónappal a max életkora elõtt/után
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Automata megújításhoz szükséges minimális pénz: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Hibaüzenetek megjelenítési ideje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mutassa a lakosságot a feliratban: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Láthatatlan fák (átlátszó épületekkel): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Hóhatár magassága: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Állomások legnagyobb kiterjedése: {ORANGE}{STRING} {RED}Figyelem: magas érték lelassítja a játékot
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Helikopterek automatikus javítása a helikopter-leszállókon: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximum vonat játékosonként: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximum közúti jármû játékosonként: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximum repülõgép játékosonként: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximum hajó játékosonként: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Automatán felújítja a jármûvet {ORANGE}{STRING1}{LTBLUE} hónappal a max életkora elõtt/után
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Automata megújításhoz szükséges minimális pénz: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Hibaüzenetek megjelenítési ideje: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mutassa a lakosságot a feliratban: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Láthatatlan fák (átlátszó épületekkel): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Hóhatár magassága: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Állomások legnagyobb kiterjedése: {ORANGE}{STRING1} {RED}Figyelem: magas érték lelassítja a játékot
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Helikopterek automatikus javítása a helikopter-leszállókon: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Vonatok tiltása a gépi ellenfeleknek: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Közúti jármûvek tiltása a gépi ellenfeleknek: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Repülõgépek tiltása a gépi ellenfeleknek: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Hajók tiltása a gépi ellenfeleknek: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximum vonat játékosonként: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximum közúti jármû játékosonként: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximum repülõgép játékosonként: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximum hajó játékosonként: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Új gépi ellenfél (csak buszt épít): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Vonatok tiltása a gépi ellenfeleknek: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Közúti jármûvek tiltása a gépi ellenfeleknek: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Repülõgépek tiltása a gépi ellenfeleknek: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Hajók tiltása a gépi ellenfeleknek: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Alapértelmezett szervízelés vonatoknak: {ORANGE}{STRING} naponta
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Új gépi ellenfél (csak buszt épít): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Alapértelmezett szervízelés vonatoknak: {ORANGE}{STRING1} naponta
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Alap szervízelési idõ a vonatokra: {ORANGE}kikapcsolva
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Alapértelmezett szervízelés közúti jármûveknek: {ORANGE}{STRING} naponta
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Alapértelmezett szervízelés közúti jármûveknek: {ORANGE}{STRING1} naponta
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Alap szervízelési idõ a köyúti jármûvekre: {ORANGE}kikapcsolva
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Alapértelmezett szervízelés repülõgépeknek: {ORANGE}{STRING} naponta
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Alapértelmezett szervízelés repülõgépeknek: {ORANGE}{STRING1} naponta
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Alap szervízelési idõ a repülõkre: {ORANGE}kikapcsolva
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Alapértelmezett szervízelés hajóknak: {ORANGE}{STRING} naponta
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Alapértelmezett szervízelés hajóknak: {ORANGE}{STRING1} naponta
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Alap szervízelési idõ a hajókra: {ORANGE}kikapcsolva
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Ne legyen szervízelés ha lerobbanások sincsenek: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Ne legyen szervízelés ha lerobbanások sincsenek: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Színes újságcikkek megjelenése: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Játék induló dátuma: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Játék befejezésének az éve: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Színes újságcikkek megjelenése: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Játék induló dátuma: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Játék befejezésének az éve: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Egyenletes gazdaság (több, kisebb változás)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Másik cégekbõl részvényt lehet vásárolni
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Amikor megragadom helyezzen lámpákat minden {ORANGE}{STRING}. mezõre
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Automatikus PBS (intelligens jelz&#337;csoport) létrehozás: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}A fõ eszközsor helye: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Amikor megragadom helyezzen lámpákat minden {ORANGE}{STRING1}. mezõre
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Automatikus PBS (intelligens jelz&#337;csoport) létrehozás: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}A fõ eszközsor helye: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Balra
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Középen
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Jobbra
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Ablakigazítás kiterjedése: {ORANGE}{STRING} képpont
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Ablakigazítás kiterjedése: {ORANGE}{STRING1} képpont
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Ablakigazítás kiterjedése: {ORANGE}letiltva
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Megjelenítés
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Ellenfelek
 
 STR_CONFIG_PATCHES_DISABLED                                     :kikapcsolva
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Válassz beállítási értéket
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Figyelem! Te épp a versenytársaidat készülöd elárulni. Sose felejtsd el, hogy egy ilyen szégyenletes tett sose merül feledésbe.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Tõkeemelés {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Játszani mint játékos #{ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Csodabuldózer (lerombol gazdasági épületeket, stb): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}A csatornák keresztezhessék egymást: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Építés szünet módban: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Csodabuldózer (lerombol gazdasági épületeket, stb): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}A csatornák keresztezhessék egymást: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Építés szünet módban: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jet-repülõgépek nem fognak (gyakran) lezuhanni a kisebb repülõtereken: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Klíma változtatás: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Dátum módosítás: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}A nyersanyagüzemek termelése változtatható: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}A nyersanyagüzemek termelése változtatható: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Úton {WAYPOINT} felé
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Úton {WAYPOINT} felé, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... a bóját használják!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordináták: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordináták: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Itt nem lehet átalakítani a sínt...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Cukorbánya építése
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gazdasági épületek
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% elszállítva)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% elszállítva)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% elszállítva)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% elszállítva)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...túl közel egy másik gazdasági épülethez
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}A vonat átalakítása másfajta áru szállítására
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (átalakítható)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Vonat átalakítása
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Válaszd ki, milyen árut szállítson a vonat
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}A vonat átalakítása a kijelölt áru szállítására
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nem alakíthatod át a vonatot...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Szervízintervallumok százalékban: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Szervízintervallumok százalékban: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Termelés megváltoztatása
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Üdv, ez itt az új, fejlesztés alatt álló MI. Elõfordulhatnak gondok, problémák. Ha belefutsz egybe, kérlek készíts képernyõmentést küld be a fórumra. Jó játékot!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tájtípus:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}A pálya nagysága:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Szerver verzió:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}A szerver címe:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}A szerver címe:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Kezdési dátum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Jelenlegi dátum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Jelszóval védve!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}CÉG INFÓ
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}A cég neve:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Beiktatás:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Beiktatás:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}A cég értéke:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Jelelegi összeg:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Elõzõ évi bevétel:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Teljesítmény:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Teljesítmény:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Jármûvek:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Állomások:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Jármûvek:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Állomások:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Játékosok:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Kapcsolódás...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Játékinfó lekérése..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Céginfó lekérése..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} kliensre várunk, hogy befejezze
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kilobájt lett eddig letöltve
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} kliensre várunk, hogy befejezze
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kilobájt lett eddig letöltve
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Lebontás
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nem sikerült a szerver játékmentés betöltése.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nem tudtam elindítani a szervert.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nem tudtam kapcsolódni.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} A(z) {NUMU16}. játékos kapcsolata elveszett.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} A(z) {NUM}. játékos kapcsolata elveszett.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Protokoll-hibát csináltunk, és megszakadt a kapcsolat.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} A te gépeden lévõ és a szerveren lévõ programnak nem egyezik meg a verziója.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Rossz jelszó.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}ÉK-DNY térképszélesség: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}ÉNY-DK térképszélesség: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}ÉK-DNY térképszélesség: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}ÉNY-DK térképszélesség: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}{CURRENCY} kiadás
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Városok
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Elõbb le kell rombolnod az épületet
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Lakosság: {ORANGE}{COMMA}{BLACK} Házak: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Az önkormányzat adatainak megmutatása
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} önkormányzata
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Vélemény a szállítási cégekrõl:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Támogatások
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Támogatás jár
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} szállításáért {STRING} és {STRING} között
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} szállításáért {STRING2} és {STRING2} között
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT}ig)
-STR_2029                                                        :{STRING}i {STRING}
+STR_2029                                                        :{TOWN}i {STRING}
 STR_202A_NONE                                                   :{ORANGE}---
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Már támogatást kap
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} szállításáért {STATION} és {STATION} között {YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} szállításáért {STATION} és {STATION} között {YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW} ({DATE_SHORT}ig)
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A támogatás határideje lejárt:{}{}{STRING} szállításáért {STRING} és {STRING} között már nem jár támogatás.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A támogatás határideje lejárt:{}{}{STRING} szállításáért {STRING2} és {STRING2} között már nem jár támogatás.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Támogatás visszavonva:{}{}{STRING} szállítása {STATION} és {STATION} között már nem támogatott.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Támogatási ajánlat:{}{}Az elsõ {STRING} szállító {STRING} és {STRING} között egy éves támogatást kap a helyi önkormányzattól!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{STRING} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között másfélszeres hasznot hoz neki!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{STRING} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között kétszeres hasznot hoz neki!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{STRING} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között háromszoros hasznot hoz neki!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{STRING} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között négyszeres hasznot hoz neki!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Támogatási ajánlat:{}{}Az elsõ {STRING} szállító {STRING2} és {STRING2} között egy éves támogatást kap a helyi önkormányzattól!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között másfélszeres hasznot hoz neki!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között kétszeres hasznot hoz neki!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között háromszoros hasznot hoz neki!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}{COMPANY} támogatást kapott!{}{}Így {STRING} szállítása {STATION} és {STATION} között négyszeres hasznot hoz neki!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} önkormányzata nem engedélyez új repteret a városban
 STR_2036_COTTAGES                                               :Vidéki házak
 STR_2037_HOUSES                                                 :Házak
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}  Új kereskedelmi épületek építésének támogatása a városban.{}  Ára: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}  Egy éves kizárólagos szállítási jogok vétele a városban. Az önkormányzat csak a te állomásaid használatát engedi meg az utasoknak és az áruknak.{}  Ára: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} A megítélésed növelése az önkormányzat megvesztegetésével, komoly büntetést kockáztatva, ha ez kiderül.{} Ára: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Közlekedési zûrzavar {TOWN} városában!{}{}{STRING} által indított útjavítás keseríti meg hat hónapig az autóvezetõk életét!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Közlekedési zûrzavar {TOWN} városában!{}{}{COMPANY} által indított útjavítás keseríti meg hat hónapig az autóvezetõk életét!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (építés alatt)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...nem alkalmas rá a hely
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Nem ültethetsz ide fát...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...túl sok a felirat
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Nem rakhatsz ide feliratot...
 STR_280A_SIGN                                                   :Felirat
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Túl sok buszmegálló
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Túl sok kamion megálló
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Túl közel van egy másik állomáshoz/rakodóhelyhez
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Elõbb le kell rombolnod a vasútállomást
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Túl közel van egy másik repülõtérhez
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Elõbb le kell rombolnod a repülõteret
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Túl közel van egy másik teherautó-rakodóhoz
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Elõbb le kell rombolnod a buszmegállót
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Elõbb le kell rombolnod a teherautó-rakodóhelyet
-STR_3048_STATIONS                                               :{WHITE}{STRING} állomásai - {COMMA}
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} állomásai - {COMMA}
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nincs -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...nem alkalmas rá a hely
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Túl közel van egy másik kikötõhöz
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Nagyvárosi repülõtér
 STR_305AB_LARGE                                                 :{BLACK}Nemzetközi repülõter
 STR_305B_SIZE                                                   :{BLACK}Méret
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Vasútállomás
 STR_305F_AIRCRAFT_HANGAR                                        :Reptéri hangár
 STR_3060_AIRPORT                                                :Repülõtér
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Játék betöltése
 STR_4002_SAVE                                                   :{BLACK}Ment
 STR_4003_DELETE                                                 :{BLACK}Töröl
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabájt szabad
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nem olvasható a meghajtó
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}A mentés nem sikerült
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Múlt havi termelés:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% elszállítva)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% elszállítva)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}A fõ nézetet a gazdasági épületre állítja
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Új {STRING} épül {TOWN} közelében!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Új {STRING} ültettek {TOWN} közelében!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Névtelen{SKIP}
+STR_SV_UNNAMED                                                  :Névtelen
 STR_SV_TRAIN_NAME                                               :Vonat {COMMA}
 STR_SV_ROADVEH_NAME                                             :Közúti jármû {COMMA}
 STR_SV_SHIP_NAME                                                :Hajó {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Repülõ {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :Észak-{STRING}
-STR_SV_STNAME_SOUTH                                             :Dél-{STRING}
-STR_SV_STNAME_EAST                                              :Kelet-{STRING}
-STR_SV_STNAME_WEST                                              :Nyugat-{STRING}
-STR_SV_STNAME_CENTRAL                                           :{STRING} i központ
-STR_SV_STNAME_TRANSFER                                          :{STRING}i átszálló
-STR_SV_STNAME_HALT                                              :{STRING}i megálló
-STR_SV_STNAME_VALLEY                                            :{STRING}i völgy
-STR_SV_STNAME_HEIGHTS                                           :{STRING}i hegy
-STR_SV_STNAME_WOODS                                             :{STRING}i erdõ
-STR_SV_STNAME_LAKESIDE                                          :{STRING}i tópart
-STR_SV_STNAME_EXCHANGE                                          :{STRING} csere
-STR_SV_STNAME_AIRPORT                                           :{STRING}i reptér
-STR_SV_STNAME_OILFIELD                                          :{STRING}i olajmezõ
-STR_SV_STNAME_MINES                                             :{STRING}i bánya
-STR_SV_STNAME_DOCKS                                             :{STRING}i kikötõ
-STR_SV_STNAME_BUOY_1                                            :{STRING}i bója 1
-STR_SV_STNAME_BUOY_2                                            :{STRING}i bója 2
-STR_SV_STNAME_BUOY_3                                            :{STRING}i bója 3
-STR_SV_STNAME_BUOY_4                                            :{STRING}i bója 4
-STR_SV_STNAME_BUOY_5                                            :{STRING}i bója 5
-STR_SV_STNAME_BUOY_6                                            :{STRING}i bója 6
-STR_SV_STNAME_BUOY_7                                            :{STRING}i bója 7
-STR_SV_STNAME_BUOY_8                                            :{STRING}i bója 8
-STR_SV_STNAME_BUOY_9                                            :{STRING}i bója 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} mellék
-STR_SV_STNAME_SIDINGS                                           :{STRING} oldal
-STR_SV_STNAME_BRANCH                                            :{STRING} mellékág
-STR_SV_STNAME_UPPER                                             :{STRING}-felsõ
-STR_SV_STNAME_LOWER                                             :{STRING}-alsó
-STR_SV_STNAME_HELIPORT                                          :{STRING}i helikopter-leszálló
-STR_SV_STNAME_FOREST                                            :{STRING}i erdõség
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :Észak-{STRING1}
+STR_SV_STNAME_SOUTH                                             :Dél-{STRING1}
+STR_SV_STNAME_EAST                                              :Kelet-{STRING1}
+STR_SV_STNAME_WEST                                              :Nyugat-{STRING1}
+STR_SV_STNAME_CENTRAL                                           :{STRING1} i központ
+STR_SV_STNAME_TRANSFER                                          :{STRING1}i átszálló
+STR_SV_STNAME_HALT                                              :{STRING1}i megálló
+STR_SV_STNAME_VALLEY                                            :{STRING1}i völgy
+STR_SV_STNAME_HEIGHTS                                           :{STRING1}i hegy
+STR_SV_STNAME_WOODS                                             :{STRING1}i erdõ
+STR_SV_STNAME_LAKESIDE                                          :{STRING1}i tópart
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} csere
+STR_SV_STNAME_AIRPORT                                           :{STRING1}i reptér
+STR_SV_STNAME_OILFIELD                                          :{STRING1}i olajmezõ
+STR_SV_STNAME_MINES                                             :{STRING1}i bánya
+STR_SV_STNAME_DOCKS                                             :{STRING1}i kikötõ
+STR_SV_STNAME_BUOY_1                                            :{STRING1}i bója 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1}i bója 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1}i bója 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1}i bója 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1}i bója 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1}i bója 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1}i bója 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1}i bója 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1}i bója 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} mellék
+STR_SV_STNAME_SIDINGS                                           :{STRING1} oldal
+STR_SV_STNAME_BRANCH                                            :{STRING1} mellékág
+STR_SV_STNAME_UPPER                                             :{STRING1}-felsõ
+STR_SV_STNAME_LOWER                                             :{STRING1}-alsó
+STR_SV_STNAME_HELIPORT                                          :{STRING1}i helikopter-leszálló
+STR_SV_STNAME_FOREST                                            :{STRING1}i erdõség
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :({COMMA}. játékos)
 STR_7004_NEW_FACE                                               :{BLACK}Új arc
 STR_7005_COLOR_SCHEME                                           :{BLACK}Szín váltása
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Az elnök neve
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nem változtathatod meg a cég nevét...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nem változtathatod meg az elnök nevét...
-STR_700E_FINANCES                                               :{WHITE}{STRING} pénzügyei {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} pénzügyei {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Kiadás/Bevétel
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Építkezés
 STR_7012_NEW_VEHICLES                                           :{GOLD}Új jármûvek
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Vonat mûködtetési költség
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Összesen:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Jövedelem grafikon
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Kattints az új színre
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}A kölcsön növelése
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}A kölcsön egy részének törlesztése
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Elnök)
-STR_7038_INAUGURATED                                            :{GOLD}Alapítás éve: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Elnök)
+STR_7038_INAUGURATED                                            :{GOLD}Alapítás éve: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Jármûvek:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} vonat
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} vonat
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Cégek teljesítménye (legjobb teljesítmény=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Vállalatok értéke
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}A cégek helyezése
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Egy szállítási cég bajban van!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} csõdöt jelent vagy el kell adni, ha teljesítménye nem nõ hamarosan!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING} {}(Elnök)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} csõdöt jelent vagy el kell adni, ha teljesítménye nem nõ hamarosan!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME} {}(Elnök)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Szállítási cégek egyesülése!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING}  céget felvásárolta {STRING}  {CURRENCY}-ért!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Egy olyan szállítási céget keresünk, aki tovább vezetné a cégünket{}{}Megveszed {STRING}  céget {CURRENCY}-ért?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY}  céget felvásárolta {COMPANY}  {CURRENCY}-ért!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Egy olyan szállítási céget keresünk, aki tovább vezetné a cégünket{}{}Megveszed {COMPANY}  céget {CURRENCY}-ért?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Csõd!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} céget bezáratták a hitelezõi és minden vagyonát elárverezték!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} céget bezáratták a hitelezõi és minden vagyonát elárverezték!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Új szállítási vállalatot alapítottak!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} {TOWN} közelében kezd építkezni!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} {TOWN} közelében kezd építkezni!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nem veheted meg a céget...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Rakományok szállítási díja
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Úton töltött napok
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}25% eladása ebbõl a cégbõl
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nem vehetsz 25%-ot ebbõl a cégbõl...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nem adhatsz el 25%-ot ebbõl a cégbõl...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% {STRING} tulajdona)
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% {STRING} tulajdona{}   {COMMA}% {STRING} tulajdona)
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} céget felvásárolta {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% {COMPANY} tulajdona)
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% {COMPANY} tulajdona{}   {COMMA}% {COMPANY} tulajdona)
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} céget felvásárolta {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Ez a cég egyelõre még nem rendelkezik részvényekkel...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN}i jármûtelep
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az elsõ vonat {STATION} állomásra!
-STR_8802_DETAILS                                                :{WHITE}{STRING} adatai
+STR_8802_DETAILS                                                :{WHITE}{STRING1} adatai
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vonat van az útban
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Menj {STATION} állomásra
 STR_8807_GO_TO_TRANSFER                                         :Menj {STATION} (odaszállít és felvesz rakományt)
 STR_8808_GO_TO_UNLOAD                                           :Menj {STATION} (lepakol)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Információk
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Túl hosszú a vonat
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Csak a jármûtelepen álló vonatokat lehet megváltoztatni
-STR_881B_TRAINS                                                 :{WHITE}{STRING} vonatai - {COMMA}
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} vonatai - {COMMA}
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Új vasúti jármûvek
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Új egysínû jármûvek
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Új MagLev jármûvek
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Új cél
 STR_8827_FULL_LOAD                                              :{BLACK}Telepakol
 STR_8828_UNLOAD                                                 :{BLACK}Lepakol
-STR_8829_ORDERS                                                 :{WHITE}{STRING} menetrendje
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} menetrendje
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Menetrend vége - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Javítás
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nem veheted meg a vasúti jármûvet...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Vásárlás éve: {LTBLUE}{NUMU16}{BLACK} Érték: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Érték: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Felpakol / Lepakol
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}A remízben kellene állnia ehhez
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nem küldheted a vonatot a jármûtelepre...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Célpont kihagyása, ha javítás szükséges
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Új {STRING} használható!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Ár: {CURRENCY}    Súly: {COMMA}t{}Sebesség: {VELOCITY}    Teljesítmény: {COMMA}le{}Mûködtetési költség: {CURRENCY}/év{}Kapacitás: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Ár: {CURRENCY}    Súly: {COMMA}t{}Sebesség: {VELOCITY}    Teljesítmény: {COMMA}le{}Mûködtetési költség: {CURRENCY}/év{}Kapacitás: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Lerobbant
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING2}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Súly: {LTBLUE}{COMMA}t   {BLACK}Teljesítmény: {LTBLUE}{COMMA} le{BLACK}   Végsebesség: {LTBLUE} {VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Közúti jármû van az útban
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} közúti jármûvei - {COMMA}
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} közúti jármûvei - {COMMA}
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN}i garázs
 STR_9004_NEW_VEHICLES                                           :{BLACK}Új jármûvek
 STR_9005_INFORMATION                                            :{BLACK}Információ
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Megvesz
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nem veheted meg a közúti jármûvet...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Elõbb garázst kell építened
-STR_900B_ORDERS                                                 :{WHITE}{STRING} menetrendje
-STR_900C_DETAILS                                                :{WHITE}{STRING} adatai
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} adatai
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING2}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_900E_MAX_SPEED                                              :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUMU16}{BLACK}   Érték: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUM}{BLACK}   Érték: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...garázsban kellene állnia ehhez
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nem adhatod el a közúti jármûvet...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nem indíthatod el/ állíthatod meg a közúti jármûvet...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}A kijelölt közúti jármû megvétele
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Új közúti jármû használható!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Ár: {CURRENCY}{}Sebesség: {VELOCITY}{}Mûködtetési költség: {CURRENCY}/év{}Kapacitás: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Ár: {CURRENCY}{}Sebesség: {VELOCITY}{}Mûködtetési költség: {CURRENCY}/év{}Kapacitás: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Közúti jármû átnevezése
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nem nevezheted át a közúti jármûvet...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nem építhetsz ide kikötõt...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN}i dokk
 STR_9804_NEW_SHIPS                                              :{BLACK}Új hajók
-STR_9805_SHIPS                                                  :{WHITE}{STRING} hajói - {COMMA}
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} hajói - {COMMA}
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nem vehetsz hajókat...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Elõbb dokkot kell építened
 STR_9808_NEW_SHIPS                                              :{WHITE}Új hajók
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Nem adhatod el a hajót...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Nem veheted meg a hajót...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Hajó van az útban
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} menetrendje
-STR_9811_DETAILS                                                :{WHITE}{STRING} adatai
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} adatai
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING2}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_9813_MAX_SPEED                                              :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUMU16}{BLACK}   Érték: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUM}{BLACK}   Érték: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nem indíthatod el/ állíthatod meg a hajót...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nem küldheted a hajót a dokkba...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nem találom a helyi dokkot
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}A hajó adatai
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Új hajó használható!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ár: {CURRENCY}    Végsebesség: {VELOCITY}{}Kapacitás: {STRING}{}Mûködtetési költség: {CURRENCY}/év
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ár: {CURRENCY}    Végsebesség: {VELOCITY}{}Kapacitás: {STRING1}{}Mûködtetési költség: {CURRENCY}/év
 STR_982F_NAME_SHIP                                              :{BLACK}Hajó átnevezése
 
 STR_9831_NAME_SHIP                                              :{WHITE}Hajó átnevezése
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Márkanév megváltoztatása
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nem változtathatod meg a márkanevet...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}A hajó átalakítása másfajta rakomány szállítására
-STR_983B_REFIT                                                  :{WHITE}{STRING} átalakítása
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} átalakítása
 STR_983C_REFIT_SHIP                                             :{BLACK}Hajó átalakítása
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Válaszd ki, milyen árut szállítson a hajó
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}A hajó átalakítása a kijelölt áru szállítására
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Átalakítás, hogy szállíthasson:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Új kapacitás: {GOLD}{STRING}{}{BLACK}Átalakítás költsége: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Új kapacitás: {GOLD}{STRING1}{}{BLACK}Átalakítás költsége: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nem alakíthatod át a hajót...
 STR_9842_REFITTABLE                                             :(átalakítható)
 STR_GO_TO_SHIP_DEPOT                                            :Menj a {TOWN}i kikötõbe
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Új repülõgépek
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Megvesz
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nem veheted meg a repülõgépet...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} repülõgépei - {COMMA}
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} menetrendje
-STR_A00C_DETAILS                                                :{WHITE}{STRING} adatai
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} repülõgépei - {COMMA}
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} menetrendje
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} adatai
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING2}{BLACK}   Mûködtetési költség: {LTBLUE}{CURRENCY}/év
 STR_A00E_MAX_SPEED                                              :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ezévi haszon: {LTBLUE}{CURRENCY}  (tavalyi: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}%   {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUMU16}{BLACK}   Érték: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vásárlás éve: {LTBLUE}{NUM}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nem küldheted a repülõgépet a hangárba...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Úton a {STATION} hangárjába
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Úton a {STATION} hangárjába, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nem indíthatod el/ állíthatod meg a repülõgépet...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}... a levegõben van
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Elõbb repülõteret kell építened
-STR_A019_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}A hangárban kellene állnia ehhez
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nem adhatod el a repülõgépet...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Repülõtér építése
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Márkanév megváltoztatása
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nem változtathatod meg a márkanevet...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}A repülõgép átalakítása másfajta rakomány szállítására
-STR_A03C_REFIT                                                  :{WHITE}{STRING} átalakítása
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} átalakítása
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Repülõgép átalakítása
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Válaszd ki, milyen árut szállítson a repülõgép
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}A repülõgép átalakítása a kijelölt áru szállítására
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Átalakítás, hogy szállíthasson:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Új kapacitás: {GOLD}{STRING}{}{BLACK}Átalakítás költsége: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Új kapacitás: {GOLD}{STRING1}{}{BLACK}Átalakítás költsége: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nem alakíthatod át a repülõgépet...
 STR_A043_REFITTABLE                                             :(átalakítható)
 STR_GO_TO_AIRPORT_HANGAR                                        :Menj a {STATION} repülõtér hangárjába
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Részletek
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Jármûvek:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Állomások:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Elválasztó:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Elõtag:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Elõtag:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Euróra váltás: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Euróra váltás: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Euróra váltás: {ORANGE}soha
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Elõnézet: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}A saját pénznem paramétereinek megváltoztatása
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Ár: {GOLD}{CURRENCY}{BLACK} Súly: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Sebesség: {GOLD}{VELOCITY}{BLACK} Telj.: {GOLD}{COMMA} lóerõ
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Üzemeltetés: {GOLD}{CURRENCY}/év
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitás: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Kifejlesztve: {GOLD}{NUMU16}{BLACK} Élettartam: {GOLD}{COMMA} év
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitás: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Kifejlesztve: {GOLD}{NUM}{BLACK} Élettartam: {GOLD}{COMMA} év
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. üzemképesség: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Ár: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Súly: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Ár: {GOLD}{CURRENCY}{BLACK} Sebesség: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitás: {GOLD}{COMMA} utas, {COMMA} csomag levél
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Meghajtott vagonok: {GOLD}+{COMMA} lóerõ{BLACK} Súly: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Meghajtott vagonok: {GOLD}+{COMMA} lóerõ{BLACK} Súly: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/icelandic.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/icelandic.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Sléttlendi nauðsynlegt
 STR_0008_WAITING                                                :{BLACK}Bíður: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (á leið frá
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (á leið frá
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Tekur við: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Tekur við: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Kort - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Leikjastillingar
 STR_00B2_MESSAGE                                                :{YELLOW}Skilaboð
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Skilaboð frá {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Skilaboð frá {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Get ekki gert þetta....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Get ekki hreinsað þetta svæði....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Amerískt (mílur)
 STR_013A_METRIC_KILOMETERS                                      :Metrakerfið (kílómetrar)
-STR_013B_OWNED_BY                                               :{WHITE}...í eigu {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...í eigu {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Farmur
 STR_013D_INFORMATION                                            :{BLACK}Upplýsingar
 STR_013E_CAPACITIES                                             :{BLACK}Burðargeta
 STR_013E_TOTAL_CARGO                                            :{BLACK}Heildarfarmur
-STR_013F_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Farmur alls (burðargeta) þessarar lestar:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nýr leikur
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Stöðva leik
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Vista leik, hætta í leik, hætta
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Sýna lista yfir stöðvar fyrirtækis
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kostnaður við hreinsun: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kostnaður við hreinsun: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Enginn
-STR_01A7_OWNER                                                  :{BLACK}Eigandi: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Bæjaryfirvöld: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Eigandi: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Bæjaryfirvöld: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Enginn
 STR_01AA_NAME                                                   :{BLACK}Nafn
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Velja Leiðbeiningar/Sýnikennslu
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Tekið á móti: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Tekið á móti: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Tekið á móti: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Tekið á móti: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Tekið á móti: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Tekið á móti: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Lag{SETX 88}Titill
 STR_01E9_SHUFFLE                                                :{TINYFONT}Stokka
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Listar
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Lagalistar
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Laganúmer
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Listi - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Hreinsa
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Stillingar fyrir allar gerðir skilaboða (á/af/úrtak)
 STR_MESSAGE_SOUND                                               :{YELLOW}Spila hljóð með fréttaúrtaki
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...of langt frá fyrri stað
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Efstu fyrirtæki sem náðu {NUMU16}{}({STRING} stig)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Sambandstafla fyrirtækis í {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Efstu fyrirtæki sem náðu {NUM}{}({STRING} stig)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Sambandstafla fyrirtækis í {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Viðskiptamaður
 STR_0214_ENTREPRENEUR                                           :Athafnamaður
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Áhrifamaður
 STR_0218_MOGUL                                                  :Stórlax
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Viðskiptajöfur aldarinnar
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} öðlast '{STRING}' titil!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} úr {STRING} öðlast '{STRING}' titil!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} öðlast '{STRING}' titil!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} úr {COMPANY} öðlast '{STRING}' titil!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Velja stærð bæjar
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Stærð bæjar:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Sýna seinustu skilaboð eða fréttatilkynningu
 STR_OFF                                                         :Af
 STR_SUMMARY                                                     :Úrtak
 STR_FULL                                                        :Allt
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Bæjarmappa
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Hönnunarnöfn farartækja
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Nei
 STR_CONFIG_PATCHES_ON                                           :Já
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Sýna hraða farartækis í upplýsingaslá: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Leyfilegt að byggja í halla og á strönd: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Raunverulegri stærð svæðis sem stöðvar ná yfir: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Leyfa meiri eyðingu vega, brúa, gangna o.s.frv. í eigu bæjar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leyfa byggingu mjög langra lesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Raunveruleg hröðun lesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Banna lestum og skipum að taka 90°  beygjur: {ORANGE}{STRING} {LTBLUE} (þarfnast NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Sameina lestarstöðvar sem byggðar eru samsíða: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Yfirgefa stöð þegar einn farmur er fullfermdur, ef valið er 'fullferma': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Nota endurbættan algóriþma við hleðslu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Verðbólga: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aðeins afhlaða farmi á stöðvum þar sem er eftirspurn: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Leyfa byggingu mjög langra brúa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Skýli má vera á áætlun lesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Leyfa byggingu hráefnaframleiðsluiðnaðar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Leyfa marga svipaða iðnaði í sama bæ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Má byggja iðnaði af sömu gerð nálægt hvor öðrum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Sýna alltaf fulla dagsetningu í upplýsingaslá: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sýna umferðarljós akstursmegin: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Sýna fjármálaglugga í lok árs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch samhæfð meðhöndlun stansleysu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Bifreiðir fara í biðraðir (með stórvægilegum aukaverkunum): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Færa sjónarhorn þegar músin nálgast brún gluggans: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Leyfilegt að múta bæjaryfirvöldum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Lestar finna ný skýli: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Órétthyrndar lestarstöðvar leyfðar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nýr algrímur fyrir leiðarfund lesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nýtt heildar-leiðarkerfi (NPF, yfirtekur NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Sýna hraða farartækis í upplýsingaslá: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Leyfilegt að byggja í halla og á strönd: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Raunverulegri stærð svæðis sem stöðvar ná yfir: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Leyfa meiri eyðingu vega, brúa, gangna o.s.frv. í eigu bæjar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leyfa byggingu mjög langra lesta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Raunveruleg hröðun lesta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Banna lestum og skipum að taka 90°  beygjur: {ORANGE}{STRING1} {LTBLUE} (þarfnast NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Sameina lestarstöðvar sem byggðar eru samsíða: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Yfirgefa stöð þegar einn farmur er fullfermdur, ef valið er 'fullferma': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Nota endurbættan algóriþma við hleðslu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Verðbólga: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aðeins afhlaða farmi á stöðvum þar sem er eftirspurn: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Leyfa byggingu mjög langra brúa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Skýli má vera á áætlun lesta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Leyfa byggingu hráefnaframleiðsluiðnaðar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Leyfa marga svipaða iðnaði í sama bæ: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Má byggja iðnaði af sömu gerð nálægt hvor öðrum: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Sýna alltaf fulla dagsetningu í upplýsingaslá: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sýna umferðarljós akstursmegin: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Sýna fjármálaglugga í lok árs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch samhæfð meðhöndlun stansleysu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Bifreiðir fara í biðraðir (með stórvægilegum aukaverkunum): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Færa sjónarhorn þegar músin nálgast brún gluggans: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Leyfilegt að múta bæjaryfirvöldum: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Lestar finna ný skýli: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Órétthyrndar lestarstöðvar leyfðar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nýr algrímur fyrir leiðarfund lesta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nýtt heildar-leiðarkerfi (NPF, yfirtekur NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltaf leyfa litla flugvelli: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltaf leyfa litla flugvelli: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Lest týnist ef hún er aðgerðalaus í: {ORANGE}{STRING} daga
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Lest týnist ef hún er aðgerðalaus í: {ORANGE}{STRING1} daga
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Lest týnist ef hún er aðgerðalaus í: {ORANGE}óvirkt
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Endurskoða skipanir farartækis: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Endurskoða skipanir farartækis: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nei
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :já, en útiloka kyrrstæð farartæki
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :allra farartækja
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Gera viðvart ef lest skilar tapi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Farartæki úreldast aldrei: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Gera viðvart ef lest skilar tapi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Farartæki úreldast aldrei: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Uppfæra faratæki sjálfvirkt þegar það eldist
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Uppfæra farartæki sjálfkrafa {ORANGE}{STRING}{LTBLUE} mánuðum fyrir/eftir hámarksaldur þess
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Lægsta upphæð peninga sem þörf er á fyrir sjálfvirka uppfæringu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Birtingartími villuskilaboða: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Sýna íbúafjölda í bæjarmerki: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Ósýnileg tré (með gagnsæjum byggingum): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Hæð snjólínu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Dreyfing stöðva mest: {ORANGE}{STRING} {RED}Ath.: Há stilling hægir á leiknum
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Skoða þyrlur sjálfvirkt á þyrlupalli: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Lestir á leikmann mest: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Bifreiðir á leikmann mest: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Flugvélar á leikmann mest: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Skip á leikmann mest: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Uppfæra farartæki sjálfkrafa {ORANGE}{STRING1}{LTBLUE} mánuðum fyrir/eftir hámarksaldur þess
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Lægsta upphæð peninga sem þörf er á fyrir sjálfvirka uppfæringu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Birtingartími villuskilaboða: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Sýna íbúafjölda í bæjarmerki: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Ósýnileg tré (með gagnsæjum byggingum): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Hæð snjólínu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Dreyfing stöðva mest: {ORANGE}{STRING1} {RED}Ath.: Há stilling hægir á leiknum
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Skoða þyrlur sjálfvirkt á þyrlupalli: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Útiloka lestir fyrir tölvu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Útiloka bifreiðir fyrir tölvu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Útiloka flugvélar fyrir tölvu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Útiloka skip fyrir tölvu: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Lestir á leikmann mest: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Bifreiðir á leikmann mest: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Flugvélar á leikmann mest: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Skip á leikmann mest: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Virkja nýja gervigreind (alfa): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Útiloka lestir fyrir tölvu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Útiloka bifreiðir fyrir tölvu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Útiloka flugvélar fyrir tölvu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Útiloka skip fyrir tölvu: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Bið milli skoðana á lestum: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Virkja nýja gervigreind (alfa): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Bið milli skoðana á lestum: {ORANGE}{STRING1} dagar/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Bið milli skoðana á lestum: {ORANGE}óvirkt
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Bið milli skoðana á bílum: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Bið milli skoðana á bílum: {ORANGE}{STRING1} dagar/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Bið milli skoðana á bílum: {ORANGE}óvrikt
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Bið milli skoðana á flugvélum: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Bið milli skoðana á flugvélum: {ORANGE}{STRING1} dagar/%
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Bið milli skoðana á flugvélum: {ORANGE}óvrikt
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Bið milli skoðana á skipum: {ORANGE}{STRING} dagar/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Bið milli skoðana á skipum: {ORANGE}{STRING1} dagar/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Bið milli skoðana á skipum: {ORANGE}óvirkt
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Hætta skoðunum þegar bilanir eru afvirktar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Hætta skoðunum þegar bilanir eru afvirktar: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Fréttir birtast í lit: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Upphafsár: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Enda leik árið: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Fréttir birtast í lit: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Upphafsár: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Enda leik árið: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Virkja jafnan efnahag (fleiri og minni breytingar)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Leyfa hlutabréfakaup í öðrum fyrirtækjum
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Þegar dregið er, setja skilti á: {ORANGE}{STRING} hvern reit
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Leyfa sjálfvirka staðsetningu pbs lestarljósa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Staðsetning tækjasláar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Þegar dregið er, setja skilti á: {ORANGE}{STRING1} hvern reit
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Leyfa sjálfvirka staðsetningu pbs lestarljósa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Staðsetning tækjasláar: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Vinstri
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Miðjað
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Hægri
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Gluggar smella saman við: {ORANGE}{STRING} punkta radíus
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Gluggar smella saman við: {ORANGE}{STRING1} punkta radíus
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Gluggar smella: {ORANGE}ekki saman
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Viðmót
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Mótherji
 
 STR_CONFIG_PATCHES_DISABLED                                     :óvirkt
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Breyta gildi stillingar
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Aðvörun! Þú ert í þann mund að svíkja keppinauta þína. Hafðu í huga að þess lags svívirðing mun ætíð höfð í minnum.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Auka pening um {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spila sem leikmaður: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Töfrajarðýta (eyða iðnaði og óeyðanlegu): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Göng mega skerast: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggja í bið: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Töfrajarðýta (eyða iðnaði og óeyðanlegu): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Göng mega skerast: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggja í bið: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Þotur brotlenda ekki (oft) á litlum flugvöllum: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Skipta um loftslag: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Breyta dagsetningu: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Leyfa breytingar á verðmæti framleiðslu: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Leyfa breytingar á verðmæti framleiðslu: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Á leiðinni til {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Á leiðinni til {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... bauja í notkun!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Hnit: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Hnit: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Get ekki fjarlægt hluta af stöð...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Get ekki breytt lestarteini...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Grafa Sykurnámu
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Iðnaðir
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% flutt)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% flutt)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% flutt)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% flutt)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...of nálægt öðrum iðnaði
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Breyta lest svo hún flytji annan farm
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Breyta)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Breyta lest
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu hvernig farm lestin á að flytja
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Breyta lest svo hún flytji valinn farm
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Get ekki breytt lest...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Bil milli skoðana er í hundraðshlutum: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Bil milli skoðana er í hundraðshlutum: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Breyta framleiðslu
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Velkomin/n í nýju gervigreindina, verk í vinnslu. Þú mátt búast við vandamálum, og þegar þau koma upp skaltu taktu skjámynd þegar og senda á spjallborðið. Njóttu!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Landslag:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Stærð:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Útgáfa þjóns:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Veffang þjóns:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Veffang þjóns:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Upphafsdagsetning:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Núverandi dagsetning:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Varið með lykilorði!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}UPPLÝSINGAR UM FYRIRTÆKI
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nafn fyrirtækis:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Upphaf:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Upphaf:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Heildarverðmæti fyrirtækis:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Núverandi staða:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Innkoma síðasta árs:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Frammistaða:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Frammistaða:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Farartæki:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stöðvar:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Farartæki:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stöðvar:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Leikmenn:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Tengist...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Næ í upplýsingar um leik..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Næ í upplýsingar um fyrirtæki..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} þjónar fyrir framan þig
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kílóbæti niðurhöluð hingaðtil
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} þjónar fyrir framan þig
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kílóbæti niðurhöluð hingaðtil
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Aftengjast
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Gat ekki hlaðið vistuðum leik af þjóni.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Gat ekki ræst þjón
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Gat ekki tengst
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tenging #{NUMU16} fjaraði út.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tenging #{NUM} fjaraði út.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Villa varð í samskiptum og tengingu var lokað
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Útgáfa biðils er ekki sama og útgáfa þjóns
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Rangt lykilorð
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Lengd korts: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Breidd korts: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Lengd korts: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Breidd korts: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kostnaður: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Bæir
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Verður að eyða byggingu fyrst
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Íbúafjöldi: {ORANGE}{COMMA}{BLACK}  Hús: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Sýna upplýsingar um bæjaryfirvöld
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Bæjaryfirvöld {TOWN}
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Einkunnir flutningsfyrirtækis:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Samstarfssamningar
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Samstarfssamningar í boði fyrir eftirfarandi þjónustur:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} frá {STRING} til {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} frá {STRING2} til {STRING2}
 STR_2028_BY                                                     :{YELLOW} (til {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Enginn
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Samningar þegar í gildi:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} frá {STATION} til {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} frá {STATION} til {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, þangað til {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tilboð til samstarfssamnings runnið út:{}{}{STRING} frá {STRING} til {STRING} mun ekki vera samningsbundið.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tilboð til samstarfssamnings runnið út:{}{}{STRING} frá {STRING2} til {STRING2} mun ekki vera samningsbundið.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Samsarfssamningur gerður ógildur:{}{} {STRING}flutningur frá {STATION} til {STATION} er ekki lengur samningsbundinn.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nýtt tilboð til samstarfssamnings: {}{}Fyrsti {STRING}flutningur frá {STRING} til {STRING} mun stofna til eins árs samstarfssamnings við bæjaryfirvöld!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {STRING}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga 50% aukalega í heilt ár!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {STRING}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga tvöfalt í heilt ár!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {STRING}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga þrefalt í heilt ár!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {STRING}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga fjórfalt í heilt ár!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nýtt tilboð til samstarfssamnings: {}{}Fyrsti {STRING}flutningur frá {STRING2} til {STRING2} mun stofna til eins árs samstarfssamnings við bæjaryfirvöld!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {COMPANY}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga 50% aukalega í heilt ár!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {COMPANY}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga tvöfalt í heilt ár!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {COMPANY}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga þrefalt í heilt ár!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Samstarfssamningur gerður við {COMPANY}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga fjórfalt í heilt ár!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}Bæjaryfirvöld {TOWN} leyfa ekki byggingu annars flugvallar nærliggjandi bænum
 STR_2036_COTTAGES                                               :Einbýlishús
 STR_2037_HOUSES                                                 :Hús
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Kosta byggingu verslunarhúsnæðis í bænum.{}  Kostnaður: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kaupa 1 árs flutningsrétt í þessum bæ. Bæjaryfirvöld munu aðeins leyfa notkun á þínum flutningsleiðum.{} Kostnaður: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Múta bæjaryfirvöldum til að auka við fylgi þitt, með hættu á þungri refsingu komist það upp.{}  Kostnaður: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Glundroði í umferð {TOWN}!{}{}Uppbygging vega kostuð af {STRING} veldur 6 mánaða vesæld meðal ökumanna!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Glundroði í umferð {TOWN}!{}{}Uppbygging vega kostuð af {COMPANY} veldur 6 mánaða vesæld meðal ökumanna!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (í byggingu)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...óhentugur staður
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Ekki hægt að gróðursetja tré hér...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...of mörg skilti
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Ekki hægt að setja tré hér...
 STR_280A_SIGN                                                   :Skilti
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Of margar strætisvagnastöðvar
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Of margar vörubílastöðvar
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Of nálægt annarri stöð/lestunarsvæði
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Þarf fyrst að rífa lestarstöð
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Of nálægt öðrum flugvelli
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Þarf fyrst að rífa flugvöll
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Of nálægt annarri póstvagnsstöð
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Verður að eyða strætisvagnastöðinni fyrst
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Verður að eyða póstvagnsstöðinni fyrst
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stöðvar
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stöðvar
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ekkert -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...óhentug staðsetning
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Of nálægt annarri höfn
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Stórborgarvöllur
 STR_305AB_LARGE                                                 :{BLACK}Alþjóðavöllur
 STR_305B_SIZE                                                   :{BLACK}Stærð
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Lestarstöð
 STR_305F_AIRCRAFT_HANGAR                                        :Flugskýli
 STR_3060_AIRPORT                                                :Flugvöllur
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Opna leik
 STR_4002_SAVE                                                   :{BLACK}Vista
 STR_4003_DELETE                                                 :{BLACK}Eyða
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabæti laus
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Get ekki lesið af drifi
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Vistun leiks mistókst
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Framleiðsla síðasta mánaðar:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% flutt)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% flutt)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Miðja aðalsjónarhorn á iðnað
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ný {STRING} í byggingu við {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ný {STRING} er að rísa við {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Ónefnt{SKIP}
+STR_SV_UNNAMED                                                  :Ónefnt
 STR_SV_TRAIN_NAME                                               :Lest {COMMA}
 STR_SV_ROADVEH_NAME                                             :Bifreið {COMMA}
 STR_SV_SHIP_NAME                                                :Skip {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Flugvél {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Norður
-STR_SV_STNAME_SOUTH                                             :{STRING} Suður
-STR_SV_STNAME_EAST                                              :{STRING} Austur
-STR_SV_STNAME_WEST                                              :{STRING} Vestur
-STR_SV_STNAME_CENTRAL                                           :{STRING} Miðstöð
-STR_SV_STNAME_TRANSFER                                          :{STRING} Flutningur
-STR_SV_STNAME_HALT                                              :{STRING} Stans
-STR_SV_STNAME_VALLEY                                            :{STRING} Dalir
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Hæðir
-STR_SV_STNAME_WOODS                                             :{STRING} Skógar
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Lækjarbakki
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Skipti
-STR_SV_STNAME_AIRPORT                                           :{STRING} Flugvöllur
-STR_SV_STNAME_OILFIELD                                          :{STRING} Olíulendi
-STR_SV_STNAME_MINES                                             :{STRING} Náma
-STR_SV_STNAME_DOCKS                                             :{STRING} Höfn
-STR_SV_STNAME_BUOY_1                                            :{STRING} Bauja 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Bauja 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Bauja 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Bauja 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Bauja 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Bauja 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Bauja 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Bauja 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Bauja 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annáll
-STR_SV_STNAME_SIDINGS                                           :{STRING} Hliðrun
-STR_SV_STNAME_BRANCH                                            :{STRING} Grein
-STR_SV_STNAME_UPPER                                             :Efri {STRING}
-STR_SV_STNAME_LOWER                                             :Neðri {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Þyrlupallur
-STR_SV_STNAME_FOREST                                            :{STRING} Skógur
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Norður
+STR_SV_STNAME_SOUTH                                             :{STRING1} Suður
+STR_SV_STNAME_EAST                                              :{STRING1} Austur
+STR_SV_STNAME_WEST                                              :{STRING1} Vestur
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Miðstöð
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Flutningur
+STR_SV_STNAME_HALT                                              :{STRING1} Stans
+STR_SV_STNAME_VALLEY                                            :{STRING1} Dalir
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Hæðir
+STR_SV_STNAME_WOODS                                             :{STRING1} Skógar
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Lækjarbakki
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Skipti
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Flugvöllur
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Olíulendi
+STR_SV_STNAME_MINES                                             :{STRING1} Náma
+STR_SV_STNAME_DOCKS                                             :{STRING1} Höfn
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Bauja 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Bauja 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Bauja 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Bauja 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Bauja 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Bauja 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Bauja 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Bauja 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Bauja 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annáll
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Hliðrun
+STR_SV_STNAME_BRANCH                                            :{STRING1} Grein
+STR_SV_STNAME_UPPER                                             :Efri {STRING1}
+STR_SV_STNAME_LOWER                                             :Neðri {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Þyrlupallur
+STR_SV_STNAME_FOREST                                            :{STRING1} Skógur
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Leikmaður {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nýtt Andlit
 STR_7005_COLOR_SCHEME                                           :{BLACK}Litaskema
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nafn forstöðumanns
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Ekki hægt að breyta nafni fyrirtækis...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Ekki hægt að breyta nafni forstöðumanns...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Fjármál {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Fjármál {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Útgjöld/Tekjur
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Bygging
 STR_7012_NEW_VEHICLES                                           :{GOLD}Ný Farartæki
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Rekstrarkostnaður lesta
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Summa:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Tekjulínurit
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Smelltu á litinn sem þú vilt
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Auka lán
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Borga til baka hluta af láni
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
-STR_7038_INAUGURATED                                            :{GOLD}Hafið: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
+STR_7038_INAUGURATED                                            :{GOLD}Hafið: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Farartæki:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} lest
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} lestir
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Einkunn fyrirtækis (hámarkseinkunn=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Fyrirtækisvirði
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Fyrirtækjalisti
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Flutningsfyrirtæki í vandræðum!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} mun vera selt eða skráð gjaldþrota nema það fari að taka sig á sem fyrst!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Forstöðumaður)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} mun vera selt eða skráð gjaldþrota nema það fari að taka sig á sem fyrst!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Forstöðumaður)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Samruni flutningsfyrirtækja!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} hefur verið selt {STRING} fyrir {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Við erum að leita að flutningsfyrirtæki til að taka yfir okkar rekstri.{}{}Viltu kaupa {STRING} fyrir {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} hefur verið selt {COMPANY} fyrir {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Við erum að leita að flutningsfyrirtæki til að taka yfir okkar rekstri.{}{}Viltu kaupa {COMPANY} fyrir {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Gjaldþrota!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} hefur verið lokað af bankanum og allar eignir seldar!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} hefur verið lokað af bankanum og allar eignir seldar!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nýtt flutningsfyrirtæki stofnað!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} hefur byggingu nálægt {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} hefur byggingu nálægt {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Get ekki keypt fyrirtæki...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Farmgjöld
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dagar í flutningi
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Selja 25% hlut í þessu fyrirtæki
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Get ekki keypt 25% hlut í þessu fyrirtæki...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Get ekki selt 25% hlut í þessu fyrirtæki...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% í eigu {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% í eigu {STRING}{}   {COMMA}% í eigu {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} hefur verið yfirtekið af {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% í eigu {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% í eigu {COMPANY}{}   {COMMA}% í eigu {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} hefur verið yfirtekið af {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Lestar Bygging
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta lest kemur við á {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Upplýsingar)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Upplýsingar)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Lest fyrir
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Fer til {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Fer til {STATION} (Yfirfæra og ferma)
 STR_8808_GO_TO_UNLOAD                                           :Fer til {STATION} (Afferma)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Upplýsingar
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Lestin er of löng
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Aðeins er hægt að eiga við lestir þegar þær bíða í skýli
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Lestir
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Lestir
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nýir lestarvagnar
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nýir einteingungsvagnar
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nýir segullestarvagnar
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Fara að
 STR_8827_FULL_LOAD                                              :{BLACK}Fullferma
 STR_8828_UNLOAD                                                 :{BLACK} Afferma
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Skipanir)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Skipanir)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Endi skipana - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Skoðun
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Get ekki byggt lest...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Framleitt: {LTBLUE}{NUMU16}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Framleitt: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Virði: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Fermandi / Affermandi
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Lest þarf að vera stöðvuð í skýli
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Get ekki sent lest í skýli...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ný {STRING} er nú fáanleg!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {CURRENCY} Þyngd: {COMMA}tonn{}Hraði: {VELOCITY}  Hestöfl: {COMMA}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {CURRENCY} Þyngd: {COMMA}tonn{}Hraði: {VELOCITY}  Hestöfl: {COMMA}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Bilaður
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING2}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Þyngd: {LTBLUE}{COMMA}t  {BLACK}Hestöfl: {LTBLUE}{COMMA}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður á þessu ári: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Bíll fyrir
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Bílar
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Bílar
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Bílastöð
 STR_9004_NEW_VEHICLES                                           :{BLACK}Ný Farartæki
 STR_9005_INFORMATION                                            :{BLACK}Upplýsingar
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Byggja bíl
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Get ekki byggt bíl...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Verður að bygga bílastöð fyrst
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Skipanir)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Upplýsingar)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Upplýsingar)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING2}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
 STR_900E_MAX_SPEED                                              :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður á þessu ári: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggður: {LTBLUE}{NUMU16}{BLACK} Virði: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggður: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...verður að stöðvast í bifreiðaskýli
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Get ekki selt bifreið...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Get ekki stöðvað/ræst bifreið...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Smíða valda bifreið
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Ný bifreið fáanleg!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Verð: {CURRENCY}{}Hraði: {VELOCITY}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Verð: {CURRENCY}{}Hraði: {VELOCITY}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nefna bifreið
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Get ekki nefnt bifreið...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Get ekki byggt höfn hér...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Slippur
 STR_9804_NEW_SHIPS                                              :{BLACK}Ný skip
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skip
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Skip
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Get ekki smíðað skip..
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Verður að smíða skip í slippnum fyrst
 STR_9808_NEW_SHIPS                                              :{WHITE}Ný skip
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Get ekki selt skip...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Get ekki smíðað skip...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Skip er fyrir
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Skipanir)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Upplýsingar)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}á ári
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Upplýsingar)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING2}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}á ári
 STR_9813_MAX_SPEED                                              :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tekjur þessa árs: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu skoðun: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðað: {LTBLUE}{NUMU16}{BLACK} Verðmæti: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðað: {LTBLUE}{NUM}{BLACK} Verðmæti: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Get ekki stöðvað/ræst skip...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Get ekki sent skip í skýli...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Finnur ekkert nálægt skýli
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Sýna nánari upplýsingar um skip
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nýtt skip fáanlegt!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {STRING}{}Rekstrarkostnaður: {CURRENCY}á ári
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {STRING1}{}Rekstrarkostnaður: {CURRENCY}á ári
 STR_982F_NAME_SHIP                                              :{BLACK}Nefna skip
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nefna skip
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Endurnefna skipategund
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Get ekki endurnefnt skipategund...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Breyta vöruflutningaskipum svo þau flytji annan farm
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Breyta)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Breyta)
 STR_983C_REFIT_SHIP                                             :{BLACK}Breyta skipi
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu hvernig farm skipið á að flytja
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Breyta skipi svo það flytji valinn farm
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem á að flytja:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ný burðargeta: {GOLD}{STRING}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ný burðargeta: {GOLD}{STRING1}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Get ekki breytt skipi...
 STR_9842_REFITTABLE                                             :(breytanlegt)
 STR_GO_TO_SHIP_DEPOT                                            :Fara í {TOWN} Skipaskýli
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Ný flugvél
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Smíða flugvél
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Get ekki smíðað flugvél...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Flugvél
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Skipanir)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Upplýsingar)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}á ári
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Flugvél
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Skipanir)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Upplýsingar)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING2}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}á ári
 STR_A00E_MAX_SPEED                                              :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður í ár: {LTBLUE}{CURRENCY}  (í fyrra: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA}%  {BLACK}Bilanir frá síðustu skoðun: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðuð: {LTBLUE}{NUMU16}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Smíðuð: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Get ekki sent flugvél í flugskýli...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Stefnir á {STATION} flugskýli
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Stefnir á {STATION} flugskýli, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Get ekki stöðvað/ræst flugvél...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}flugvélin er á flugi
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Verður að byggja flugvöll fyrst
-STR_A019_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Flugvélin verður að vera stöðvuð í flugskýli
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Get ekki selt flugvélina...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Flugvallarframkvæmdir
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Endurnefna tegund flugvélar
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Get ekki endurnefnt tegund flugvélarinnar...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Breyta flugvél svo hún flytji annan farm
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Breya)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Breya)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Breyta flugvél
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu farm sem flugvél á að flytja
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Breyta flugvél svo hún flytji valinn farm
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem á að flytja:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ný burðargeta: {GOLD}{STRING}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ný burðargeta: {GOLD}{STRING1}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Get ekki breytt flugvél...
 STR_A043_REFITTABLE                                             :(breytanleg)
 STR_GO_TO_AIRPORT_HANGAR                                        :Fara í {STATION} flugskýli
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Upplýsingar
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Farartæki:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stöðvar:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Aðskilnaðarmerki:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Forskeyti:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Viðskeyti:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Skipta í Evrur: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Skipta í Evrur: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Skipta í Evrur: {ORANGE}aldrei
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Sýnishorn: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Breyta sérvöldum gjaldeyri
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{COMMA}tonn
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hámarkshraði: {GOLD}{VELOCITY}{BLACK}   Hestöfl: {GOLD}{COMMA}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Rekstrarkostnaður: {GOLD}{CURRENCY} á ári
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Burðargeta: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Hönnun: {GOLD}{NUMU16}{BLACK} Endingartími: {GOLD}{COMMA} ár
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Burðargeta: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Hönnun: {GOLD}{NUM}{BLACK} Endingartími: {GOLD}{COMMA} ár
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Hámarks áreiðanleiki: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Verð: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Þyngd: {GOLD}{COMMA}tonn  ({COMMA}tonn)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Hámarkshraði: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Burðargeta: {GOLD}{COMMA} farþegar, {COMMA} pokar af pósti
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Drifvagnar: {GOLD}+{COMMA} hestöfl{BLACK} Þyngd: {GOLD}+{COMMA} tonn
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Drifvagnar: {GOLD}+{COMMA} hestöfl{BLACK} Þyngd: {GOLD}+{COMMA} tonn
\ No newline at end of file
--- a/lang/italian.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/italian.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Richiesto terreno piano
 STR_0008_WAITING                                                :{BLACK}In attesa: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (in viaggio da
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (in viaggio da
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accettati: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accettati: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mappa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opzioni di gioco
 STR_00B2_MESSAGE                                                :{YELLOW}Messaggio
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Messaggio da {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Messaggio da {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Non puoi fare questo....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Non puoi ripulire l'area....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright Originale{COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperiale (miglia)
 STR_013A_METRIC_KILOMETERS                                      :Metrico (kilometri)
-STR_013B_OWNED_BY                                               :{WHITE}...posseduto da {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...posseduto da {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Cargo
 STR_013D_INFORMATION                                            :{BLACK}Informazioni
 STR_013E_CAPACITIES                                             :{BLACK}Capienza
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carico totale
-STR_013F_CAPACITY                                               :{BLACK}Capacità: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacità: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carico totale (capacità) di questo treno:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nuovo Gioco
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pausa
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Salva partita, abandona la partita, esci
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra elenco delle stazioni delle società
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Costo per ripulirlo: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costo per ripulirlo: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Prioprietario: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autorità locale: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Prioprietario: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autorità locale: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Nessuno
 STR_01AA_NAME                                                   :{BLACK}Nome
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleziona Tutorial/Demonstrazione
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Merci accettate: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Merci accettate: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Merci accettate: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Merci accettate: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Merci accettate: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Merci accettate: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Brano{SETX 88}Titolo
 STR_01E9_SHUFFLE                                                :{TINYFONT}Casuale
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selezione programma musicale
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Indice brani
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Elimina
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Impostazione per tutti i tipi di messaggio (on/off/sommario)
 STR_MESSAGE_SOUND                                               :{YELLOW}Esegui un suono per i messaggi sommarizzati
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...troppo lontano dalla destinazione precedente
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Le maggiori compagnie che hanno raggiunto il livello {NUMU16}{}({STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Classifica società  del{NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Le maggiori compagnie che hanno raggiunto il livello {NUM}{}({STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Classifica società  del{NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Uomo d'affari
 STR_0214_ENTREPRENEUR                                           :Imprenditore
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate del secolo
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} raggiunge lo stato '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} di {STRING} raggiunge lo stato '{STRING}'!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} raggiunge lo stato '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} di {COMPANY} raggiunge lo stato '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Seleziona dimensione città
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Dimensione città:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Mostra ultimo messaggio o un report
 STR_OFF                                                         :Off
 STR_SUMMARY                                                     :Sommario
 STR_FULL                                                        :Completo
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Elenco Città
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nomi veicoli
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :No
 STR_CONFIG_PATCHES_ON                                           :Si
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostra velocità veicoli sulla barra di stato: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Consenti la costruzione sulle coste/pendii: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permetti aree di carico/scarico più realistiche: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Consenti la rimozione industrie, strade speciali, ecc.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Consenti la costruzione di treni molto lunghi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Abilita accelerazione realistica per i treni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Impedisci ai treni e alle navi di fare curve di 90 gradi: {ORANGE}{STRING} {LTBLUE} (Richiede NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Unisci stazioni ferroviarie quando sono vicine: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Lascia stazione quanto uno dei tipi di merce è a pieno carico: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usa l'algoritmo di caricamento migliorato: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflazione: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Scarica le merci in una stazione solo se richieste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Consenti la costruzione di ponti molto lunghi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Consenti ordine Vai al Deposito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Consenti la costruzione di industrie produttrici di materia prima: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Consenti la costruzione di più industrie uguali per città: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Consenti la costruzione di industrie uguali anche se molto vicine: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostra sempre formato esteso della data nella barra di stato: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostra segnali sul lato guida: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostra finestra info finanziare alla fine di ogni anno: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Gestisci funzione 'non-stop' come TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Accoda veicoli stradali quando l'area di carico è occupata: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Scorri orizzontalmente la visuale se il mouse è agli angoli: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Consenti corruzione autorità locale: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nuovo sistema individuazione deposito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Stazioni non uniformi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nuovo algoritmo pathfinding dei treni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nuovo pathfinding globale (NPF, sovrascrive NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostra velocità veicoli sulla barra di stato: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Consenti la costruzione sulle coste/pendii: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permetti aree di carico/scarico più realistiche: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Consenti la rimozione industrie, strade speciali, ecc.: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Consenti la costruzione di treni molto lunghi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Abilita accelerazione realistica per i treni: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Impedisci ai treni e alle navi di fare curve di 90 gradi: {ORANGE}{STRING1} {LTBLUE} (Richiede NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Unisci stazioni ferroviarie quando sono vicine: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Lascia stazione quanto uno dei tipi di merce è a pieno carico: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usa l'algoritmo di caricamento migliorato: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflazione: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Scarica le merci in una stazione solo se richieste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Consenti la costruzione di ponti molto lunghi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Consenti ordine Vai al Deposito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Consenti la costruzione di industrie produttrici di materia prima: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Consenti la costruzione di più industrie uguali per città: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Consenti la costruzione di industrie uguali anche se molto vicine: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostra sempre formato esteso della data nella barra di stato: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostra segnali sul lato guida: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostra finestra info finanziare alla fine di ogni anno: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Gestisci funzione 'non-stop' come TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Accoda veicoli stradali quando l'area di carico è occupata: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Scorri orizzontalmente la visuale se il mouse è agli angoli: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Consenti corruzione autorità locale: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nuovo sistema individuazione deposito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Stazioni non uniformi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nuovo algoritmo pathfinding dei treni: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nuovo pathfinding globale (NPF, sovrascrive NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Consenti la costruzione piccoli aeroporti: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Consenti la costruzione piccoli aeroporti: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un treno è ritenuto perso in assenza di progressi da: {ORANGE}{STRING} giorni
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un treno è ritenuto perso in assenza di progressi da: {ORANGE}{STRING1} giorni
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Un treno è ritenuto perso in assenza di progressi da: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Controlla gli ordini dei veicoli: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Controlla gli ordini dei veicoli: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :disabilitato
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :escludi i veicoli fermi
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :per tutti i veicoli
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avvisa se i guadagni di un treno sono in negativo: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}I veicoli non invecchiano mai: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avvisa se i guadagni di un treno sono in negativo: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}I veicoli non invecchiano mai: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Rinnova un veicolo quando diventa datato
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Rinnova un veicolo quando è {ORANGE}{STRING}{LTBLUE} mesi fuori età massima
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Rinnova solo se disponibile il fondo minimo di: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Durata visualizzazione messaggio di errore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra la popolazione di un paese nell'etichetta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Alberi invisibili (se edifici trasparenti): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Dimensione limite delle nevi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Copertura max. stazione: {ORANGE}{STRING} {RED}Attenzione: Valori alti rallentano il gioco
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenzione elicotteri direttamente all’eliporto: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max treni per giocatore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max veicoli stradali per giocatore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aeroplani per giocatore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max navi per giocatore: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Rinnova un veicolo quando è {ORANGE}{STRING1}{LTBLUE} mesi fuori età massima
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Rinnova solo se disponibile il fondo minimo di: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Durata visualizzazione messaggio di errore: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra la popolazione di un paese nell'etichetta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Alberi invisibili (se edifici trasparenti): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Dimensione limite delle nevi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Copertura max. stazione: {ORANGE}{STRING1} {RED}Attenzione: Valori alti rallentano il gioco
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenzione elicotteri direttamente all’eliporto: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disabilita treni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disabilita veicoli stradali: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disabilita aerei: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disabilita navi: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max treni per giocatore: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max veicoli stradali per giocatore: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aeroplani per giocatore: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max navi per giocatore: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Abilita la nuova IA (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disabilita treni: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disabilita veicoli stradali: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disabilita aerei: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disabilita navi: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervallo di servizio predefinito per i treni: {ORANGE}{STRING} giorni
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Abilita la nuova IA (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervallo di servizio predefinito per i treni: {ORANGE}{STRING1} giorni
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervallo di servizio predefinito per i treni: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervallo di servizio predefinito per i veicoli stradali: {ORANGE}{STRING} giorni
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervallo di servizio predefinito per i veicoli stradali: {ORANGE}{STRING1} giorni
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Intervallo di servizio predefinito per i veicoli stradali: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervallo di servizio predefinito per gli aerei: {ORANGE}{STRING} giorni
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervallo di servizio predefinito per gli aerei: {ORANGE}{STRING1} giorni
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Intervallo di servizio predefinito per gli aerei: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervallo di servizio predefinito per le navi: {ORANGE}{STRING} giorni
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervallo di servizio predefinito per le navi: {ORANGE}{STRING1} giorni
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervallo di servizio predefinito per le navi: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disabilità servicing quando i guasti sono "nessuno": {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disabilità servicing quando i guasti sono "nessuno": {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Notizie colorate pubblicate dal: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data di inizio: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Concludi il gioco il: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Notizie colorate pubblicate dal: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data di inizio: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Concludi il gioco il: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Abilita nuova economia stabile (diverse piccole modifiche)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permetti l'acquisto di azioni da altre compagnie
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Trascinando il cursore costruisci i semafori ogni: {ORANGE}{STRING} quadrato/i
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permetti la disposizione automatica dei segnali pbs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posizione barra degli strumenti principale: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Trascinando il cursore costruisci i semafori ogni: {ORANGE}{STRING1} quadrato/i
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permetti la disposizione automatica dei segnali pbs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posizione barra degli strumenti principale: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Sinistra
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centro
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Destra
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Raggio di snap delle finestre: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Raggio di snap delle finestre: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Raggio di snap delle finestre: {ORANGE}disabilitato
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfaccia
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Avversari
 
 STR_CONFIG_PATCHES_DISABLED                                     :disabilitato
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Cambia valori impostazioni
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Attenzione! Stai per denunciare i tuoi avversari. Ricordati che un così grande disonore verrà ricordato per l’eternità.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumenta soldi di {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Gioca come giocatore: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer magico (rimuove industrie e altri): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}I tunnel possono incrociarsi tra loro: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Consenti costruzione quando in pausa: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer magico (rimuove industrie e altri): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}I tunnel possono incrociarsi tra loro: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Consenti costruzione quando in pausa: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}I jet non si schiantano troppo di frequente nei piccoli aeroporti: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Cambia paesaggio: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Cambia data: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permetti la modifica dei valori di produzione: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permetti la modifica dei valori di produzione: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Direzione {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Direzione {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...la boa è in uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinate: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordinate: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Impossibile rimuovere una porzione di stazione...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Impossibile convertire il tipo di rotaie...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Costruisci Raffineria di Zucchero
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrie
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% trasportato)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% trasportate)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% trasportato)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% trasportate)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...troppo vicina ad un’altra industria.
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Riadatta il treno per trasportare un differente tipo di carico
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Riadatta)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Riadatta treno
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleziona tipo di carico per il treno
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Riadatta il treno per trasportare il tipo di carico selezionato
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Impossibile riadattare il treno...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Gli intervalli di servizio sono in percentuale: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Gli intervalli di servizio sono in percentuale: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambia produzione
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Benvenuto nella nuova IA, in sviluppo. Puoi aspettarti dei problemi. Quando succede, fai uno screenshot e invialo sul forum. Divertiti!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Dimens:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versione server:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Indirizzo del server:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Indirizzo del server:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data di inizio:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data corrente:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protetto da password!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAZIONI COMPAGNIA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome compagnia:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaugurazione:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaugurazione:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valore compagnia:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Bilancio corrente:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Entrate dell'ultimo anno:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veicoli:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stazioni:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Veicoli:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stazioni:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Giocatori:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connessione in corso...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Ricezione informazioni gioco..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Ricezione informazioni compagnia..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} clients in attesa
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes scaricati fin'ora
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} clients in attesa
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes scaricati fin'ora
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnessione
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Impossibile caricare il savegame dal server.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Impossibile inizializzare il server
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Impossibile connettersi
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connessione #{NUMU16} time-out.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connessione #{NUM} time-out.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Un errore di protocollo ha chiuso la connessione
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La revision del client non è la stessa di quella del server
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Password Errata
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X della mappa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y della mappa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X della mappa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y della mappa: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Costo: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Città
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}E' necessario demolire l'edificio prima
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Popolazione: {ORANGE}{COMMA}{BLACK}  Case: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Mostra informazioni sull'autorità locale
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} autorità locale
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Valutazione servizi di trasporto delle società:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Sussidi
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Sussidi offerti per il servizio:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} da {STRING} a {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} da {STRING2} a {STRING2}
 STR_2028_BY                                                     :{YELLOW} (del {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Nessuno
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servizi già sussidiati:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} da {STATION} a {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} da {STATION} a {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, fino al {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offerta di sussidio scaduta:{}{}{STRING} da {STRING} a {STRING} non sarà più sovvenzionato.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offerta di sussidio scaduta:{}{}{STRING} da {STRING2} a {STRING2} non sarà più sovvenzionato.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Sussidio terminato:{}{}servizio di {STRING} da {STATION} a {STATION} non è più sovvenzionato.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Offerta di sussidio:{}{}Primo servizio di {STRING} da {STRING} a {STRING} riceverà un'anno di sussidio dall'autorità locale!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {STRING}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il 50% in più per il prossimo anno!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {STRING}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il doppio per il prossimo anno!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {STRING}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il triplo per il prossimo anno!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {STRING}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il quadruplo per il prossimo anno!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Offerta di sussidio:{}{}Primo servizio di {STRING} da {STRING2} a {STRING2} riceverà un'anno di sussidio dall'autorità locale!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {COMPANY}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il 50% in più per il prossimo anno!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {COMPANY}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il doppio per il prossimo anno!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {COMPANY}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il triplo per il prossimo anno!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Sussidio aggiudicato da {COMPANY}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il quadruplo per il prossimo anno!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}L'autorita locale di {TOWN} rifiuta la costruzione di un altro areoporto nella città
 STR_2036_COTTAGES                                               :Cottage
 STR_2037_HOUSES                                                 :Case
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finanzia la costruzione di nuove strutture commerciali nella città.{}  Costo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compra 1 anno di esclusiva sui trasporti nella città. Compra 1 anno di esclusiva sui diritti di trasporto in città. L'autorità cittadina autorizzerà passeggeri e merci a usare solo le tue stazioni.{} Costo: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompi l’autorità locale per incrementare la tua valutazione con il rischio di una severa multa se scoperto.{}  Costo: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffico nel caos a {TOWN}!{}{}La ricostruzione stradale finanziata da {STRING} porterà 6 mesi di disagio agli automobilisti!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffico nel caos a {TOWN}!{}{}La ricostruzione stradale finanziata da {COMPANY} porterà 6 mesi di disagio agli automobilisti!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (in costruzione)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...sito inadatto
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Non puoi piantare albero qui...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...troppi cartelli
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Non puoi piazzare un cartello qui...
 STR_280A_SIGN                                                   :Cartello
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Troppe fermate dell'autobus
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Troppe stazioni merci
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Troppo vicino ad un'altra stazione/Area di carico
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Devi demolire stazione ferroviaria prima
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Troppo vicino ad un altro aereoporto
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Devi demolire aereoporto prima
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Troppo vicina a un'altra stazione camion
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Devi demolire stazione bus prima
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Devi demolire stazione camion prima
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stazioni
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stazioni
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nulla -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...sito inadatto
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Troppo vicino a un'altro molo
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Aeroporto metropolitano
 STR_305AB_LARGE                                                 :{BLACK}Aeroporto internazionale
 STR_305B_SIZE                                                   :{BLACK}Dimensioni
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Stazione ferroviaria
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Aeroporto
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Carica partita
 STR_4002_SAVE                                                   :{BLACK}Salva
 STR_4003_DELETE                                                 :{BLACK}Elimina
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes liberi
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Impossibile leggere dal disco
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Salvataggio fallito
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produzione ultimo mese:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% trasportato)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% trasportato)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centra visule sull'industria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nuova {STRING} in costruzione vicino a {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nuova {STRING} è stata piantata vicino a {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Senza nome{SKIP}
+STR_SV_UNNAMED                                                  :Senza nome
 STR_SV_TRAIN_NAME                                               :Treno {COMMA}
 STR_SV_ROADVEH_NAME                                             :Veicolo Stradale {COMMA}
 STR_SV_SHIP_NAME                                                :Nave {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aereo {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nord
-STR_SV_STNAME_SOUTH                                             :{STRING} Sud
-STR_SV_STNAME_EAST                                              :{STRING} Est
-STR_SV_STNAME_WEST                                              :{STRING} Ovest
-STR_SV_STNAME_CENTRAL                                           :{STRING} Centrale
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :{STRING} Fermata
-STR_SV_STNAME_VALLEY                                            :{STRING} Valle
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Altura
-STR_SV_STNAME_WOODS                                             :{STRING} Bosco
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Lago
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Exchange
-STR_SV_STNAME_AIRPORT                                           :{STRING} Aereoporto
-STR_SV_STNAME_OILFIELD                                          :{STRING} Giacimento petrolifero
-STR_SV_STNAME_MINES                                             :{STRING} Miniere
-STR_SV_STNAME_DOCKS                                             :{STRING} Mol
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boa 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boa 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boa 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boa 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boa 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boa 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boa 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boa 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boa 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annexe
-STR_SV_STNAME_SIDINGS                                           :{STRING} Raccordo
-STR_SV_STNAME_BRANCH                                            :{STRING} Ramo
-STR_SV_STNAME_UPPER                                             :Alta {STRING}
-STR_SV_STNAME_LOWER                                             :Bassa {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliporto
-STR_SV_STNAME_FOREST                                            :{STRING} Foresta
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sud
+STR_SV_STNAME_EAST                                              :{STRING1} Est
+STR_SV_STNAME_WEST                                              :{STRING1} Ovest
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Centrale
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :{STRING1} Fermata
+STR_SV_STNAME_VALLEY                                            :{STRING1} Valle
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Altura
+STR_SV_STNAME_WOODS                                             :{STRING1} Bosco
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Lago
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Exchange
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Aereoporto
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Giacimento petrolifero
+STR_SV_STNAME_MINES                                             :{STRING1} Miniere
+STR_SV_STNAME_DOCKS                                             :{STRING1} Mol
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boa 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boa 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boa 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boa 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boa 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boa 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boa 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boa 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boa 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annexe
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Raccordo
+STR_SV_STNAME_BRANCH                                            :{STRING1} Ramo
+STR_SV_STNAME_UPPER                                             :Alta {STRING1}
+STR_SV_STNAME_LOWER                                             :Bassa {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliporto
+STR_SV_STNAME_FOREST                                            :{STRING1} Foresta
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Giocatore {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nuova Faccia
 STR_7005_COLOR_SCHEME                                           :{BLACK}Colore Società
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nome del presidente
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Non puoi cambiare il nome della società...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Non puoi cambiare in nome del presidente...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanze {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanze {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Spese/Ricavi
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Costruzioni
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nuovi Veicoli
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Consumi Treni
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Totale:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Grafico Incassi
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Fare clic per selezionare il nuovo colore
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Aumenta dimensioni del debito
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Ripaga parte del debito
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurata: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(President)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurata: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Veicoli:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} treno
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} treni
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Valutazione prestazioni società (Massima valutazione=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valore della società
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Classifica società
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Società di trasporti in difficolta!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} verrà venduta o dichiarerà bancarotta a meno che le prestazioni non miglioreranno presto!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Presidente)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} verrà venduta o dichiarerà bancarotta a meno che le prestazioni non miglioreranno presto!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Presidente)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fusione tra società di trasporti
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} è stata venduta a {STRING} per {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Stiamo cercando una società di trasporti per vendere la nostra società.{}{} Vorrebbe acquistare {STRING} per {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} è stata venduta a {COMPANY} per {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Stiamo cercando una società di trasporti per vendere la nostra società.{}{} Vorrebbe acquistare {COMPANY} per {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bancarotta!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} è stata chiusa dai creditori e tutti i suoi beni venduti!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} è stata chiusa dai creditori e tutti i suoi beni venduti!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Lanciata nuova società di trasporti!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} inizia a costruire vicino a {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} inizia a costruire vicino a {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Non puoi comprare la società...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Percentuale Pagamento Merce
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Giorni di viaggio
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendi il 25% delle azioni della società
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Non puoi comprare il 25% delle azioni della società...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Non puoi vendere il 25% delle azioni della società...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% posseduto da {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% posseduto da {STRING}{}   {COMMA}% posseduto da {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} è stata rilevata da {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% posseduto da {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% posseduto da {COMPANY}{}   {COMMA}% posseduto da {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} è stata rilevata da {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Questa compagnia non è abbastanza vecchia per compravendere azioni...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Deposito Treni
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Primo treno arrivato a {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Treno in mezzo
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Vai a {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Vai a {STATION} (Trasferisci e carica)
 STR_8808_GO_TO_UNLOAD                                           :Vai a {STATION} (Scarica)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informazioni
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Treno troppo lungo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Un treno può essere modificato solo quando è fermo nel deposito
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Treni
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Treni
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nuovo Veicolo Ferroviario
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nuovo  Veicolo Per Monorotaia
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nuovo Veicolo Per Maglev
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Vai a
 STR_8827_FULL_LOAD                                              :{BLACK}Carica
 STR_8828_UNLOAD                                                 :{BLACK}Scarica
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Orders)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fine degli Ordini - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Manutenzione
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Non puoi costruire veicolo ferroviario...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valore: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Carica / Scarica
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Il treno deve essere fermato nel deposito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Non puoi mandare treno al deposito...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Ignora l’ordine finché non sia necessaria la manutenzione
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nuova {STRING} ora disponibile!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Costo: {CURRENCY} Peso: {COMMA}t{}Velocità: {VELOCITY}  Potenza: {COMMA}hp{}Consumi: {CURRENCY}/anno{}Capienza: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Costo: {CURRENCY} Peso: {COMMA}t{}Velocità: {VELOCITY}  Potenza: {COMMA}hp{}Consumi: {CURRENCY}/anno{}Capienza: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Guasto!
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING2}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potenza: {LTBLUE}{COMMA}cv{BLACK} Velocità Max: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veicolo in mezzo
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Veicoli stradali
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Veicoli stradali
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Deposito Veicoli Stradali
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nuovo Veicolo Stradale
 STR_9005_INFORMATION                                            :{BLACK}Informazioni
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Costruisci Veicolo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Non puoi costruire veicolo...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Devi costruire un deposito prima
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordini)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Dettagli)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Dettagli)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING2}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_900E_MAX_SPEED                                              :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve essere fermo nel deposito
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Non puoi vendere veicolo
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Non puoi far fermare/avviare veicolo...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Costruisci veicolo stradale evidenziato
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nuovo veicolo stradale disponibile!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Costo: {CURRENCY}{}Velocità: {VELOCITY}{}Consumi: {CURRENCY}/anno{}Capienza: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Costo: {CURRENCY}{}Velocità: {VELOCITY}{}Consumi: {CURRENCY}/anno{}Capienza: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nome Veicolo
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Non puoi rinominare automezzo...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Non puoi costruire molo qui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Deposito Navale
 STR_9804_NEW_SHIPS                                              :{BLACK}Nuove Navi
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Navi
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Navi
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Non puoi costruire nave...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Devi costruire un deposito prima
 STR_9808_NEW_SHIPS                                              :{WHITE}Nuove Navi
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Non puoi vendere la nave...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Non puoi costruire nave...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Nave in mezzo
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordini)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Dettagli)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Dettagli)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING2}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_9813_MAX_SPEED                                              :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Non puoi far fermare/ripartire la nave...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Non puoi mandare nave al deposito...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Non riesce a trovare il deposito locale
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostra dettagli sulla nave
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nuova nave disponibile!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Costo: {CURRENCY} Velocità Max: {VELOCITY}{}Capienza: {STRING}{}Consumi: {CURRENCY}/anno
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Costo: {CURRENCY} Velocità Max: {VELOCITY}{}Capienza: {STRING1}{}Consumi: {CURRENCY}/anno
 STR_982F_NAME_SHIP                                              :{BLACK}Nome Nave
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nome Nave
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Rinomina tipo di nave
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Non puoi rinominare tipo di nave...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Converti nave mercantile per caricare un tipo di merce diversa
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Converti)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Converti)
 STR_983C_REFIT_SHIP                                             :{BLACK}Converti Nave
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleziona tipo di merce da caricare
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Converti la nave per trasportare tipo di merce evidenziata
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleziona tipo di merce da caricare:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuova Capienza: {GOLD}{STRING}{}{BLACK}Costo conversione: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuova Capienza: {GOLD}{STRING1}{}{BLACK}Costo conversione: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Non puoi convertire la nave...
 STR_9842_REFITTABLE                                             :(convertibile)
 STR_GO_TO_SHIP_DEPOT                                            :Vai a {TOWN} Deposito Navale
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nuovo Aereo
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construisci Aereo
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Non puoi costruire aereo
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aereo
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordini)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Dettagli)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aereo
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordini)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Dettagli)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Età: {LTBLUE}{STRING2}{BLACK}   Consumi: {LTBLUE}{CURRENCY}/anno
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY}  (anno scorso: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Affidabilità: {LTBLUE}{COMMA}%  {BLACK}Guasti dall'ultima manutenz.: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUMU16}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Non puoi mandare aereo nell'hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Direzione {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Direzione {STATION} Hangar, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Non puoi far fermare/ripartire aereo...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aereo in volo
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Costruisci aeroporto prima
-STR_A019_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capienza: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Dev'essere fermo nell'hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Non puoi vendere aereo...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Costruzioni areoportuali
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Rinomina tipo di aereo
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Non puoi rinominare tipo di aereo...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Converti aereo per trasportare un tipo di merce diversa
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Converti)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Converti)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Converti aereo
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleziona tipo di merce da caricare
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Converti aereo per trasportare tipo di merce evidenziata
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleziona il tipo di merce da caricare:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuova capacità: {GOLD}{STRING}{}{BLACK}Costo conversione: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuova capacità: {GOLD}{STRING1}{}{BLACK}Costo conversione: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Non puoi convertire aereo...
 STR_A043_REFITTABLE                                             :(convertibile)
 STR_GO_TO_AIRPORT_HANGAR                                        :Vai a {STATION} Hangar
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Dettagli
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Veicoli:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stazioni:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separatore:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefisso:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffisso:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Passa agli Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Passa agli Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Passa agli Euro: {ORANGE}mai
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Anteprima: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Cambia i parametri della valuta personalizzata
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocità: {GOLD}{VELOCITY}{BLACK}   Potenza: {GOLD}{COMMA}CV
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Costi d'esercizio: {GOLD}{CURRENCY}/anno
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capienza: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Progettato nel: {GOLD}{NUMU16}{BLACK} Vita: {GOLD}{COMMA} anni
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capienza: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Progettato nel: {GOLD}{NUM}{BLACK} Vita: {GOLD}{COMMA} anni
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Affidabilità: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Costo: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Velocità: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capienza: {GOLD}{COMMA} passeggeri, {COMMA} sacchi postali
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Potenza Vagone: {GOLD}+{COMMA}CV{BLACK} Peso: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Potenza Vagone: {GOLD}+{COMMA}CV{BLACK} Peso: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/latvian.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/latvian.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Zemei ja'bu't plakanai
 STR_0008_WAITING                                                :{BLACK}Gaidam: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (cel'a' no
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (cel'a' no
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Pien'em: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Pien'em: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Karte - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spe'les parametri
 STR_00B2_MESSAGE                                                :{YELLOW}Zin'ojums
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zin'ojums no {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zin'ojums no {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ta' nevar dari't....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}S'o laukumu nevar noli'dzina't....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Org'ìina'la's autortiesi'bas {COPYRIGHT} 1995 Chris Sawyer, Visas tiesi'bas rezerve'tas
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperia'la's (ju'dzes)
 STR_013A_METRIC_KILOMETERS                                      :Metriska's (kilometri)
-STR_013B_OWNED_BY                                               :{WHITE}...pieder {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...pieder {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Krava
 STR_013D_INFORMATION                                            :{BLACK}Informa'cija
 STR_013E_CAPACITIES                                             :{BLACK}Ietilpi'ba
 STR_013E_TOTAL_CARGO                                            :{BLACK}Krava kopa'
-STR_013F_CAPACITY                                               :{BLACK}Ietilpi'ba: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Ietilpi'ba: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kope'ja' vilciena kravas ietilpi'ba:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Jauna spe'le
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauze't spe'li
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Saglaba't spe'li, pamest spe'li, beigt
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Para'di't kompa'nijas staciju sarakstu
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Izmaksas noli'dzina's'anai: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Nav
-STR_01A7_OWNER                                                  :{BLACK}I'pas'nieks: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Viete'ja's varas iesta'des: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}I'pas'nieks: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Viete'ja's varas iesta'des: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Neviens/neviena
 STR_01AA_NAME                                                   :{BLACK}Va'rds
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Izve'le'ties ma'ci'bu/demonstra'ciju
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Pien'em kravu: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Pien'em kravu: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Pien'em kravu: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Pien'em kravu: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Pien'em kravu: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Pien'em kravu: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Treks{SETX 88}Nosaukums
 STR_01E9_SHUFFLE                                                :{TINYFONT}Sajaukt
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Mu'zikas programmas izve'le
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Treka indekss
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Dze'st
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Rez'i'ms visiem zin'ojumu tipiem (iesle'gts/izsle'gts/kopsavilkums)
 STR_MESSAGE_SOUND                                               :{YELLOW}Spe'le't skan'as effektu zin'u kopsavilkumiem
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...pa'ra'k ta'lu no ieprieks'e'ja' gala punkta
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Laba'ka's kompa'nijas, kas sasniegus'as{NUMU16}{}({STRING} Level)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Kompa'niju li'gu tabula {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Laba'ka's kompa'nijas, kas sasniegus'as{NUM}{}({STRING} Level)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Kompa'niju li'gu tabula {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Biznesmens
 STR_0214_ENTREPRENEUR                                           :Uzn'e'me'js
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magna'ts
 STR_0218_MOGUL                                                  :Moguls
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Gadsimta supervecis
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} sasniegus'i  '{STRING}' statusu!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} no {STRING} sasniegusi '{STRING}' statusu!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} sasniegus'i  '{STRING}' statusu!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} no {COMPANY} sasniegusi '{STRING}' statusu!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Nora'di't pilse'tas izme'rus
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Pilse'tas izme'ri:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Para'di't pe'de'jo zin'ojumu
 STR_OFF                                                         :Nav
 STR_SUMMARY                                                     :Kopsavilkums
 STR_FULL                                                        :Pilns
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Pilse'tu saraksts
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Transporta li'dzekl'u dizaina nosaukumi
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Off
 STR_CONFIG_PATCHES_ON                                           :On
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Show vehicle speed in status bar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Allow removal of more town-owned roads, bridges, tunnels, etc: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Enable building very long trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Aizliedz vilcieniem un kug'iem taisi't 90 gra'du pagriezienus: {ORANGE}{STRING} {LTBLUE} (nepiecies'ams NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Allow building very long bridges: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Allow goto depot orders: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Allow constructing raw material producing industries: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}New depot finding: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}New algorithm for train pathfinding: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Jauna' globa'la' cel'u kars'rutiza'cija (NPF, aizsta'j NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Show vehicle speed in status bar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Allow removal of more town-owned roads, bridges, tunnels, etc: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Enable building very long trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Aizliedz vilcieniem un kug'iem taisi't 90 gra'du pagriezienus: {ORANGE}{STRING1} {LTBLUE} (nepiecies'ams NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Allow building very long bridges: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Allow goto depot orders: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Allow constructing raw material producing industries: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}New depot finding: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}New algorithm for train pathfinding: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Jauna' globa'la' cel'u kars'rutiza'cija (NPF, aizsta'j NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Always allow small airports: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Always allow small airports: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A train is lost if no progress is made for: {ORANGE}{STRING} days
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}A train is lost if no progress is made for: {ORANGE}{STRING1} days
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}A train is lost if no progress is made for: {ORANGE}disabled
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :no
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :yes, but exclude stopped vehicles
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :of all vehicles
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warn if a train's income is negative: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehicles never expire: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Warn if a train's income is negative: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehicles never expire: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autoatjaunošana vehicle when it gets old
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenew when vehice is {ORANGE}{STRING}{LTBLUE} months before/after max age
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autoatjaunošana minimum needed money for renew: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duration of error message: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Râdît pilsçtas iedzîvotâju skaitu pie pilsçtas nosaukuma: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snow line height: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station spread: {ORANGE}{STRING} {RED}Warning: High setting slows game
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trains per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aircraft per player: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max ships per player: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autorenew when vehice is {ORANGE}{STRING1}{LTBLUE} months before/after max age
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autoatjaunošana minimum needed money for renew: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duration of error message: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Râdît pilsçtas iedzîvotâju skaitu pie pilsçtas nosaukuma: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snow line height: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max station spread: {ORANGE}{STRING1} {RED}Warning: High setting slows game
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disable trains for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trains per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max road vehicles per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aircraft per player: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max ships per player: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Disable trains for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable ships for computer: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Default service interval for trains: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Default service interval for road vehicles: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Default service interval for aircraft: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING1} days/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Default service interval for ships: {ORANGE}disabled
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Aizliedz servisu kad saboja's'ana's izsle'gta: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Aizliedz servisu kad saboja's'ana's izsle'gta: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Coloured news appears in: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Nobeidz spe'li: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Coloured news appears in: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Nobeidz spe'li: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Enable smooth economy (more, smaller changes)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Atïauj akciju pirkðanu no citâm kompânijâm
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging, place signals every: {ORANGE}{STRING} tile(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Atl'aut automatisko novietojumu PBS signa'lus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging, place signals every: {ORANGE}{STRING1} tile(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Atl'aut automatisko novietojumu PBS signa'lus: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Pa kreisi
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centrâ
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Pa labi
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Window snap radius: {ORANGE}disabled
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competitors
 
 STR_CONFIG_PATCHES_DISABLED                                     :disabled
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Change setting value
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Playing as player: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetplanes will not crash (frequently) on small airports: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Switch climate: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Change date: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}L'auj izmaini't produktu ve'rti'bas: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}L'auj izmaini't produktu ve'rti'bas: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Heading for {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...boja jau tiek lietota!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Can't convert railtype here...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construct Sugar Mine
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrîjas
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Refit train to carry a different cargo type
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Refit)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Refit train
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for train to carry
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Refit train to carry highlighted cargo type
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Can't refit train...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Maini't produkciju
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Welcome to this new AI, a work in progress. You should expect problems. When you happen take a screenshot and post it in the forum. Enjoy!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servera adrese:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servera adrese:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Company value:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Players:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Savienojas...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Fetching game info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching company info..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(s) in front of you
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes downloaded so far
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) in front of you
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes downloaded so far
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Could not load savegame
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Could not start the server
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Could not connect
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUMU16} timed out
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUM} timed out
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} A protocol-error was made and the connection was closed
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} The revision of this client does not match the server's revision
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Nepareiza Parole
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}kartes X-izme'ri: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}kartes Y-izme'ri: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}kartes X-izme'ri: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}kartes Y-izme'ri: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cost: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Pilse'tas
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Vispirms ja'demole' celtne
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Iedzi'vota'ji: {ORANGE}{COMMA}{BLACK}  Ma'jas: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Show information on local authority
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} local authority
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transport company ratings:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidijas
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidijas on offer for services taking:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING} to {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING2} to {STRING2}
 STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Neviens
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidised:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, until {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING2} to {STRING2} will now not attract a subsidy.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidised.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING} to {STRING} will attract a year's subsidy from the local authority!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay triple rates for the next year!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {STRING}!{}{}{STRING} service from {STATION} to {STATION} will pay quadruple rates for the next year!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING2} to {STRING2} will attract a year's subsidy from the local authority!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay triple rates for the next year!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay quadruple rates for the next year!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} local authority refuses to allow another airport to be built in this town
 STR_2036_COTTAGES                                               :Kotedži
 STR_2037_HOUSES                                                 :M&#257;jas
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {COMPANY} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Can't plant tree here...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...too many signs
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Can't place sign here...
 STR_280A_SIGN                                                   :Zîme
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Pa'ra'k daudz autobusa pieturu
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}pa'ra'k daudz kravas auto staciju
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Too close to another station/loading area
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Must demolish railway station first
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Too close to another airport
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Must demolish airport first
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Too close to another lorry station
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish lorry station first
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stations
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stations
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- None -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Too close to another dock
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolitan airport
 STR_305AB_LARGE                                                 :{BLACK}International airport
 STR_305B_SIZE                                                   :{BLACK}Size
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Railway station
 STR_305F_AIRCRAFT_HANGAR                                        :Aircraft hangar
 STR_3060_AIRPORT                                                :Lidosta
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Load Game
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transported)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transported)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centre the main view on industry location
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}New {STRING} under construction near {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}New {STRING} being planted near {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Unnamed{SKIP}
+STR_SV_UNNAMED                                                  :Unnamed
 STR_SV_TRAIN_NAME                                               :Vilciens {COMMA}
 STR_SV_ROADVEH_NAME                                             :Road Vehicle {COMMA}
 STR_SV_SHIP_NAME                                                :Ship {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aircraft {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} North
-STR_SV_STNAME_SOUTH                                             :{STRING} South
-STR_SV_STNAME_EAST                                              :{STRING} East
-STR_SV_STNAME_WEST                                              :{STRING} West
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :{STRING} Halt
-STR_SV_STNAME_VALLEY                                            :{STRING} Valley
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Heights
-STR_SV_STNAME_WOODS                                             :{STRING} Woods
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Lakeside
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Exchange
-STR_SV_STNAME_AIRPORT                                           :{STRING} Lidosta
-STR_SV_STNAME_OILFIELD                                          :{STRING} Oilfield
-STR_SV_STNAME_MINES                                             :{STRING} Mines
-STR_SV_STNAME_DOCKS                                             :{STRING} Docks
-STR_SV_STNAME_BUOY_1                                            :{STRING} Buoy 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Buoy 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Buoy 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Buoy 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Buoy 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Buoy 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Buoy 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Buoy 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Buoy 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Annexe
-STR_SV_STNAME_SIDINGS                                           :{STRING} Sidings
-STR_SV_STNAME_BRANCH                                            :{STRING} Branch
-STR_SV_STNAME_UPPER                                             :Upper {STRING}
-STR_SV_STNAME_LOWER                                             :Lower {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Mežs
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} North
+STR_SV_STNAME_SOUTH                                             :{STRING1} South
+STR_SV_STNAME_EAST                                              :{STRING1} East
+STR_SV_STNAME_WEST                                              :{STRING1} West
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :{STRING1} Halt
+STR_SV_STNAME_VALLEY                                            :{STRING1} Valley
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Heights
+STR_SV_STNAME_WOODS                                             :{STRING1} Woods
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Lakeside
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Exchange
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Lidosta
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Oilfield
+STR_SV_STNAME_MINES                                             :{STRING1} Mines
+STR_SV_STNAME_DOCKS                                             :{STRING1} Docks
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Buoy 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Buoy 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Buoy 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Buoy 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Buoy 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Buoy 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Buoy 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Buoy 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Buoy 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Annexe
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Sidings
+STR_SV_STNAME_BRANCH                                            :{STRING1} Branch
+STR_SV_STNAME_UPPER                                             :Upper {STRING1}
+STR_SV_STNAME_LOWER                                             :Lower {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Mežs
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Player {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Jauna Seja
 STR_7005_COLOR_SCHEME                                           :{BLACK}Krasas shçma
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Manager's Name
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Can't change company name...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Can't change manager's name...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finances {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finances {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Expenditure/Income
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construction
 STR_7012_NEW_VEHICLES                                           :{GOLD}New Vehicles
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Train Running Costs
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Income Graph
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Click on desired colour scheme
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Increase size of loan
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Repay part of loan
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Manager)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurated: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} train
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trains
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Company performance ratings (maximum rating=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Company values
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Company League Table
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transport company in trouble!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} will be sold off or declared bankrupt unless performance increases soon!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Manager)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} will be sold off or declared bankrupt unless performance increases soon!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Manager)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transport company merger!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} has been sold to {STRING} for {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We are looking for a transport company to take-over our company.{}{}Do you want to purchase {STRING} for {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} has been sold to {COMPANY} for {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}We are looking for a transport company to take-over our company.{}{}Do you want to purchase {COMPANY} for {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrots!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} has been closed down by creditors and all assets sold off!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} has been closed down by creditors and all assets sold off!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}New transport company launched!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} starts construction near {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} starts construction near {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Can't buy company...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Cargo Payment Rates
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Days in transit
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sell 25% share in this company
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Can't buy 25% share in this company...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {STRING}{}   {COMMA}% owned by {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} has been taken over by {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {COMPANY}{}   {COMMA}% owned by {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}S'i' kompa'nija ir pa'ra'k jauna lai tirgotu akcijas...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Train Depot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Go to {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Uz {STATION} (Pa'rvest un pan'emt kravu)
 STR_8808_GO_TO_UNLOAD                                           :Uz {STATION} (Nokraut)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Inform&#257;cija
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Train too long
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trains can only be altered when stopped inside a depot
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trains
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trains
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Go To
 STR_8827_FULL_LOAD                                              :{BLACK}Full Load
 STR_8828_UNLOAD                                                 :{BLACK}Unload
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Orders)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - End of Orders - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Serviss
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Can't build railway vehicle...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Value: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Loading / Unloading
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vilciens ja'apsta'dina kad tas ierodas depo
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Can't send train to depot...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Weight: {COMMA}t{}Speed: {VELOCITY}  Power: {COMMA}hp{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Svârs: {LTBLUE}{COMMA}t  {BLACK}Power: {LTBLUE}{COMMA}hp{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Road Vehicles
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Road Vehicles
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Road Vehicle Depot
 STR_9004_NEW_VEHICLES                                           :{BLACK}New Vehicles
 STR_9005_INFORMATION                                            :{BLACK}Informâcija
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Build Vehicle
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Can't build road vehicle...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Must build road vehicle depot first
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacitâte: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacitâte: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...must be stopped inside a road vehicle depot
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Can't sell road vehicle...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Can't stop/start road vehicle...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Build the highlighted road vehicle
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}New road vehicle now available!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Atrums: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Atrums: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name road vehicle
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Can't name road vehicle...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ship Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}New Ships
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Kuìi
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Kuìi
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Can't build ships...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Must build ship depot first
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Can't sell ship...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Can't build ship...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Ship in the way
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Can't stop/start ship...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Can't send ship to depot...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Unable to find local depot
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Show ship details
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}New ship now available!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING}{}Running Cost: {CURRENCY}/yr
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING1}{}Running Cost: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Name ship
 
 STR_9831_NAME_SHIP                                              :{WHITE}Name ship
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Rename ship type
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Can't rename ship type...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Refit cargo ship to carry a different cargo type
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_983C_REFIT_SHIP                                             :{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Refit ship to carry highlighted cargo type
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
 STR_GO_TO_SHIP_DEPOT                                            :Go to {TOWN} Ship Depot
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Build Aircraft
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Can't build aircraft...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aircraft
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Orders)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Details)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aircraft
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUMU16}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Can't send aircraft to hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Heading for {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Heading for {STATION} Hangar, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Can't stop/start aircraft...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aircraft is in flight
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Must build airport first
-STR_A019_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aircraft must be stopped in hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Can't sell aircraft...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Airport construction
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Rename aircraft type
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Can't rename aircraft type...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry a different cargo type
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Refit aircraft
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for aircraft to carry
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry highlighted cargo type
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
 STR_A043_REFITTABLE                                             :(refittable)
 STR_GO_TO_AIRPORT_HANGAR                                        :Uz {STATION} Angâru
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaïas
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehicles:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stacijas:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffikss:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Pariet uz Eiro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Pariet uz Eiro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Pariet uz Eiro: {ORANGE}nekad
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Preview: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Change custom currency parameter
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Svars: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}A'trums: {GOLD}{VELOCITY}{BLACK}   Jauda: {GOLD}{COMMA}zs
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Ekspua'tacijas izmaksas: {GOLD}{CURRENCY}/gada'
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Ietilpi'ba: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Raz'ots: {GOLD}{NUMU16}{BLACK} Termin's': {GOLD}{COMMA} gadi
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Ietilpi'ba: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Raz'ots: {GOLD}{NUM}{BLACK} Termin's': {GOLD}{COMMA} gadi
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks.Dros'i'ba: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Svars: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} A'trums: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ietilpi'ba: {GOLD}{COMMA} pasaz'ieru, {COMMA} pasta somas
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motor-vagoni: {GOLD}+{COMMA}zs{BLACK} Sva'rs: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motor-vagoni: {GOLD}+{COMMA}zs{BLACK} Sva'rs: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/lithuanian.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/lithuanian.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Reikia lygaus pavirsiaus
 STR_0008_WAITING                                                :{BLACK}Laukia: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (marsrutas is
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (marsrutas is
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Laukia: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Laukia: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Zemelapis - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Zaidimo nustatymai
 STR_00B2_MESSAGE                                                :{YELLOW}Zinute
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zinute nuo {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zinute nuo {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}To daryti negalima....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Negalima griauti sios teritorijos....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Orginalo teises priklauso {COPYRIGHT} 1995 Chris Sawyer, Visos teises saugomos
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Mylios
 STR_013A_METRIC_KILOMETERS                                      :Metrai, kilometrai
-STR_013B_OWNED_BY                                               :{WHITE}...priklauso {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...priklauso {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Keliamoji galia
 STR_013D_INFORMATION                                            :{BLACK}Informacija
 STR_013E_CAPACITIES                                             :{BLACK}Talpumas
 STR_013E_TOTAL_CARGO                                            :{BLACK}Visa keliamoji galia
-STR_013F_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Visa traukinio keliamoji galia:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Naujas zaidimas
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Sustabdyti zaidima
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Issaugoti, nutraukti, iseiti is zaidimo
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Parodyti stoteliu sarasa
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kaina isvalyti: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kaina isvalyti: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Savininkas: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Valdzia: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Savininkas: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Valdzia: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :None
 STR_01AA_NAME                                                   :{BLACK}Name
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Pasirink Pavyzdi/Demonstracija
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Krovinys priimamas: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Krovinys priimamas: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Krovinys priimamas: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Krovinys priimamas: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Krovinys priimamas: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Krovinys priimamas: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Takelis{SETX 88}Pavadinimas
 STR_01E9_SHUFFLE                                                :{TINYFONT}Atsitiktinis
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Muzikos programos pasirinkimas
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Takelio numeris
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Isvalyti
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Pranesimu nustatymai (ijungta/isjungta/santrauka)
 STR_MESSAGE_SOUND                                               :{YELLOW}Groti garsus pasirodzius naujienu santraukoms
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...per toli nuo pries tai buvusio keliones tikslo
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Geriausios kompanijos, kurios pasieke {NUMU16}{}({STRING} lygi)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Kompaniju Lygos lentele {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Geriausios kompanijos, kurios pasieke {NUM}{}({STRING} lygi)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Kompaniju Lygos lentele {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Biznierius
 STR_0214_ENTREPRENEUR                                           :Verslininkas
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnatas
 STR_0218_MOGUL                                                  :Didziausias magnatas
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Amziaus magnatas
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} achieves '{STRING}' status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} of {STRING} achieves '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Issirinkite miesto dydi
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Miesto dydis:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Parodyti paskutine zinute ar spaudos pranesima
 STR_OFF                                                         :Isjungta
 STR_SUMMARY                                                     :Santrauka
 STR_FULL                                                        :Pilnas
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Miestai
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Tr. priemoniu pavadinimai
 STR_02BD                                                        :{BLACK}{STRING}
@@ -992,88 +988,88 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Isjungtas
 STR_CONFIG_PATCHES_ON                                           :Ijungtas
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Rodyti tr. priemones greiti statuso eiluteje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Leisti statyti pastatus pakrantese ir staituose: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Leisti realistinio dydzio 'catchment areas'?: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Leisti griauti miestams priklausancius tiltus, kelius ir kt.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leisti statyti ypac ilgus traukinius: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistiska traukiniu akseleracija: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Drausti trauk/laivams suktis 90 laips.kampu: {ORANGE}{STRING} {LTBLUE} (reik. NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Leisti sujungti greta pastatytas stoteles: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Palikti stotele, jei nors 1 krovinys pilnai pakrautas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Naudoti patobulinta krovimo algoritma: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Infliacija: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Pristatyti krovini stotelei tiktai tuomet, kai yra poreikis: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Leisti statyti labai ilgus tiltus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Leisti naudoti uzduoti 'Keliauti i depa': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Leisti statyti zaliava gaminancius fabrikus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Leisti kelias panasias pramones imones viename mieste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Leisti statyti to paties tipo fabrikus arti vienas kito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Rodyti pilna data busenos eiluteje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sviesoforus rodyti vairuotojo puseje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Rodyti finansine ataskaita metu pabaigoje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch suderinta nuolatine prieziura?: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Automobiliu vilkstine (su kvantavimo efektu): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Perstumti vaizda, kai pele pasiekia ekrano krasta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Leisti papirkineti miesto valdzia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Naujo depo radimas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nestandartines stoteles: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Naujas algoritmas traukiniu kelio radimui (NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Globalus kelio radimo algoritmas (NPF, panaikina NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Rodyti tr. priemones greiti statuso eiluteje: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Leisti statyti pastatus pakrantese ir staituose: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Leisti realistinio dydzio 'catchment areas'?: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Leisti griauti miestams priklausancius tiltus, kelius ir kt.: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leisti statyti ypac ilgus traukinius: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistiska traukiniu akseleracija: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Drausti trauk/laivams suktis 90 laips.kampu: {ORANGE}{STRING1} {LTBLUE} (reik. NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Leisti sujungti greta pastatytas stoteles: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Palikti stotele, jei nors 1 krovinys pilnai pakrautas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Naudoti patobulinta krovimo algoritma: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Infliacija: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Pristatyti krovini stotelei tiktai tuomet, kai yra poreikis: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Leisti statyti labai ilgus tiltus: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Leisti naudoti uzduoti 'Keliauti i depa': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Leisti statyti zaliava gaminancius fabrikus: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Leisti kelias panasias pramones imones viename mieste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Leisti statyti to paties tipo fabrikus arti vienas kito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Rodyti pilna data busenos eiluteje: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sviesoforus rodyti vairuotojo puseje: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Rodyti finansine ataskaita metu pabaigoje: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch suderinta nuolatine prieziura?: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Automobiliu vilkstine (su kvantavimo efektu): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Perstumti vaizda, kai pele pasiekia ekrano krasta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Leisti papirkineti miesto valdzia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Naujo depo radimas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nestandartines stoteles: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Naujas algoritmas traukiniu kelio radimui (NTP): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Globalus kelio radimo algoritmas (NPF, panaikina NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Visada leisti statyti mazus oro uotus: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Visada leisti statyti mazus oro uotus: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Traukinys laikomas pasimetusiu, jei neatnesa pelno: {ORANGE}{STRING} d.
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Traukinys laikomas pasimetusiu, jei neatnesa pelno: {ORANGE}{STRING1} d.
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Traukinys laikomas pasimetusiu, jei neatnesa pelno: {ORANGE} Isjungta
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Perziureti tr. pr. uzduotis: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Perziureti tr. pr. uzduotis: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :ne
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :taip, bet isskyrus sustabdytas tr. pr.
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :visu tr. priemoniu
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Perspeti, jei traukinio pajamos neigiamos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Tr. priemones niekada nepasensta: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Perspeti, jei traukinio pajamos neigiamos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Tr. priemones niekada nepasensta: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automatiskai atnaujinti tr. priemone, kai ji pasensta
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Automatiskai atnaujinti tr. pr. {ORANGE}{STRING}{LTBLUE} men. iki/po maks. amziaus
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Automatiniam atnaujinimui reikalinga minimali suma: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Klaidos pranesimu rodymo trukme: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Rodyti miestu gyventoju skaiciu salia pavadinimo: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Nematomi medziai (kai ijungti permatomi pastatai): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sniego linijos aukstis: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks. soties plotis: {ORANGE}{STRING} {RED}Demesio: Auksti parametrai letina zaidima
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Remontuoti malunsparnius automatiskai: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks. traukiniu vienam zaidejui: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks. automobiliu zaidejui: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks. lektuvu zaidejui: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks. laivu zaidejui: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Automatiskai atnaujinti tr. pr. {ORANGE}{STRING1}{LTBLUE} men. iki/po maks. amziaus
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Automatiniam atnaujinimui reikalinga minimali suma: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Klaidos pranesimu rodymo trukme: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Rodyti miestu gyventoju skaiciu salia pavadinimo: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Nematomi medziai (kai ijungti permatomi pastatai): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sniego linijos aukstis: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks. soties plotis: {ORANGE}{STRING1} {RED}Demesio: Auksti parametrai letina zaidima
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Remontuoti malunsparnius automatiskai: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Atjungti traukinius kompiuteriui: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Atjungti automobilius kompiuteriui: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Atjungti lektuvus kompiuteriui: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Atjungti laivus kompiuteriui: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks. traukiniu vienam zaidejui: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks. automobiliu zaidejui: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks. lektuvu zaidejui: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks. laivu zaidejui: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Naujas dirbtinio intelekto algoritmas AI (testuojamas): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Atjungti traukinius kompiuteriui: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Atjungti automobilius kompiuteriui: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Atjungti lektuvus kompiuteriui: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Atjungti laivus kompiuteriui: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Traukiniu remonto intervalas: {ORANGE}{STRING} (d. ar %)
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Naujas dirbtinio intelekto algoritmas AI (testuojamas): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Traukiniu remonto intervalas: {ORANGE}{STRING1} (d. ar %)
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Traukiniu remonto intervalas: {ORANGE}isjungta
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Automobiliu remonto intervalas: {ORANGE}{STRING} (d. ar %)
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Automobiliu remonto intervalas: {ORANGE}{STRING1} (d. ar %)
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Automobiliu remonto intervalas: {ORANGE}isjungta
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Lektuvu remonto intervalas: {ORANGE}{STRING} (d. ar %)
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Lektuvu remonto intervalas: {ORANGE}{STRING1} (d. ar %)
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Lektuvu remonto intervalas: {ORANGE} isjungta
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Laivu remonto intervalas: {ORANGE}{STRING} (d. ar %)
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Laivu remonto intervalas: {ORANGE}{STRING1} (d. ar %)
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Laivu remonto intervalas: {ORANGE} isjungta
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Atjungti technine apziura, jei gedimai nenaudojami: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Atjungti technine apziura, jei gedimai nenaudojami: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Spalvotos naujienos atsiranda: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Zaidimo pradzia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Zaidimo pabaiga: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Spalvotos naujienos atsiranda: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Zaidimo pradzia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Zaidimo pabaiga: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Tolygi ekonomika (daug, bet nezymiu pokyciu)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Leisti pirkti kitu kompaniju akcijas
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Tempiant, kopijuoti sviesoforus kas: {ORANGE}{STRING} langeli(us)
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pagrindines irankiu juostos pozicija: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Tempiant, kopijuoti sviesoforus kas: {ORANGE}{STRING1} langeli(us)
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pagrindines irankiu juostos pozicija: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Kaireje
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centre
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Desineje
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Langu persidengimo atstumas: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Langu persidengimo atstumas: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Window snap radius: {ORANGE}disabled
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Vaizdas
@@ -1084,7 +1080,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Priesininkai
 
 STR_CONFIG_PATCHES_DISABLED                                     :isjungta
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Keisti reiksmes
@@ -1100,13 +1096,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Demesio! Tu bandai isduoti vargsus savo varzovus. Tai bus tavo geda visiems laikams ir niekada neuzmirsta.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Padauginti pinigu {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Zaisti uz zaideja: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magiskas buldozeris (pasalina gamyklas ir kt.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneliai gali susikirsti: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Galima statyti pauzes rezime: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magiskas buldozeris (pasalina gamyklas ir kt.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneliai gali susikirsti: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Galima statyti pauzes rezime: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Reaktyviniai lektuvai nesuges (dazniausiai) mazuose oro uostuose: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Perjungti klimata: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Pakeisti data: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Leisti keisti produkcijos vertes: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Leisti keisti produkcijos vertes: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Juda i {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Juda i {WAYPOINT}, {VELOCITY}
@@ -1160,7 +1156,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...pluduras naudojamas!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinates: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordinates: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Neimanoma pasalinti stoties dalies...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Neimanoma cia pakeisti begio tipo...
@@ -1198,19 +1194,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Statyti cukraus kasykla
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gamyklos
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportuota)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportuota)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportuota)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportuota)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...per arti kitos gamyklos
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Isteigti traukini, kuris rupinsis prioritetiniais kroviniais
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Isteigti)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Isteigti traukini
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Pasirink prioritetini krovinio tipa, kurio rupinsis traukinys
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Isteigti traukini prioritetiniu kroviniu pervezimui
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Negalima isteigti traukinio...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Remonto intervalas procentais: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Remonto intervalas procentais: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Keisti produkcija
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Dirbtinio intelekto algoritmas pradeda darba. Jei iskils problemu - fotografuok ekrano vaizda ir konsultuokis forumuose. Sekmes!
@@ -1249,7 +1244,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverio versija:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serverio adresas:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serverio adresas:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Zaidimo pradzia:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Dabartine data:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Apsaugota slaptazodziu!
@@ -1318,14 +1313,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}KOMPANIJOS INFORMACIJA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Kompanijos pavadinimas:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Pradejo zaisti:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Pradejo zaisti:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Kompanijos verte:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Dabartinis balansas:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Praeitu metu pajamos:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Transporto priemones:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stoteles:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Transporto priemones:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stoteles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Zaidejai:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Jungiamasi...
@@ -1341,8 +1336,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Fetching game info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching kompanijos informacija...
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(s) in front of you
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} Kb parsiusta
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) in front of you
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} Kb parsiusta
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Atsijungti
 
@@ -1360,7 +1355,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Negali atverti issaugoto zaidimo
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Negali paleisti serverio
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Negali prisijungti
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Baigesi prisijungimo #{NUMU16} laikas
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Baigesi prisijungimo #{NUM} laikas
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Protokoli klaida. Prisijungimas baigtas
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Zaidimo versija neatitinka serverio zaidimo versijos
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Blogas slaptazodis
@@ -1413,8 +1408,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Zemelapio X-koord. dydis: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Zemelapio Y-koord. dydis: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Zemelapio X-koord. dydis: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Zemelapio Y-koord. dydis: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kainuoja: {CURRENCY}
@@ -1509,10 +1504,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Miestai
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Pirmiau turi butu nugriautas pastatas
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Populiacija: {ORANGE}{COMMA}{BLACK}  Namu skaicius: {ORANGE}{COMMA}
@@ -1545,23 +1540,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Rodyti informacija apie valdzia
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} vietine valdzia
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transporto kompaniju reitingai:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidijos
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Dar nepanaudotos subsidijos:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} is {STRING} i {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} is {STRING2} i {STRING2}
 STR_2028_BY                                                     :{YELLOW} (iki {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Niekas
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Jau subsidijuojama:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} is {STATION} i {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} is {STATION} i {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, iki {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsidiju pasiulymas baigesi:{}{}{STRING} pervezimas is {STRING} i {STRING} daugiau nebesubsidijuojamas.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsidiju pasiulymas baigesi:{}{}{STRING} pervezimas is {STRING2} i {STRING2} daugiau nebesubsidijuojamas.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidiju laikas baigesi:{}{}{STRING} transportavimas is {STATION} i {STATION} daugiau nebesubsidijuojama.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidiju pasiulymas:{}{}Pirmasis pervezes {STRING} is {STRING} i {STRING} gaus metine vietines valdzios subsidija!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {STRING}!{}{}{STRING} pervezimas is {STATION} i {STATION} metams bus 50% daugiau apmokama!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {STRING}!{}{}{STRING} pervezimas is {STATION} i {STATION} bus metus apmokamas padidintu 200% tarifu!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {STRING}!{}{}{STRING}  pervezimas is {STATION} i {STATION} bus metus apmokamas padidintu 300% tarifu!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {STRING}!{}{}{STRING} pervezimas is {STATION} i {STATION} bus metus apmokamas padidintu 400% tarifu!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidiju pasiulymas:{}{}Pirmasis pervezes {STRING} is {STRING2} i {STRING2} gaus metine vietines valdzios subsidija!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {COMPANY}!{}{}{STRING} pervezimas is {STATION} i {STATION} metams bus 50% daugiau apmokama!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {COMPANY}!{}{}{STRING} pervezimas is {STATION} i {STATION} bus metus apmokamas padidintu 200% tarifu!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {COMPANY}!{}{}{STRING}  pervezimas is {STATION} i {STATION} bus metus apmokamas padidintu 300% tarifu!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidijos suteiktos {COMPANY}!{}{}{STRING} pervezimas is {STATION} i {STATION} bus metus apmokamas padidintu 400% tarifu!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} vietine valdzia neleidzia statyti kito oro uosto siame mieste
 STR_2036_COTTAGES                                               :Vasarnamiai
 STR_2037_HOUSES                                                 :Namai
@@ -1595,7 +1590,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Pirkti isskirtines transporto teises mieste 1 metams. Miesto valdzia keleivius ir krovinius leis pervezti tik tavo kompanijai.{} Kaina: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Eismo chaosas {TOWN}!{}{}Keliu rekonstrukcija, finansuojama {STRING}, sukels 6 menesiu chaosa keliuose!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Eismo chaosas {TOWN}!{}{}Keliu rekonstrukcija, finansuojama {COMPANY}, sukels 6 menesiu chaosa keliuose!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
@@ -1613,7 +1608,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...site unsuitable
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Can't plant tree here...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...per daug zenklu
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Cia zenklo statyti negalima...
 STR_280A_SIGN                                                   :Zenklas
@@ -1637,7 +1631,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Per daug autobusu sustojimu
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Per daug sunkvezimiu stoteliu
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Per arti kitos stoteles
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Pirmiausia turi nugriauti gelezinkelio stoti
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Per arti kito oro uosto
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Pirmiausia turi nugriauti oro uosta
@@ -1670,8 +1664,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Per arti kitos sunkvezimiu pakrovimo aiksteles
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Pirmiausia turi nugriauti autobusu stotele
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Pirmiausia turi nugriauti sunkvezimiu pakrovimo aikstele
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stoteles
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stoteles
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nieko -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...netinkama vieta
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Per arti kitos prieplaukos
@@ -1692,7 +1686,7 @@
 STR_305AA_LARGE                                                 :{BLACK}Tarpmiestinis oro uostas
 STR_305AB_LARGE                                                 :{BLACK}Tarptautinis oro uostas
 STR_305B_SIZE                                                   :{BLACK}Dydis
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Gelezinkelio stotis
 STR_305F_AIRCRAFT_HANGAR                                        :Lektuvo angaras
 STR_3060_AIRPORT                                                :Oro uostas
@@ -1725,7 +1719,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Atverti zaidima
 STR_4002_SAVE                                                   :{BLACK}Issaugoti
 STR_4003_DELETE                                                 :{BLACK}Trinti
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} Mb laisva
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Negali pasiekti disko
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Zaidimo issaugoti nepavyko
@@ -1787,7 +1781,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Progukcija praeita menesi:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportuota)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportuota)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Rodyti gamykla ekrano centre
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Statomas naujas {STRING} netoli miesto: {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Sodinamas naujas {STRING} netoli miesto: {TOWN}!
@@ -1867,45 +1861,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Bevardis{SKIP}
+STR_SV_UNNAMED                                                  :Bevardis
 STR_SV_TRAIN_NAME                                               :Traukinys {COMMA}
 STR_SV_ROADVEH_NAME                                             :Automobilis  {COMMA}
 STR_SV_SHIP_NAME                                                :Laivas {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Lektuvas {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Siaure
-STR_SV_STNAME_SOUTH                                             :{STRING} Pietus
-STR_SV_STNAME_EAST                                              :{STRING} Rytai
-STR_SV_STNAME_WEST                                              :{STRING} Vakarai
-STR_SV_STNAME_CENTRAL                                           :{STRING} Centrine
-STR_SV_STNAME_TRANSFER                                          :{STRING} Perdavimas
-STR_SV_STNAME_HALT                                              :{STRING} Galine
-STR_SV_STNAME_VALLEY                                            :{STRING} Slenio
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Aukstumu
-STR_SV_STNAME_WOODS                                             :{STRING} Misko
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Ezero
-STR_SV_STNAME_EXCHANGE                                          :{STRING}
-STR_SV_STNAME_AIRPORT                                           :{STRING} Oro Uostas
-STR_SV_STNAME_OILFIELD                                          :{STRING} Naftos Platforma
-STR_SV_STNAME_MINES                                             :{STRING} Kasyklos
-STR_SV_STNAME_DOCKS                                             :{STRING} Dokai
-STR_SV_STNAME_BUOY_1                                            :{STRING} Pluduras 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Pluduras 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Pluduras 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Pluduras 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Pluduras 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Pluduras 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Pluduras 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Pluduras 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Pluduras 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Kreivoji
-STR_SV_STNAME_SIDINGS                                           :{STRING} Krastine
-STR_SV_STNAME_BRANCH                                            :{STRING} Atsaka
-STR_SV_STNAME_UPPER                                             :Aukstutine {STRING}
-STR_SV_STNAME_LOWER                                             :Zemutine {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Sraigtasparniu Aikstele
-STR_SV_STNAME_FOREST                                            :{STRING} Miskas
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Siaure
+STR_SV_STNAME_SOUTH                                             :{STRING1} Pietus
+STR_SV_STNAME_EAST                                              :{STRING1} Rytai
+STR_SV_STNAME_WEST                                              :{STRING1} Vakarai
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Centrine
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Perdavimas
+STR_SV_STNAME_HALT                                              :{STRING1} Galine
+STR_SV_STNAME_VALLEY                                            :{STRING1} Slenio
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Aukstumu
+STR_SV_STNAME_WOODS                                             :{STRING1} Misko
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Ezero
+STR_SV_STNAME_EXCHANGE                                          :{STRING1}
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Oro Uostas
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Naftos Platforma
+STR_SV_STNAME_MINES                                             :{STRING1} Kasyklos
+STR_SV_STNAME_DOCKS                                             :{STRING1} Dokai
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Pluduras 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Pluduras 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Pluduras 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Pluduras 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Pluduras 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Pluduras 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Pluduras 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Pluduras 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Pluduras 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Kreivoji
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Krastine
+STR_SV_STNAME_BRANCH                                            :{STRING1} Atsaka
+STR_SV_STNAME_UPPER                                             :Aukstutine {STRING1}
+STR_SV_STNAME_LOWER                                             :Zemutine {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Sraigtasparniu Aikstele
+STR_SV_STNAME_FOREST                                            :{STRING1} Miskas
 
 ############ end of	savegame specific region!
 
@@ -1984,7 +1978,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Zaidejas {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Naujas veidas
 STR_7005_COLOR_SCHEME                                           :{BLACK}Spalva
@@ -1996,9 +1990,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Direktoriaus vardas
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Kompanijos vardo pakeisti negalima...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Direktoriaus vardo pakeisti negalima...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finansai {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finansai {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Sanaudos/Pajamos
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Konstrukcijos
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nauja technika
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Traukiniu sanaudos
@@ -2015,7 +2009,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Viso:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Pajamu diagrama
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2040,8 +2034,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Paspausk ant pasirinktos spalvos
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Padidina paskola
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Grazina paskolos dali
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Direktorius)
-STR_7038_INAUGURATED                                            :{GOLD}Eina pareigas nuo: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Direktorius)
+STR_7038_INAUGURATED                                            :{GOLD}Eina pareigas nuo: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Transporto priemones:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} traukinys
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} traukiniai
@@ -2069,18 +2063,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Kompanijos pajegumo reitingas (maksimalus=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Kompanijos verte
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Kompaniju lentele
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transport company in trouble!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} will be sold off or declared bankrupt unless performance increases soon!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Manager)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} will be sold off or declared bankrupt unless performance increases soon!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Manager)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transport company merger!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} buvo parduota {STRING} uz {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Mes ieskome, kas galetu perimti musu kompanija.{}{}Ar jus noretumete pirkti {STRING} uz {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} buvo parduota {COMPANY} uz {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Mes ieskome, kas galetu perimti musu kompanija.{}{}Ar jus noretumete pirkti {COMPANY} uz {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrotas!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}Kreditoriu susirinkimas nusprende uzdaryti {STRING} ir parduoti visa turta!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}Kreditoriu susirinkimas nusprende uzdaryti {COMPANY} ir parduoti visa turta!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Ikurta nauja transporto kompanija!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} pradeda statybas prie {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} pradeda statybas prie {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Neimanoma pirkti kompanijos...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Kroviniu pervezimo tarifai
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dienu kelyje
@@ -2115,9 +2109,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Parduoti 25% sios kompanijos akciju
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Negalima nusipirkti 25% sios kompanijos akciju...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Negalima parduoti 25% sios kompanijos akciju...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% priklauso {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% priklauso {STRING}{}   {COMMA}% priklauso {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} buvo perimta {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% priklauso {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% priklauso {COMPANY}{}   {COMMA}% priklauso {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} buvo perimta {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas...
 
 ##id 0x8000
@@ -2389,10 +2383,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Traukiniu depas
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Train in the way
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Vaziuoja i {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Remontas {TOWN} traukiniu depe
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Vaziuoti nestojant i {TOWN} traukiniu depa
@@ -2412,7 +2406,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informacijs
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Traukinys per ilgas
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Sukeisti traukinius galima tiktai sustabdytus depe
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} traukiniai
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} traukiniai
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}New Rail Vehicles
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}New Monorail Vehicles
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}New Maglev Vehicles
@@ -2424,14 +2418,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Vaziuoti
 STR_8827_FULL_LOAD                                              :{BLACK}Pakrauti
 STR_8828_UNLOAD                                                 :{BLACK}Iskrauti
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Uzduotys)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Uzduotys)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Uzduociu pabaiga- -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Remontas
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Gelezinkelio transporto priemones nupirkti negalima...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatyta: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatyta: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Verte: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Pasikrauna / Issikrauna
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Traukinys turi buti sustabdytas depe
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Traukinio pasiusti i depa negalima...
@@ -2480,9 +2474,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Naujas {STRING} atsirado!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kaina: {CURRENCY} Svoris: {COMMA}t{}Greitis: {VELOCITY}  Galia: {COMMA}aj{}Eksploatacijos islaidos: {CURRENCY}/met{}Talpa: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kaina: {CURRENCY} Svoris: {COMMA}t{}Greitis: {VELOCITY}  Galia: {COMMA}aj{}Eksploatacijos islaidos: {CURRENCY}/met{}Talpa: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Sugedo
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING2}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Svoris: {LTBLUE}{COMMA}t  {BLACK}Galia: {LTBLUE}{COMMA}aj{BLACK} Maks. greitis: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Siu metu pelnas : {LTBLUE}{CURRENCY}  (praeitu metu: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Gedimai nuo praeito remonto: {LTBLUE}{COMMA}
@@ -2503,8 +2497,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automobilis kelyje
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Automobiliai
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Automobiliai
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Automobiliu garazas
 STR_9004_NEW_VEHICLES                                           :{BLACK}Naujos tr. priemones
 STR_9005_INFORMATION                                            :{BLACK}Informacija
@@ -2512,14 +2506,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Isigyti priemone
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Automobilio isigyti negalima...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Pirmiausia pastatyk automobiliu garaza
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Uzduotys)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detaliau)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detaliau)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING2}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
 STR_900E_MAX_SPEED                                              :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Pelnas siais metais: {LTBLUE}{CURRENCY}  (praejusiais metais: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Sugedo po paskutinio remonto: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...automobilis turi buti sustabdytas garaze
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Automobilio parduoti negalima...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Automobilio sustabdyti/paleisti negalima...
@@ -2544,7 +2537,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Isigyti pazymeta automobili
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Atsirado naujas automobilis!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kaina: {CURRENCY}{}Greitis: {VELOCITY}{}Eksploatavimo kaina: {CURRENCY}/met{}Talpa: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kaina: {CURRENCY}{}Greitis: {VELOCITY}{}Eksploatavimo kaina: {CURRENCY}/met{}Talpa: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Pavadinti automobili
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Automobilio pavadinti nepavyko...
@@ -2567,7 +2560,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Can't build dock here...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Laivu depas
 STR_9804_NEW_SHIPS                                              :{BLACK}Naujas laivas
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Laivai
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Laivai
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Negalima isigyti laivo...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Pirmiausia reikia pastatyti laivu depa
 STR_9808_NEW_SHIPS                                              :{WHITE}New Ships
@@ -2576,15 +2569,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Laivo parduoti negalima...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Laivo isigyti negalima...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Laivas kelyje
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Uzduotys)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detaliau)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatavimo islaidos: {LTBLUE}{CURRENCY}/met
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detaliau)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING2}{BLACK}   Eksploatavimo islaidos: {LTBLUE}{CURRENCY}/met
 STR_9813_MAX_SPEED                                              :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Pelnas siais metais: {LTBLUE}{CURRENCY}  (praeitais metais: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Gedimai po paskutinio remonto: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Sustabdyti/paleisti laivo negalima...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nusiusti i laivu depa negalima...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Negali rasti artimiausio laivu depo
@@ -2608,7 +2600,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Rodyti laivo informacija
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Atsirado naujas laivas!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING}{}Running Cost: {CURRENCY}/yr
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {STRING1}{}Running Cost: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Laivo vardas
 
 STR_9831_NAME_SHIP                                              :{WHITE}Laivo vardas
@@ -2621,12 +2613,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Pakeisti laivo varda
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Laivo vardo pakeisti negalima...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Perorientuoti laivo pervezamo krovinio tipa
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Perorientuoti)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Perorientuoti)
 STR_983C_REFIT_SHIP                                             :{BLACK}Perorientuoti laiva
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Pasirink krovinio tipa, kuri laivas tures 'sergeti'
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Pakeisti pervezamo krovinio tipa
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Pasirink 'sergimo' krovinio tipa:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nauja talpa: {GOLD}{STRING}{}{BLACK}Remonto kaina: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nauja talpa: {GOLD}{STRING1}{}{BLACK}Remonto kaina: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Negalima perorientuotilaivo...
 STR_9842_REFITTABLE                                             :(perorientuotinas)
 STR_GO_TO_SHIP_DEPOT                                            :Uzduotis: laivu depas {TOWN}
@@ -2641,15 +2633,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Naujas lektuvas
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Isigyti lektuva
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Negalima isigyti lektuvo...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Lektuvai
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Uzduotys)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaliau)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met.
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Lektuvai
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Uzduotys)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detaliau)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING2}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met.
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Pelnas siais metais: {LTBLUE}{CURRENCY}  (praeitais metais: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Patikimumas: {LTBLUE}{COMMA}%  {BLACK}Gedimai po paskutinio remonto: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUMU16}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Pastatytas: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Negalima lektuvo nusiusti i angara...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Kursas: {STATION} angaras
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Kursas: {STATION} angarasangar, {VELOCITY}
@@ -2658,8 +2650,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Negalima cia statyti oro uosto...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lektuvas dabar skrenda
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Pirmiausia reikia pastatyti oro uosta
-STR_A019_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Lektuvas turi buti sustabdytas angare
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Negalima parduoti lektuvo...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Oro uostu konstr.
@@ -2694,12 +2686,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Pakeisti lektuvo varda
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Negalima pakeisti lektuvo vardo...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Pakeisti lektuvo pervezamu kroviniu tipa
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Keisti)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Keisti)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Keisti krovinio tipa
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Pasirink nauja krovinio tipa
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Pakeisti lektuvo pervezamo krovinio tipa pazymetu
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Pasirink nauja kroviniu tipa:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nauja talpa: {GOLD}{STRING}{}{BLACK}Pakeitimo kaina: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nauja talpa: {GOLD}{STRING1}{}{BLACK}Pakeitimo kaina: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Negalima pakeisti krovinio tipo...
 STR_A043_REFITTABLE                                             :(keiciami kroviniai)
 STR_GO_TO_AIRPORT_HANGAR                                        :Kursas: {STATION} angaras
@@ -2723,8 +2715,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaliai
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Automobiliai:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stoteles:
@@ -2761,7 +2753,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Skyriklis:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Priesdelis:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Pavadinimas:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Pereiti prie Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Pereiti prie Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Pereiti prie Euro: {ORANGE}niekada
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Perziura: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Keisti pasirinktos valiutos nustatymus
@@ -2807,4 +2799,3 @@
 ############ End of list of rail types
 
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
-
--- a/lang/norwegian.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/norwegian.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Flatt land er nødvendig
 STR_0008_WAITING                                                :{BLACK}Venter: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (på vei fra
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (på vei fra
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Aksepterer: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Aksepterer: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Kart - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spillinnstillinger
 STR_00B2_MESSAGE                                                :{YELLOW}Melding
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Melding fra {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Melding fra {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan ikke gjøre dette....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan ikke rydde dette området....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Opprinnelig opphavsbeskyttet {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperisk (miles)
 STR_013A_METRIC_KILOMETERS                                      :Metrisk (kilometer)
-STR_013B_OWNED_BY                                               :{WHITE}...eies av {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...eies av {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Last
 STR_013D_INFORMATION                                            :{BLACK}Informasjon
 STR_013E_CAPACITIES                                             :{BLACK}Kapasitet
 STR_013E_TOTAL_CARGO                                            :{BLACK}Total last
-STR_013F_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total kapasitet på dette toget:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nytt spill
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pause
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Lagre spill, avbryt spillet, avslutte
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Vis liste over firmaets stasjoner
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Fjerningskostnad: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Fjerningskostnad:  {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Eier: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokal myndighet: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Eier: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokal myndighet: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Navn
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Velg Veiledning/Demonstrasjon
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Aksepterte varer: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Aksepterte varer: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Aksepterte varer: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Aksepterte varer: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Aksepterte varer: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Aksepterte varer: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Spor{SETX 88}Tittel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Tilfeldig
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musikkprogram
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Sporregister
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tøm
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Innstilling for alle meldingstyper (på/av/sammendrag)
 STR_MESSAGE_SOUND                                               :{YELLOW}Spill av lyd for nyhetssammendrag
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...for langt i fra forrige destinasjon
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Beste firma som nådde {NUMU16}{}({STRING} Nivå)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Firmarangering i {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Beste firma som nådde {NUM}{}({STRING} Nivå)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Firmarangering i {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Forretningsmann
 STR_0214_ENTREPRENEUR                                           :Entreprenør
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Århundrets finansfyrste
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} oppnår '{STRING}'-status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} av {STRING} oppnår '{STRING}'-status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} oppnår '{STRING}'-status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} av {COMPANY} oppnår '{STRING}'-status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Velg bystørrelse
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Bystørrelse:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Vis siste melding eller nyhetsrapport
 STR_OFF                                                         :Av
 STR_SUMMARY                                                     :Sammendrag
 STR_FULL                                                        :Fullt
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Byoversikt
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Navn på kjøretøy
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Av
 STR_CONFIG_PATCHES_ON                                           :På
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Vis kjøretøyets hastighet på statuslinja: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Tillat bygging på skråninger og i vannkanten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Mer realistisk størrelse på oppfangingsområder: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Tillat riving av industri, mer vei, etc: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Tillat bygging av veldig lange tog : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistisk akslerasjon for tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forby tog og skip mot å gjøre 90-graders svinger: {ORANGE}{STRING} {LTBLUE} (trenger NGR)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Slå sammen stasjoner som blir bygget på siden av hverandre: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Forlat stasjonen når én type varevogn er full, hvis 'full last' er på: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Bruk forbedret lastingsalgoritme: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflasjon: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Levér varer til en stasjon bare når varen trengs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillat bygging av veldig lange broer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Tillat 'gå til jernbanestall'-ordre: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Tillat bygging av anlegg som produserer råmaterialer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Tillat flere like industrier i samme by: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrier av samme type kan bygges nær hverandre: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Alltid vis lang dato på statuslinja: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Vis jernbanesignaler på samme side som kjøreretningen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Vis regnskap ved nyttår: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch-kompatibel nonstop-håndtering: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Kjøretøykø (med kvantumseffekter): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Flytt på bildet hvis pilen er nær ytterkantene av skjermen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillat bestikkelser av bystyret: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Ny togstallokalisering: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ikke-ensartede stasjoner: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Ny algoritme for togs kjørerute: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny global rutesøking (NGR, overstyrer NTK): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Vis kjøretøyets hastighet på statuslinja: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Tillat bygging på skråninger og i vannkanten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Mer realistisk størrelse på oppfangingsområder: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Tillat riving av industri, mer vei, etc: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Tillat bygging av veldig lange tog : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistisk akslerasjon for tog: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forby tog og skip mot å gjøre 90-graders svinger: {ORANGE}{STRING1} {LTBLUE} (trenger NGR)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Slå sammen stasjoner som blir bygget på siden av hverandre: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Forlat stasjonen når én type varevogn er full, hvis 'full last' er på: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Bruk forbedret lastingsalgoritme: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflasjon: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Levér varer til en stasjon bare når varen trengs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillat bygging av veldig lange broer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Tillat 'gå til jernbanestall'-ordre: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Tillat bygging av anlegg som produserer råmaterialer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Tillat flere like industrier i samme by: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrier av samme type kan bygges nær hverandre: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Alltid vis lang dato på statuslinja: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Vis jernbanesignaler på samme side som kjøreretningen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Vis regnskap ved nyttår: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch-kompatibel nonstop-håndtering: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Kjøretøykø (med kvantumseffekter): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Flytt på bildet hvis pilen er nær ytterkantene av skjermen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillat bestikkelser av bystyret: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Ny togstallokalisering: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ikke-ensartede stasjoner: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Ny algoritme for togs kjørerute: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny global rutesøking (NGR, overstyrer NTK): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltid tillat bygging av små flyplasser: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltid tillat bygging av små flyplasser: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Et tog har kjørt seg vill hvis ingen framdrift er gjort etter: {ORANGE}{STRING} dager
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Et tog har kjørt seg vill hvis ingen framdrift er gjort etter: {ORANGE}{STRING1} dager
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Et tog har kjørt seg vill hvis ingen framdrift er gjort etter: {ORANGE}deaktivert
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Inspiser kjøretøy's ordrer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Inspiser kjøretøy's ordrer: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nei
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, men ekskluder stoppede kjøretøy
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :av alle kjøretøy
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Advar hvis et tog går med større underskudd enn: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Kjøretøy utgår aldri: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Advar hvis et tog går med større underskudd enn: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Kjøretøy utgår aldri: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Bytt automatisk ut kjøretøy når det blir gammelt:
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autoforny når kjøretøy er {ORANGE}{STRING}{LTBLUE} måneder før/etter maks alder
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autoforny minimum penger trengst for fornying: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Varighet til feilmelding: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Vis byers befolkning i tittel: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Usynlige trær (med gjennomsiktige bygninger): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snøhøyde: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks stasjonspedning: {ORANGE}{STRING} {RED}Advarsel: Høy instilling gir treger spill
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Utfør service på helikopter automatisk på helikopterlandingsteder: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks antall tog per spiller: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks antall kjøretøy per spiller: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks antall fly per spiller: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks antall skip per spiller: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autoforny når kjøretøy er {ORANGE}{STRING1}{LTBLUE} måneder før/etter maks alder
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Autoforny minimum penger trengst for fornying: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Varighet til feilmelding: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Vis byers befolkning i tittel: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Usynlige trær (med gjennomsiktige bygninger): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snøhøyde: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks stasjonspedning: {ORANGE}{STRING1} {RED}Advarsel: Høy instilling gir treger spill
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Utfør service på helikopter automatisk på helikopterlandingsteder: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Hindre datamaskinen i å bygge tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Hindre datamaskinen i å bygge kjøretøy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Hindre datamaskinen i å bygge fly: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Hindre datamaskinen i å bygge skip: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks antall tog per spiller: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks antall kjøretøy per spiller: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks antall fly per spiller: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks antall skip per spiller: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Aktiver ny AI (alfa): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Hindre datamaskinen i å bygge tog: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Hindre datamaskinen i å bygge kjøretøy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Hindre datamaskinen i å bygge fly: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Hindre datamaskinen i å bygge skip: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standard serviceintervall for tog: {ORANGE}{STRING} dager
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Aktiver ny AI (alfa): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standard serviceintervall for tog: {ORANGE}{STRING1} dager
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Standard serviceintervall for tog: {ORANGE}deaktivert
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standard serviceintervall for kjøretøy: {ORANGE}{STRING} dager
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standard serviceintervall for kjøretøy: {ORANGE}{STRING1} dager
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Standard serviceintervall for kjøretøy: {ORANGE}deaktivert
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standard serviceintervall for fly: {ORANGE}{STRING} dager
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standard serviceintervall for fly: {ORANGE}{STRING1} dager
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Standard serviceintervall for kjøretøy: {ORANGE}deaktivert
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard serviceintervall for båter: {ORANGE}{STRING} dager
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard serviceintervall for båter: {ORANGE}{STRING1} dager
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Standard serviceintervall for skip: {ORANGE}deaktivert
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Deaktiver service når havarier er slått av: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Deaktiver service når havarier er slått av: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farge i avisen kommer i: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Start spillet i år: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Spillet slutter {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farge i avisen kommer i: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Start spillet i år: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Spillet slutter {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Jevn økonomi (Flere, mindre endringer)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Tillat kjøping av aksjer i andre selskaper
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ved opptrekking plasser signal hver: {ORANGE}{STRING} rute(r)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Tillat automatisk plassering av pbs signal: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posisjon av hovedverktøylinje: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ved opptrekking plasser signal hver: {ORANGE}{STRING1} rute(r)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Tillat automatisk plassering av pbs signal: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posisjon av hovedverktøylinje: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Venstre
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Sentrert
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Høyre
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Knipseradius for vindu: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Knipseradius for vindu: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Knipseradius for vindu: {ORANGE}deaktivert
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Grensesnitt
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Motstandere
 
 STR_CONFIG_PATCHES_DISABLED                                     :Slått av
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Endre innstillingsverdi
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Vær klar over at du er i ferd med å bedra dine motstandere og at straffen for slike handlinger er å brenne i helvete etter din død.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Øk pengebeholdningen med {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spiller som spiller: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldoser (fjern industrier, ufjernbare ting): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneller kan krysse hverandre: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillat bygging i pause modus: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldoser (fjern industrier, ufjernbare ting): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneller kan krysse hverandre: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillat bygging i pause modus: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetfly vil ikke krasje (hele tiden) på små flyplasser: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Bytt klima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Bytt dato: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tillat endring av produksjonsmengder: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tillat endring av produksjonsmengder: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Har kurs mot {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Har kurs mot {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...bøye er i bruk!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ikke fjerne del av stasjonen...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan ikke konvertere jernbanetype her...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Bygg sukkergruve
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportert)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportert)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportert)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...For nært en annen industri
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om et lokomotiv til å ta en annen type last
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (bygg om)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Bygg om lokomotivet
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Velg hvilken last lokomotivet skal ta
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Bygg om lokomotivet til å frakte den valgte varetypen
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikke bygge om lokomotiv...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervaller er i prosent: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervaller er i prosent: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Velkommen til denne nye AI, under konstruksjon. Du kan vente deg problemer. Når du finner ett problem, lag ett skjermbilde av det og post det i forumet. Mor deg!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Brikkesett:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstørrelse:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tjenerversjon:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server addresse:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server addresse:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Startet:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nettverksdato:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Passordbeskyttet!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}FIRMAOVERSIKT
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Firmaname:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Innviet:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Innviet:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Firmaverdi:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanse nå:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inntekt i fjor:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Nettverksytelse:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Nettverksytelse:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Kjøretøy:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasjoner:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Kjøretøy:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stasjoner:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Spillere:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Kobler på...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spilloversikt..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter firmaoversikt..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} klient(er) foran oss
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} KB lastet ned så langt
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(er) foran oss
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} KB lastet ned så langt
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Koble fra
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikke laste server-lagret spill
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Klarte ikke å starte tjeneren.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Klarte ikke å opprette forbindelse.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tilkobling #{NUMU16} ble tidsavbrutt.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tilkobling #{NUM} ble tidsavbrutt.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Det skjedde en protokoll-feil, så forbindelsen er brutt
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Klientversjonen er ikke den samme som tjenerversjonen.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Feil passord.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-størrelse på kart: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-størrelse på kart: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-størrelse på kart: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-størrelse på kart: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kostnad: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Byer
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Bygningen må rives først
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Innbyggertall: {ORANGE}{COMMA}{BLACK}  Antall hus: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Vis informasjon om bystyret
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} bystyre
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Vurdering av transportfirma:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidier
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tilbudte subsidier:
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} fra {STRING} til {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} fra {STRING2} til {STRING2}
 STR_2028_BY                                                     :{YELLOW} (innen {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Ingen
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Tjenester som allerede er subsidiert:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, inntil {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tilbud om subsidie har gått ut:{}{}{STRING} fra {STRING} til {STRING} vil ikke lenger være subsidiert.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tilbud om subsidie har gått ut:{}{}{STRING} fra {STRING2} til {STRING2} vil ikke lenger være subsidiert.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidie trukket tilbake:{}{}Transport av {STRING} fra {STATION} til {STATION} er ikke lenger subsidiert.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidie-tilbud:{}{}Første transport av {STRING} fra {STRING} til {STRING} vil være subsidiert i et år av bystyret!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale 50% mer i løpet av et år!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale dobbelt så mye i løpet av et år!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale tredobbelt i løpet av et år!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale firedobbelt i løpet av et år!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidie-tilbud:{}{}Første transport av {STRING} fra {STRING2} til {STRING2} vil være subsidiert i et år av bystyret!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale 50% mer i løpet av et år!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale dobbelt så mye i løpet av et år!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale tredobbelt i løpet av et år!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tjeneste subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil betale firedobbelt i løpet av et år!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} bystyret tillater ikke flere flyplasser i denne byen
 STR_2036_COTTAGES                                               :Hytter
 STR_2037_HOUSES                                                 :Hus
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finasier byggingen av nye kommersielle byggninger i byen .{}  Koster: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kjøp 1 års ekslusive transportrettigheter i byen. Bystyre vil bare tillate passasjerer og varer å bruke dine transporttjenester.{} Koster: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestikk bystyret til å forbedre vurderingen av firmaet, men du riskerer å bli bøtlagt hvis du blir oppdaget.{}  Koster: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {STRING}, fører med seg seks måneders veiproblemer.
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {COMPANY}, fører med seg seks måneders veiproblemer.
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under bygging)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...upassende område
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Kan ikke plante trær her...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...for mange skilt
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kan ikke plassere skilt her...
 STR_280A_SIGN                                                   :Skilt
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}For mange bussholdeplasser
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}For mange lasteterminaler
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}For nær en annen jerbanestasjon/lasteterminal
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Må rive eksiterende jernbanestasjon først
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}For nær en annen flyplass
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Må rive eksiterende flyplass først
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}For nærme en annen lasteterminal
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Må rive bussterminal først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Må rive lasteterminal først
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stasjoner
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stasjoner
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...upassende område
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}For nærme enn annen havn
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Nasjonal flyplass
 STR_305AB_LARGE                                                 :{BLACK}Internasjonal flyplass
 STR_305B_SIZE                                                   :{BLACK}Størrelse
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Jernbanestasjon
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Flyplass
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Last inn spill
 STR_4002_SAVE                                                   :{BLACK}Lagre
 STR_4003_DELETE                                                 :{BLACK}Slett
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabyte ledig
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan ikke lese fra disk
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Lagring av spillet feilet
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produksjon sist måned:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportert)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportert)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Sentrer bildet på industriområdet
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ny {STRING} under bygging i nærheten av {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ny {STRING} plantes i nærheten av {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Uten navn{SKIP}
+STR_SV_UNNAMED                                                  :Uten navn
 STR_SV_TRAIN_NAME                                               :Tog {COMMA}
 STR_SV_ROADVEH_NAME                                             :Kjøretøy {COMMA}
 STR_SV_SHIP_NAME                                                :Skip {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Fly {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nord
-STR_SV_STNAME_SOUTH                                             :{STRING} Sør
-STR_SV_STNAME_EAST                                              :{STRING} Øst
-STR_SV_STNAME_WEST                                              :{STRING} Vest
-STR_SV_STNAME_CENTRAL                                           :{STRING} Sentrum
-STR_SV_STNAME_TRANSFER                                          :{STRING} Holdeplass
-STR_SV_STNAME_HALT                                              :{STRING} Stopp
-STR_SV_STNAME_VALLEY                                            :{STRING} Dal
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Høyde
-STR_SV_STNAME_WOODS                                             :{STRING} Skog
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Vann
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Overgang
-STR_SV_STNAME_AIRPORT                                           :{STRING} Flyplass
-STR_SV_STNAME_OILFIELD                                          :{STRING} Oljefelt
-STR_SV_STNAME_MINES                                             :{STRING} Gruve
-STR_SV_STNAME_DOCKS                                             :{STRING} Havn
-STR_SV_STNAME_BUOY_1                                            :{STRING} Bøye 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Bøye 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Bøye 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Bøye 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Bøye 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Bøye 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Bøye 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Bøye 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Bøye 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Anneks
-STR_SV_STNAME_SIDINGS                                           :{STRING} Side
-STR_SV_STNAME_BRANCH                                            :{STRING} Gren
-STR_SV_STNAME_UPPER                                             :Øvre {STRING}
-STR_SV_STNAME_LOWER                                             :Nedre {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Skog
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sør
+STR_SV_STNAME_EAST                                              :{STRING1} Øst
+STR_SV_STNAME_WEST                                              :{STRING1} Vest
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Sentrum
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Holdeplass
+STR_SV_STNAME_HALT                                              :{STRING1} Stopp
+STR_SV_STNAME_VALLEY                                            :{STRING1} Dal
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Høyde
+STR_SV_STNAME_WOODS                                             :{STRING1} Skog
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Vann
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Overgang
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Flyplass
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Oljefelt
+STR_SV_STNAME_MINES                                             :{STRING1} Gruve
+STR_SV_STNAME_DOCKS                                             :{STRING1} Havn
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Bøye 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Bøye 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Bøye 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Bøye 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Bøye 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Bøye 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Bøye 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Bøye 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Bøye 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Anneks
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Side
+STR_SV_STNAME_BRANCH                                            :{STRING1} Gren
+STR_SV_STNAME_UPPER                                             :Øvre {STRING1}
+STR_SV_STNAME_LOWER                                             :Nedre {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Skog
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Spiller {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nytt ansikt
 STR_7005_COLOR_SCHEME                                           :{BLACK}Firmafarge
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Sjefens navn
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Kan ikke endre firmanavn...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Kan ikke bytte navn på sjefen...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Regnskap{BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Regnskap{BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Kostnader/Inntekter
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Konstruksjon
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nye kjøretøy
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Driftkostnader på tog
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Totalt:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Inntektsgraf
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Trykk på fargen du har valgt
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Øk størrelsen på lånet
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Betal tilbake en del av lånet
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Sjef)
-STR_7038_INAUGURATED                                            :{GOLD}Grunnlagt: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Sjef)
+STR_7038_INAUGURATED                                            :{GOLD}Grunnlagt: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Kjøretøy:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tog
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} tog
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Prestasjonsvudering av firma (maks poeng=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Firmaverdi
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Firmarangering
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transportfirma har problemer!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} vil bli solgt eller nedlagt, hvis ikke firmaets økonomi tar seg opp!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Sjef)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} vil bli solgt eller nedlagt, hvis ikke firmaets økonomi tar seg opp!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Sjef)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transportfirma fusjonerer!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} har blitt solgt til {STRING} for {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Vi ser etter et firma som er villig til å overta oss.{}{}Vil du kjøpe {STRING} for {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} har blitt solgt til {COMPANY} for {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Vi ser etter et firma som er villig til å overta oss.{}{}Vil du kjøpe {COMPANY} for {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Konkurs!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} har blitt stengt av kreditorer og alt av verdi har blitt solgt!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} har blitt stengt av kreditorer og alt av verdi har blitt solgt!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nytt transportfirma startet!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} starter bygging i nærheten av {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} starter bygging i nærheten av {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Kan ikke kjøpe firma...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Betalingstakst for varer
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dager i transport
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Selg 25% av aksjene du eier
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan ikke kjøpe 25% av aksjene...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikke selge 25% av aksjene...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eies av {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% eies av {STRING}{}   {COMMA}% eies av {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} har blitt kjøpt opp av {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eies av {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% eies av {COMPANY}{}   {COMMA}% eies av {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} har blitt kjøpt opp av {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Dette selskapet selger ikke aksjer enda...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Togstall
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første tog ankommer {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaljer)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detaljer)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tog i veien
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Kjør til {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Gå til {STATION} (Overfør og ta last)
 STR_8808_GO_TO_UNLOAD                                           :Gå til {STATION} (Last av)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informasjon
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Toget er for langt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tog kan bare endres når det står stille i togstallen
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Tog
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Tog
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye tog/vogner for jernbane
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye tog/vogner for Monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye tog/vogner for Maglev
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Kjør til
 STR_8827_FULL_LOAD                                              :{BLACK}Last fullt
 STR_8828_UNLOAD                                                 :{BLACK}Last av
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordre)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordre)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Slutt på ordre - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Service
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Kan ikke bygge jernbanekjøretøy...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Laster på/av
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Toget må være stoppet i togstallen
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan ikke sende tog til togstall...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren med mindre service trengs.
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} er nå tilgjengelig!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koster: {CURRENCY} Vekt: {COMMA}t{}Fart: {VELOCITY}  Kraft: {COMMA}hk{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koster: {CURRENCY} Vekt: {COMMA}t{}Fart: {VELOCITY}  Kraft: {COMMA}hk{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Havarert
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnad: {LTBLUE}{CURRENCY}/år
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Driftkostnad: {LTBLUE}{CURRENCY}/år
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vekt: {LTBLUE}{COMMA}t  {BLACK}Kraft: {LTBLUE}{COMMA}hk{BLACK} Maks. fart: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Kjøretøy i veien
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Kjøretøy
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Kjøretøy
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Garasje
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nye kjøretøy
 STR_9005_INFORMATION                                            :{BLACK}Informasjon
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Kjøp kjøretøy
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan ikke kjøpe kjøretøy...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Må bygge garasje først
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordre)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
 STR_900E_MAX_SPEED                                              :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}må være stoppet i en garasje
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan ikke selge kjøretøy...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan ikke starte/stoppe kjøretøy...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bygg det valgte kjøretøyet
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nytt kjøretøy er nå tilgjengelig!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koster: {CURRENCY}{}Fart: {VELOCITY}{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koster: {CURRENCY}{}Fart: {VELOCITY}{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Navngi kjøretøy
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Kan ikke navngi kjøretøy...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan ikke bygge havn her...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skipsdepot
 STR_9804_NEW_SHIPS                                              :{BLACK}Nye skip
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skip
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Skip
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan ikke bygge skip...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Må rive skipsdepotet først
 STR_9808_NEW_SHIPS                                              :{WHITE}Nye skip
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Kan ikke selge skip...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Kan ikke bygge skip...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Det er et skip i veien
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordre)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
 STR_9813_MAX_SPEED                                              :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan ikke starte/stoppe skip...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan ikke sende skip til depotet...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan ikke finne et depot i nærheten
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Vis detaljer om skipet
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nytt skip er nå tilgjengelig!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koster: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {STRING}{}Driftkostnader: {CURRENCY}/år
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koster: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {STRING1}{}Driftkostnader: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Navngi skip
 
 STR_9831_NAME_SHIP                                              :{WHITE}Navngi skip
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Endre navnet til skipstypen
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Kan ikke endre navnet til skipstypen...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Bygg om et konteiner skip til å ta en annen type last
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Bygg om)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Bygg om)
 STR_983C_REFIT_SHIP                                             :{BLACK}Bygg om skip
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Velg hvilken last skipet skal ta
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Bygg om skip til å frakte den valgte varetypen
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Velg varetype:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{STRING}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{STRING1}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikke bygge om skip...
 STR_9842_REFITTABLE                                             :(ombyggbart)
 STR_GO_TO_SHIP_DEPOT                                            :Seil til {TOWN} skipsdepot
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nytt fly
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Bygg fly
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan ikke bygge fly...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Fly
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordre)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Fly
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordre)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING2}{BLACK}   Driftkostnader: {LTBLUE}{CURRENCY}/år
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}%  {BLACK}Havarier siden sist service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUMU16}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan ikke sende fly til hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Er på vei til {STATION} hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Er på vei til {STATION} hangar, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan ikke stoppe/starte flyet...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Flyet er i luften
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Må bygge flyplass først
-STR_A019_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Må stå i en hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Kan ikke selge fly...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Bygg flyplass
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Endre navn til flytype
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Kan ikke endre navn...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Bygg om et fly til å ta en annen type last
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (bygg om)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (bygg om)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Bygg om fly
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Velg hvilken last skipet skal ta
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Bygg om skip til å frakte den valgte varetypen
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Velg varetype:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{STRING}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{STRING1}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan ikke bygge om flyet...
 STR_A043_REFITTABLE                                             :(ombyggbart)
 STR_GO_TO_AIRPORT_HANGAR                                        :Fly til {STATION} hangar
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalje
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Kjøretøy:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stasjoner:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Deler:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefiks:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffiks:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Bytt til Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Bytt til Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Bytt til Euro: {ORANGE}aldri
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Forhåndsvis: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Bytt vanlig valutagrense
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vekt: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{COMMA}hk
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Driftskostnad: {GOLD}{CURRENCY}/år
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasitet: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Markedsintrodusert: {GOLD}{NUMU16}{BLACK} Levetid: {GOLD}{COMMA} år
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasitet: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Markedsintrodusert: {GOLD}{NUM}{BLACK} Levetid: {GOLD}{COMMA} år
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks pålitelighet: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kostnad: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vekt: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Hastighet: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasitet: {GOLD}{COMMA} passasjerer, {COMMA} sekker post
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Lokomotivvogner: {GOLD}+{COMMA}hk{BLACK} Vekt: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Lokomotivvogner: {GOLD}+{COMMA}hk{BLACK} Vekt: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/polish.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/polish.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Wymagany plaski teren
 STR_0008_WAITING                                                :{BLACK}Czeka: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (w drodze z
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (w drodze z
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Akceptuje: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Akceptuje: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opcje gry
 STR_00B2_MESSAGE                                                :{YELLOW}Wiadomosc
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Wiadomosc od {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Wiadomosc od {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Niemozna tego zrobic....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nie mozna wyczyscic terenu....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Brytyjski (mile)
 STR_013A_METRIC_KILOMETERS                                      :Metryczny (kilometry)
-STR_013B_OWNED_BY                                               :{WHITE}...w posiadaniu {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...w posiadaniu {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Ladunek
 STR_013D_INFORMATION                                            :{BLACK}Informacja
 STR_013E_CAPACITIES                                             :{BLACK}Pojemnosc
 STR_013E_TOTAL_CARGO                                            :{BLACK}Calkowity ladunek
-STR_013F_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Calkowita pojemnosc tego pociagu:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nowa gra
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauza
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Zapis gry, opuszczenie gry, wyjscie
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Wyswietl liste stacji firmy
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Koszt czyszczenia: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Koszt czyszczenia: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Brak
-STR_01A7_OWNER                                                  :{BLACK}Wlasciciel: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokalne wladze: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Wlasciciel: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokalne wladze: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Brak
 STR_01AA_NAME                                                   :{BLACK}Nazwa
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Wybierz Wprowadzenie/Demo
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Akceptowany ladunek: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Akceptowany ladunek: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Akceptowany ladunek: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Akceptowany ladunek: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Akceptowany ladunek: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Akceptowany ladunek: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Sciezka{SETX 88}Tytul
 STR_01E9_SHUFFLE                                                :{TINYFONT}Przypadkowo
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Wybor Programu
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Wykaz sciezek
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programuj - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Wyczysc
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Ustawienia dla wszystkich typow wiadomosci(wla/wyl/sumarycznie)
 STR_MESSAGE_SOUND                                               :{YELLOW}Graj dzwieki przy sumarycznych wiadomosciach
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...zbyt daleko od poprzedniego celu
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Czolowka firm ktora osiagnela poziom {NUMU16}{}({STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela Ligi Firm w {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Czolowka firm ktora osiagnela poziom {NUM}{}({STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela Ligi Firm w {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Biznesmen
 STR_0214_ENTREPRENEUR                                           :Przedsiebiorca
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon Stulecia
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} osiaga status: '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} z {STRING} osiagnelo status '{STRING}'!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} osiaga status: '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} osiagnelo status '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Wybierz wielkosc miasta
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Wielkosc miasta:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Pokaz ostatnia wiadomosc lub ogloszenie
 STR_OFF                                                         :Wyl
 STR_SUMMARY                                                     :Sumarycznie
 STR_FULL                                                        :Pelne
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Lista miast
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nazwy pojazdow
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Wyl
 STR_CONFIG_PATCHES_ON                                           :Wla
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Pokazuj predkosc pojazdow w pasku statusu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Pozwol budowac na pochylosciach i wybrzezach: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Zezwol na bardziej realistyczny zasieg obejmowania: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Pozwol usuwac drogi, mosty, tunele etc. nalezace do miasta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Pozwol budowac bardzo dlugie pociagi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistyczne przyspieszenie pociagow: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zabron pociagom i statkom skretow o 90st: {ORANGE}{STRING} {LTBLUE} (wymaga NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Polacz stacje budowane jedna obok drugiej: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Wyjazd ze stacji gdy jakis towar jest pelny, gdy 'Zaladunek': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Uzyj ulepszonego algorytmu zaladunku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacja: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Dostarcz ladunek do stacji tylko jesli jest zapotrzebowanie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Pozwol budowac bardzo dlugie mosty: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Zezwalaj na wysylanie do zajezdni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Pozwol budowac obiekty produkujace surowce: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Pozwol na wiele podobnych przedsiebiorstw w miescie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Przedsiebiorstwa jednego typu moga byc bud. obok siebie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Zawsze pokazuj date w dlugim formacie w pasku statusu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Pokazuj semafory po stronie jazdy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Pokazuj okno finansow na koniec roku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Kompatybilnosc obslugi nonstop z TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Kolejki samochodow (with quantum effects): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Przesun okno kiedy kursor jest przy krawedzi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Pozwol dawac lapowki lokalnym wladzom: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Szukanie nowych zajezdni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Niejednolite stacje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nowy algorytm szukania drogi dla pociagow: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nowe szukanie drogi (NPF, zastepuje NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Pokazuj predkosc pojazdow w pasku statusu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Pozwol budowac na pochylosciach i wybrzezach: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Zezwol na bardziej realistyczny zasieg obejmowania: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Pozwol usuwac drogi, mosty, tunele etc. nalezace do miasta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Pozwol budowac bardzo dlugie pociagi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistyczne przyspieszenie pociagow: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zabron pociagom i statkom skretow o 90st: {ORANGE}{STRING1} {LTBLUE} (wymaga NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Polacz stacje budowane jedna obok drugiej: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Wyjazd ze stacji gdy jakis towar jest pelny, gdy 'Zaladunek': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Uzyj ulepszonego algorytmu zaladunku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacja: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Dostarcz ladunek do stacji tylko jesli jest zapotrzebowanie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Pozwol budowac bardzo dlugie mosty: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Zezwalaj na wysylanie do zajezdni: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Pozwol budowac obiekty produkujace surowce: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Pozwol na wiele podobnych przedsiebiorstw w miescie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Przedsiebiorstwa jednego typu moga byc bud. obok siebie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Zawsze pokazuj date w dlugim formacie w pasku statusu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Pokazuj semafory po stronie jazdy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Pokazuj okno finansow na koniec roku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Kompatybilnosc obslugi nonstop z TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Kolejki samochodow (with quantum effects): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Przesun okno kiedy kursor jest przy krawedzi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Pozwol dawac lapowki lokalnym wladzom: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Szukanie nowych zajezdni: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Niejednolite stacje: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nowy algorytm szukania drogi dla pociagow: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nowe szukanie drogi (NPF, zastepuje NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Zawsze zezwalaj budowac male lotniska: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Zawsze zezwalaj budowac male lotniska: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Pociag zagubil sie jesli nie porusza sie przez: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Pociag zagubil sie jesli nie porusza sie przez: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Pociag zagubil sie jesli nie porusza sie: {ORANGE}niedostepne
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Przejrzyj polecenia pojazdow: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Przejrzyj polecenia pojazdow: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nie
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :tak, ale wyklucz pojazdy zatrzymane
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :wszystkich pojazdow
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Ostrzegaj jesli pociag przynosi straty: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Pojazdy nigdy nie starzeja sie: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Ostrzegaj jesli pociag przynosi straty: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Pojazdy nigdy nie starzeja sie: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autoodnowienie pojazdu gdy staje sie stary
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autoodnowienie nastepuje {ORANGE}{STRING}{LTBLUE} miesiecy przed/po maks wieku
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimalna ilosc pieniedzy potrzebna do autoodnowienia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Czas trwania komunikatu o bledzie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Pokaz populacje miasta w jego nazwie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Niewidoczne drzewa (razem z przezroczystymi budynkami): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Wysokosc granicy wiecznych sniegow: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks wielkosc stacji: {ORANGE}{STRING} {RED}Uwaga: Duze wartosci spowalniaja gre
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Serwisuj helikoptery na lotniskach automatycznie: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks liczba pociagow na gracza: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks liczba samochodow na gracza: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks liczba samolotow na gracza: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks liczba statkow na gracza: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autoodnowienie nastepuje {ORANGE}{STRING1}{LTBLUE} miesiecy przed/po maks wieku
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimalna ilosc pieniedzy potrzebna do autoodnowienia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Czas trwania komunikatu o bledzie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Pokaz populacje miasta w jego nazwie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Niewidoczne drzewa (razem z przezroczystymi budynkami): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Wysokosc granicy wiecznych sniegow: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks wielkosc stacji: {ORANGE}{STRING1} {RED}Uwaga: Duze wartosci spowalniaja gre
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Serwisuj helikoptery na lotniskach automatycznie: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Pociagi niedostepne dla komputera: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Samochody niedostepne dla komputera: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Samoloty niedostepne dla komputera: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Statki niedostepne dla komputera: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks liczba pociagow na gracza: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks liczba samochodow na gracza: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maks liczba samolotow na gracza: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maks liczba statkow na gracza: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Dostepne nowe AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Pociagi niedostepne dla komputera: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Samochody niedostepne dla komputera: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Samoloty niedostepne dla komputera: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Statki niedostepne dla komputera: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Domyslny okres miedzy serwis. dla pociagow: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Dostepne nowe AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Domyslny okres miedzy serwis. dla pociagow: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Domyslny okres miedzy serwis. dla pociagow: {ORANGE}niedostepne
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Domyslny okres miedzy serwis. dla samochodow: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Domyslny okres miedzy serwis. dla samochodow: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Domyslny okres miedzy serwis. dla samochodow: {ORANGE}niedostepne
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Domyslny okres miedzy serwis. dla samolotow: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Domyslny okres miedzy serwis. dla samolotow: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Domyslny okres miedzy serwis. dla samolotow: {ORANGE}niedostepne
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Domyslny okres miedzy serwis. dla statkow: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Domyslny okres miedzy serwis. dla statkow: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Domyslny okres miedzy serwis. dla statkow: {ORANGE}niedostepne
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Serwis niedostepny jesli uszkodzenia pojazdow wylaczone: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Serwis niedostepny jesli uszkodzenia pojazdow wylaczone: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Pojawianie sie kolorowych wiadomosci w: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data rozpoczecia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Data zakonczenia: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Pojawianie sie kolorowych wiadomosci w: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data rozpoczecia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Data zakonczenia: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Pozwol na lagodna ekonomie (male zmiany)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Pozwol kupowac udzialy w innych firmach
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}W trakcie przeciagania ustaw sygnaly co: {ORANGE}{STRING} kratke(i)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Zezwol na automatyczne stawianie sygnalow pbs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozycja glownego paska narzedzi: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}W trakcie przeciagania ustaw sygnaly co: {ORANGE}{STRING1} kratke(i)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Zezwol na automatyczne stawianie sygnalow pbs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozycja glownego paska narzedzi: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :z lewej
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :centralnie
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :z prawej
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Strefa przyciagania okien: {ORANGE}{STRING} pkt
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Strefa przyciagania okien: {ORANGE}{STRING1} pkt
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Strefa przyciagania okien: {ORANGE}niedostepne
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfejs
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Zawodnicy
 
 STR_CONFIG_PATCHES_DISABLED                                     :niedostepne
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Zmiana wartosci
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Uwaga! Wlasnie chcesz zdradzic swoich wspolnikow. Zwaz, ze zostanie to zapamietane na wieki!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Zwieksz ilosc pieniedzy o {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Gra jako gracz: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magiczny buldozer (usuwanie przedsiebiorstw etc.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunele moga sie krzyzowac: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Budowanie w czasie pauzy: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magiczny buldozer (usuwanie przedsiebiorstw etc.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunele moga sie krzyzowac: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Budowanie w czasie pauzy: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Odrzutowce nie beda sie rozbijac (czesto) na malych lotniskach: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Zmien klimat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Zmien date: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Pozwol modyfikowac wielkosc produkcji: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Pozwol modyfikowac wielkosc produkcji: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Zmierza do {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Zmierza do {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... boja w uzyciu!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Pozycja: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Pozycja: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nie mozna usunac czesci stacji...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Nie mozna zmienic typu torow w tym miejscu...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Wybuduj kopalnie cukru
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Przemysl
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% przetransportowano)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% przetransportowano)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% przetransportowano)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% przetransportowano)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zbyt blisko innego przedsiebiorstwa
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa pociagu do przewozu innego ladunku
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Przebudowa)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Przebudowa pociagu
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz typ ladunku jaki ma przewozic pociag
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Przebudowa pociagu do przewozu podswietlonych towarow
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nie mozna przebudowac pociagu...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Okres miedzy serwisowania w procentach: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Okres miedzy serwisowania w procentach: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmiana produkcji
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Witamy w nowym AI. Mozesz oczekiwac problemow. Gdy to sie stanie, wykonaj zrzut ekranu i wyslij go na forum. Powodzenia!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Krajobraz:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Rozmiar mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Wersja serwera:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adres serwera:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adres serwera:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data uruchomienia:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Biezaca data:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Chronione haslem!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO O FIRMIE
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nazwa firmy:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguracja:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguracja:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Wartosc firmy:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Biezacy bilans:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Przychod w ostatnim roku:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Wydajnosc:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Wydajnosc:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Pojazdy:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stacje:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Pojazdy:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stacje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Gracze:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Laczenie...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Uzyskiwanie informacji o grze..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Uzyskiwanie informacji o firmach..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} klientow chce sie przylaczyc
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kB dotad pobranych
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klientow chce sie przylaczyc
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kB dotad pobranych
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Rozlaczony
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nie mozna wczytac zapisanej gry z serwera.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nie mozna uruchomic serwera.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nie mozna polaczyc.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Przekroczony limit czasu dla polaczenia #{NUMU16}.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Przekroczony limit czasu dla polaczenia #{NUM}.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Blad protokolu, polaczenie zostalo przerwane.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Wersja gry nie zgadza sie z wersja gry na serwerze.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Zle haslo.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Rozmiar mapy X: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Rozmiar mapy Y: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Rozmiar mapy X: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Rozmiar mapy Y: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Koszt: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Miasta
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budynek musi byc najpierw zburzony
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Populacja: {ORANGE}{COMMA}{BLACK}  Domow: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Pokaz informacje o lokalnych wladzach
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} lokalne wladze
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ocena transportu firmy:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsydia
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta subsydiow dla uslugi przewozu:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING} do {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING2} do {STRING2}
 STR_2028_BY                                                     :{YELLOW} (do {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Zadne
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Uslugi juz subsydiowane:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsydiowanie wygaslo:{}{}{STRING} z {STRING} do {STRING} juz nie bedzie dotowane.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsydiowanie wygaslo:{}{}{STRING} z {STRING2} do {STRING2} juz nie bedzie dotowane.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Koniec dotacji:{}{}{STRING} usluga z {STATION} do {STATION} juz nie jest subsydiowana
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Oferta uslugi dotowanej:{}{}Pierwszy przewoz {STRING} z  {STRING} do {STRING} bedzie dotowane przez rok przez lokalne wladze!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {STRING}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony 50% wiecej przez nastepny rok!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {STRING}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony podwojnie przez nastepny rok!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {STRING}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony potrojnie przez nastepny rok!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {STRING}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony poczwornie przez nastepny rok!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Oferta uslugi dotowanej:{}{}Pierwszy przewoz {STRING} z  {STRING2} do {STRING2} bedzie dotowane przez rok przez lokalne wladze!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {COMPANY}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony 50% wiecej przez nastepny rok!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {COMPANY}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony podwojnie przez nastepny rok!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {COMPANY}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony potrojnie przez nastepny rok!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Przyznano subsydia dla {COMPANY}!{}{}Przewoz {STRING} z {STATION} do {STATION} bedzie placony poczwornie przez nastepny rok!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} lokalne wladze nie pozwalaja na budowe nastepnego lotniska w tym miescie
 STR_2036_COTTAGES                                               :Domki
 STR_2037_HOUSES                                                 :Domy
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Ufundowanie nowych budynkow handlowych w miescie.{}  Koszt: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kup roczna wylacznosc na prawa transportowe w miescie. Lokalne wladze pozwala kozystac tylko ze stacji twojej firmy.{} Koszt: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Daj lapowke lokanym wladzom, powieksz swoja ocene, ryzykujac powazne kary w razie zlapania.{}  Koszt: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Chaos na drogach w {TOWN}!{}{}Program przebudowy drog ufundowany przez {STRING} prowadzi do 6 miesiecy meki dla kierowcow!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Chaos na drogach w {TOWN}!{}{}Program przebudowy drog ufundowany przez {COMPANY} prowadzi do 6 miesiecy meki dla kierowcow!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (w budowie)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...niewlasciwe miejsce
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Nie mozna posadzic drzewa...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...zbyt wiele napisow
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Nie mozna umiescic napisu...
 STR_280A_SIGN                                                   :Napis
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Zbyt wiele przystankow autobusowych
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Zbyt wiele stacji dla ciezarowek
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Zbyt blisko innej stacji/miejsca zladunk.
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Musisz najpierw zniszczyc stacje
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Zbyt blisko innego lotniska
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Musisz najpierw zniszczyc lotnisko
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Zbyt blisko innego przystanku ciez.
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Musisz zniszczyc najpierw przystanek
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Musisz najpierw zniszczyc przystanek.
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stacje
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stacje
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...niewlasciwe miejsce
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Zbyt blisko innego portu
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Lotnisko metropoli
 STR_305AB_LARGE                                                 :{BLACK}Lotnisko miedzynarodowe
 STR_305B_SIZE                                                   :{BLACK}Rozmiar
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Stacja kolejowa
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Lotnisko
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Zaladuj gre
 STR_4002_SAVE                                                   :{BLACK}Zapisz
 STR_4003_DELETE                                                 :{BLACK}Usun
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} MB wolnego
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nie mozna odczytac napedu
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Nie mozna zapisac gry
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Wyprodukowano w ostatnim miesiacu:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% przetransportowano)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% przetransportowano)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centruj glowny widok na przedsiebiorstwie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Rozpoczeto budowe nowego {STRING} blisko {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nowy {STRING} zostal obsadzony blisko {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Bez nazwy{SKIP}
+STR_SV_UNNAMED                                                  :Bez nazwy
 STR_SV_TRAIN_NAME                                               :Pociag {COMMA}
 STR_SV_ROADVEH_NAME                                             :Samochod {COMMA}
 STR_SV_SHIP_NAME                                                :Statek {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Samolot {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Polnoc
-STR_SV_STNAME_SOUTH                                             :{STRING} Poludnie
-STR_SV_STNAME_EAST                                              :{STRING} Wschod
-STR_SV_STNAME_WEST                                              :{STRING} Zachod
-STR_SV_STNAME_CENTRAL                                           :{STRING} Centrum
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :{STRING} Stop
-STR_SV_STNAME_VALLEY                                            :{STRING} Dolina
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Wzgorza
-STR_SV_STNAME_WOODS                                             :{STRING} Tartak
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Jezioro
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Gielda
-STR_SV_STNAME_AIRPORT                                           :{STRING} Lotnisko
-STR_SV_STNAME_OILFIELD                                          :{STRING} Nafta
-STR_SV_STNAME_MINES                                             :{STRING} Kopalnia
-STR_SV_STNAME_DOCKS                                             :{STRING} Port
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boja 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boja 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boja 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boja 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boja 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boja 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boja 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boja 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boja 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Pawilon
-STR_SV_STNAME_SIDINGS                                           :{STRING} Bocznica
-STR_SV_STNAME_BRANCH                                            :{STRING} Rozjazd
-STR_SV_STNAME_UPPER                                             :{STRING} Gorny
-STR_SV_STNAME_LOWER                                             :{STRING} Dolny
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Las
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Polnoc
+STR_SV_STNAME_SOUTH                                             :{STRING1} Poludnie
+STR_SV_STNAME_EAST                                              :{STRING1} Wschod
+STR_SV_STNAME_WEST                                              :{STRING1} Zachod
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Centrum
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :{STRING1} Stop
+STR_SV_STNAME_VALLEY                                            :{STRING1} Dolina
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Wzgorza
+STR_SV_STNAME_WOODS                                             :{STRING1} Tartak
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Jezioro
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Gielda
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Lotnisko
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Nafta
+STR_SV_STNAME_MINES                                             :{STRING1} Kopalnia
+STR_SV_STNAME_DOCKS                                             :{STRING1} Port
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boja 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boja 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boja 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boja 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boja 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boja 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boja 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boja 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boja 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Pawilon
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Bocznica
+STR_SV_STNAME_BRANCH                                            :{STRING1} Rozjazd
+STR_SV_STNAME_UPPER                                             :{STRING1} Gorny
+STR_SV_STNAME_LOWER                                             :{STRING1} Dolny
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Las
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Gracz {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}nowa twarz
 STR_7005_COLOR_SCHEME                                           :{BLACK}Schemat koloru
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Prezesa
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nie mozna zmienic nazwy firmy...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nie mozna zmienic nazwiska prezesa...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanse {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanse {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Wydatki/Przychody
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Konstrukcje
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nowe pojazdy
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Utrzymanie pociagow
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Calkowicie:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Wykres przychodow
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Kliknij na nowym schemacie kolorow
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Zwieksz wielkosc pozyczki
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Zwroc czesc pozyczki
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Prezes)
-STR_7038_INAUGURATED                                            :{GOLD}Inauguracja: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Prezes)
+STR_7038_INAUGURATED                                            :{GOLD}Inauguracja: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Pojazdy:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} pociag
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} pociagi(ow)
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Ocena dzialalnosci firmy (max. ocena=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Wartowsc firmy
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Tabela Ligi Firm
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Firma ma problemy!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} bedzie odsprzedane lub oglosi bankructwo jezeli zysk firmy nie wzrosnie!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Prezes)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} bedzie odsprzedane lub oglosi bankructwo jezeli zysk firmy nie wzrosnie!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Prezes)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Polaczenie firm transportowych!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} zostal sprzedany {STRING} za {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Szukamy firmy transportowej zeby przejela nasza firme{}{}Czy chcesz kupic {STRING} za {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} zostal sprzedany {COMPANY} za {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Szukamy firmy transportowej zeby przejela nasza firme{}{}Czy chcesz kupic {COMPANY} za {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrut!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} zostaje zamkniety przez wierzycieli i wszystkie udzialy zostaja sprzedane!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} zostaje zamkniety przez wierzycieli i wszystkie udzialy zostaja sprzedane!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nowa firma zaczela dzialalnosc!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} zaczyna budowe niedaleko {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} zaczyna budowe niedaleko {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nie mozna kupic firmy...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Oplaty za przewoz
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dni w transporcie
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sprzedaj 25% udzialow w tej firmie
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nie mozna kupic 25% udzialow w tej firmie...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}nie mozna sprzedac 25% udzialow w tej firmie...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% w posiadaniu przez {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% w posiadaniu przez {STRING}{}   {COMMA}% w posiadaniu przez {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} zostalo przejete przez {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% w posiadaniu przez {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% w posiadaniu przez {COMPANY}{}   {COMMA}% w posiadaniu przez {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} zostalo przejete przez {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Ta firma nie sprzedaje jeszcze akcji...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Zajezdnia
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkancy swietuja . . .{}Pierwszy pociag przybyl do {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Szczegoly)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Szczegoly)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Pociag na drodze
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Idz do {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Idz do {STATION} (Przewiez i wez cargo)
 STR_8808_GO_TO_UNLOAD                                           :Idz do {STATION} (Wyladunek)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informacje
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Pociag zbyt dlugi
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Pociag moze byc modyfikowany tylko jak jest zatrzymany w zajezdni
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Pociagi
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Pociagi
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nowe pociagi
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nowe pociagi jednoszynowe
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nowe pociagi Maglev
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Idz do
 STR_8827_FULL_LOAD                                              :{BLACK}Zaladunek
 STR_8828_UNLOAD                                                 :{BLACK}Rozladunek
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Kolejnosc)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Kolejnosc)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Koniec polecen - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Serwis
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nie mozna wybudowac lokomotywy...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Budowa: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Budowa: {LTBLUE}{NUM}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Wartosc: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Zaladunek / Rozladowanie
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Pociag musi byc zatrzymany w zajezdni
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nie mozna wyslac pociagu do zajezdni...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Pomin to polecenie jesli jest wymagany serwis
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nowa {STRING} juz dostepna!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koszt: {CURRENCY} Waga: {COMMA}t{}Predkosc: {VELOCITY}  Moc: {COMMA}KM{}Utrzymanie: {CURRENCY}/rok{}Pojemnosc: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Koszt: {CURRENCY} Waga: {COMMA}t{}Predkosc: {VELOCITY}  Moc: {COMMA}KM{}Utrzymanie: {CURRENCY}/rok{}Pojemnosc: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Awaria
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING2}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Waga: {LTBLUE}{COMMA}t  {BLACK}Moc: {LTBLUE}{COMMA}KM{BLACK} Max. predkosc: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (w ostatnim roku: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Samochod na drodze
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Samochody
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Samochody
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Zajezdnia samochodowa
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nowe pojazdy
 STR_9005_INFORMATION                                            :{BLACK}Informacje
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Zbuduj pojazd
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nie mozna zbudowac samochodu...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Musisz najpierw zbudowac zajezdnie samochodowa
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Polecenia)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Szczegoly)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Szczegoly)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING2}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_900E_MAX_SPEED                                              :{BLACK}Max. predkkosc: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (ostatni rok: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Zbudowany: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Zbudowany: {LTBLUE}{NUM}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...musi byc zatrzymany w zajezdni samochodowej
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nie mozna sprzedac samochodu...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nie mozna zatrzymac/ruszyc samochodu...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Zbuduj wybrany samochod
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Dostepny jest nowy samochod!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koszt: {CURRENCY}{}Predkosc: {VELOCITY}{}Utrzymanie: {CURRENCY}/rok{}Pojemnosc: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koszt: {CURRENCY}{}Predkosc: {VELOCITY}{}Utrzymanie: {CURRENCY}/rok{}Pojemnosc: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nazwij samochod
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nie mozna nazwac samochodu...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nie mozna tutaj wybudowac portu...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Stocznia
 STR_9804_NEW_SHIPS                                              :{BLACK}Nowe statki
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Statki
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Statki
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nie mozna zbudowac statku...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Trzeba najpierw zbudowac stocznie
 STR_9808_NEW_SHIPS                                              :{WHITE}Nowe statki
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Nie mozna sprzedac statku...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Nie mozna wybudowac statku...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Statek na drodze
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Polecenia)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Szczegoly)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Szczegoly)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING2}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_9813_MAX_SPEED                                              :{BLACK}Max. predkosc: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (w ostatnim roku: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Wybudowany: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Wybudowany: {LTBLUE}{NUM}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nie mozna zatrzymac/ruszyc statku...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nie mozna wyslac statku do stoczni...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nie mozna znalezc zajezdni
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Pokaz szczegoly statku
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Dostepny nowy statek!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koszt: {CURRENCY} Max. Predkosc: {VELOCITY}{}Pojemnosc: {STRING}{}Utrzymanie: {CURRENCY}/rok
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koszt: {CURRENCY} Max. Predkosc: {VELOCITY}{}Pojemnosc: {STRING1}{}Utrzymanie: {CURRENCY}/rok
 STR_982F_NAME_SHIP                                              :{BLACK}Nazwa statku
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nazwa statku
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Zmien nazwe typu statku
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nie mozna zmienic nazwy typu statku...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Przebuduj statek aby przewozil inny rodzaj towaru
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Przebudowa)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Przebudowa)
 STR_983C_REFIT_SHIP                                             :{BLACK}Przebudowa statku
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz typ ladunku jaki ma przewozic statek
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Zmien statek zeby mogl przewozic zaznaczony typ ladunku
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wybierz typ ladunku do przewozu:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemnosc: {GOLD}{STRING}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemnosc: {GOLD}{STRING1}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nie mozna przebudowac statku...
 STR_9842_REFITTABLE                                             :(zm. typu lad.)
 STR_GO_TO_SHIP_DEPOT                                            :Idz do stoczni w {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nowy samolot
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Budowa samolotu
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nie mozna zbudowac samolotu...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Samolot
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Polecenia)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Szczegoly)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Samolot
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Polecenia)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Szczegoly)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING2}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. predkosc: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY}  (w ostatnim roku: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Niezawodnosc: {LTBLUE}{COMMA}%  {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Zbudowany: {LTBLUE}{NUMU16}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Zbudowany: {LTBLUE}{NUM}{BLACK} Wartosc: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nie mozna wyslac samolotu do hangaru...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Zmierza do hangaru w {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Zmierza do hangaru w {STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nie mozna zatrzymac/ruszyc samolotu
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Samolot wlasnie leci
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Trzeba najpierw zbudowac lotnisko
-STR_A019_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Pojemnosc: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Samolot musi byc zatrzymany w hangarze
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nie mozna sprzedac samolotu...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Konstrukcje lotnicze
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Zmien nazwe typu samolotu
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nie mozna zmienic nazwy typu samolotu...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Przebudowa samolotu do przewozu innego towaru
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Przebudowa)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Przebudowa)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Przebudowa samolotu
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz typ towaru jaki ma przenosic samolot
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Przebudowa samolotu do przewozu podswietlonych towarow
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wybierz typ towaru do przewozu:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemnosc: {GOLD}{STRING}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemnosc: {GOLD}{STRING1}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nie mozna przebudowac samolotu...
 STR_A043_REFITTABLE                                             :(zm. typ lad.)
 STR_GO_TO_AIRPORT_HANGAR                                        :Idz do hangaru na {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Szczegoly
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Pojazdy:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stacje:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefiks:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufiks:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Przejscie na Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Przejscie na Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Przejscie  na Euro: {ORANGE}nigdy
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Podglad: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zmien wlasny parametr waluty
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Koszt: {GOLD}{CURRENCY}{BLACK} Waga: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Predkosc: {GOLD}{VELOCITY}{BLACK}   Moc: {GOLD}{COMMA}KM
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Koszty uzytkowania: {GOLD}{CURRENCY}/rok
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Ladownosc: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Zaprojektowany: {GOLD}{NUMU16}{BLACK} Zywotnosc: {GOLD}{COMMA} lat
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Ladownosc: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Zaprojektowany: {GOLD}{NUM}{BLACK} Zywotnosc: {GOLD}{COMMA} lat
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maksymalna niezawodnosc: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Koszt: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Waga: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Koszt: {GOLD}{CURRENCY}{BLACK} Predkosc: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Ladownosc: {GOLD}{COMMA} pasazerow, {COMMA} sztuk poczty
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moc: {GOLD}+{COMMA}koni mechanicznych{BLACK} Waga: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moc: {GOLD}+{COMMA}koni mechanicznych{BLACK} Waga: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/portuguese.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/portuguese.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}É necessário terreno plano
 STR_0008_WAITING                                                :{BLACK}Em espera: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (em rota de
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (em rota de
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Aceita: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Aceita: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opções do Jogo
 STR_00B2_MESSAGE                                                :{YELLOW}Mensagem
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensagem de {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensagem de {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Não é possível fazer isto....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Não é possível limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (milhas)
 STR_013A_METRIC_KILOMETERS                                      :Métrico (quilómetros)
-STR_013B_OWNED_BY                                               :{WHITE}...propriedade de {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...propriedade de {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Informação
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
-STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidade) deste comboio:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Novo Jogo
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pausa
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Guardar jogo, abandonar jogo, sair
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostrar lista de estações da empresa
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Custo para limpar: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Custo para limpar: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
-STR_01A7_OWNER                                                  :{BLACK}Proprietário: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Proprietário: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Nenhum
 STR_01AA_NAME                                                   :{BLACK}Nome
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demonstração
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceite: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Carga aceite: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Carga aceite: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Carga aceite: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceite: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceite: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}'{STRING}'
+STR_01E7                                                        :{DKGREEN}{TINYFONT}'{STRING1}'
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Faixa{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Baralhar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programação Musical
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} '{STRING}'
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   '{STRING}'
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} '{STRING1}'
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   '{STRING1}'
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de faixas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Limpar
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Configuração para todos os tipos de mensagens (ligado/desligado/resumo)
 STR_MESSAGE_SOUND                                               :{YELLOW}Alerta sonoro para resumos de mensagens noticiosas
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Muito distante do destino anterior
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de companhias que chegaram a {NUMU16}{}({STRING} Nivél)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela de Liga de Companhias em {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de companhias que chegaram a {NUM}{}({STRING} Nivél)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabela de Liga de Companhias em {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Negociante
 STR_0214_ENTREPRENEUR                                           :Empresário
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Grande magnate
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate do século
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} conquista '{STRING}' desempenho!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} conquista '{STRING}' desempenho!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} conquista '{STRING}' desempenho!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista '{STRING}' desempenho!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Seleccione o tamanho da cidade
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Tamanho da cidade:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Mostrar a última mensagem ou notícia
 STR_OFF                                                         :Desligado
 STR_SUMMARY                                                     :Resumo
 STR_FULL                                                        :Completo
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Lista de cidades
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nomes dos veículos
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Off
 STR_CONFIG_PATCHES_ON                                           :On
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar velocidade do veículo na barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permitir a construção em declives e encostas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir dimensionamento mais realista das áreas de abrangência: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permitir a remoção de mais estradas, pontes, etc. das cidades: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permitir a construção de comboios muito longos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar aceleração realista para comboios: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Proibir comboios e barcos de virar angulos de 90 graus: {ORANGE}{STRING} {LTBLUE} (requires NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Juntar estações ferroviárias construídas pegadas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Deixar a estação quando uma das cargas estiver completa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflação: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar carga a uma estação só quando houver procura: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir a construção de pontes muito longas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permitir ordens de ir para o depósito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permitir construção de produções de matérias-primas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Indústrias do mesmo tipo podem ser construídas perto: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre a data completa na barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado da circulação: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar janela das finanças no fim do ano: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Função non-stop compatível com TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fila de veículos de estrada (com efeitos de quantidade): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o rato está na borda do mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Novo sistema de localização de depósitos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estações não uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novo sistema para calcular trajectórias dos comboios: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova procura de caminho global (NPF, overrides NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar velocidade do veículo na barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permitir a construção em declives e encostas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir dimensionamento mais realista das áreas de abrangência: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permitir a remoção de mais estradas, pontes, etc. das cidades: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permitir a construção de comboios muito longos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar aceleração realista para comboios: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Proibir comboios e barcos de virar angulos de 90 graus: {ORANGE}{STRING1} {LTBLUE} (requires NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Juntar estações ferroviárias construídas pegadas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Deixar a estação quando uma das cargas estiver completa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflação: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar carga a uma estação só quando houver procura: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir a construção de pontes muito longas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permitir ordens de ir para o depósito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permitir construção de produções de matérias-primas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Indústrias do mesmo tipo podem ser construídas perto: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar sempre a data completa na barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado da circulação: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar janela das finanças no fim do ano: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Função non-stop compatível com TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fila de veículos de estrada (com efeitos de quantidade): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o rato está na borda do mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Novo sistema de localização de depósitos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estações não uniformes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novo sistema para calcular trajectórias dos comboios: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nova procura de caminho global (NPF, overrides NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Um comboio está perdido se não houver progresso em: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Um comboio está perdido se não houver progresso em: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Um comboio está perdido se não houver progresso em: {ORANGE}Desactivado
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :Não
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :Sim, mas excluir veículos parados
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :de todos os veículos
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar se o lucro de um comboio for negativo: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Veículos nunca expiram: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar se o lucro de um comboio for negativo: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Veículos nunca expiram: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Auto-renovação de veículos quando ficam velhos
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Auto-renovação do veículo {ORANGE}{STRING}{LTBLUE} meses antes/depois da idade máx.
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Dinheiro mínimo para fazer auto-renovação: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duração das mensagens de erro: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra população da cidade na janela da cidade: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árvores invisíveis (com edifícios transparentes): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura da linha de neve: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Tamanho máx. de estações: {ORANGE}{STRING} {RED}Valores altos tornam o jogo lento!
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máximo de comboios por jogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máximo de veículos de estrada por jogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Máximo de aeronaves por jogador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Máximo de barcos por jogador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Auto-renovação do veículo {ORANGE}{STRING1}{LTBLUE} meses antes/depois da idade máx.
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Dinheiro mínimo para fazer auto-renovação: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duração das mensagens de erro: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Mostra população da cidade na janela da cidade: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árvores invisíveis (com edifícios transparentes): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura da linha de neve: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Tamanho máx. de estações: {ORANGE}{STRING1} {RED}Valores altos tornam o jogo lento!
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar comboios para o computador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactivar veículos de estrada para o computador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeronaves para o computador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar barcos para o computador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máximo de comboios por jogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máximo de veículos de estrada por jogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Máximo de aeronaves por jogador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Máximo de barcos por jogador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nova IA (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar comboios para o computador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactivar veículos de estrada para o computador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeronaves para o computador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar barcos para o computador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de serviço predefinido para comboios: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nova IA (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de serviço predefinido para comboios: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervalo de serviço predefinido para comboios: {ORANGE}desactivado
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de serviço predefinido para veículos de estrada: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de serviço predefinido para veículos de estrada: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Intervalo de serviço predefinido para veículos de estrada: {ORANGE}desactivado
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de serviço predefinido para aeronaves: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de serviço predefinido para aeronaves: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Intervalo de serviço predefinido para aeronaves: {ORANGE}desactivado
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de serviço predefinido para barcos: {ORANGE}{STRING} dias
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de serviço predefinido para barcos: {ORANGE}{STRING1} dias
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalo de serviço predefinido para barcos: {ORANGE}desactivado
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar manutenção quando as avarias estão em nenhuma: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar manutenção quando as avarias estão em nenhuma: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Noticias a cores aparecem em: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data de início: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Terminar jogo em: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Noticias a cores aparecem em: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Data de início: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Terminar jogo em: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Activar economia regular (alterações menores)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permite comprar acções de outras companhias
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ao arrastar colocar sinais a cada: {ORANGE}{STRING} quadrado(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permitir posicionamento automático de sinais pbs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posição da barra de ferramentas principal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ao arrastar colocar sinais a cada: {ORANGE}{STRING1} quadrado(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permitir posicionamento automático de sinais pbs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posição da barra de ferramentas principal: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Esquerda
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centro
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Direita
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Raio de atracção de janelas: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Raio de atracção de janelas: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Raio de atracção de janelas: {ORANGE}desactivado
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interface
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Oponentes
 
 STR_CONFIG_PATCHES_DISABLED                                     :desactivado
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Alterar valor
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Atenção! Está prestes a trair os seus oponentes. Tenha em conta que isto ficará registado para sempre.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Aviões a jacto não irão ter acidentes em aeroportos pequenos: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Mudar de clima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Alterar data: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificação de valores de produção: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificação de valores de produção: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Dirige-se a {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Dirige-se a {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...boia está em uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Não é possível remover parte da estação...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Não é possível converter o tipo de linha aqui...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir Mina de Açúcar
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Adaptar comboio para um tipo de carga diferente
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Adaptar)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Adaptar comboio
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga do comboio
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Adaptar comboio para transportar a carga seleccionada
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Não é possível ajustar comboio...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Os intervalos de serviço são em percentagem: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Os intervalos de serviço são em percentagem: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Bem-vindo à nova IA, ainda em desenvolvimento. Pode encontrar problemas. Neste caso faça uma captura de ecrã e coloque-a no fórum. Divirta-se!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protegido por password!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAÇÃO DA COMPANHIA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da empresa:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valor da Companhia: {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanço actual: {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veículos:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estações:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Veículos:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estações:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Jogadores: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}A ligar...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}A obter a informação de jogo..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}A obter a informação da Companhia..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} cliente(s) à sua frente
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes obtidos até agora
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) à sua frente
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes obtidos até agora
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desligar
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Não foi possível abrir o jogo.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Não foi possível iniciar o servidor
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Não foi possível estabelecer ligação
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tempo de espera esgotado na conexão #{NUMU16}.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tempo de espera esgotado na conexão #{NUM}.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Ocorreu um erro de protocolo e a ligação foi encerrada
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} A revisão deste cliente não condiz com a revisão do servidor
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Palavra-chave incorrecta
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-tamanho do mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-tamanho do mapa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-tamanho do mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-tamanho do mapa: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Custo: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}O edifício deve ser demolido primeiro
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}População: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Ver informações sobre a autoridade local
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} autoridade local
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Avaliações da companhia de transporte
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsídios
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta de subsídios para os serviços:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} para {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING2} para {STRING2}
 STR_2028_BY                                                     :{YELLOW} (por {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Nenhum
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Serviços já subsidiados:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, até {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} já não é subsidiado.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A oferta do subsídio expirou:{}{}{STRING} de {STRING2} para {STRING2} já não é subsidiado.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsídio retirado:{}{}serviço de transporte de {STRING} de {STATION} para {STATION} já não é subsidiado.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsídio de ligação oferecido:{}{}Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá o subsídio de um ano da autoridade local!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará 50% extra durante o próximo ano!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará a dobrar durante o próximo ano!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará a triplicar durante o próximo ano!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {STRING}!{}{}{STRING} ligação de {STATION} para {STATION} pagará a quadruplicar durante o próximo ano!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsídio de ligação oferecido:{}{}Primeiro serviço de {STRING} de {STRING2} para {STRING2} atrairá o subsídio de um ano da autoridade local!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará 50% extra durante o próximo ano!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará a dobrar durante o próximo ano!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará a triplicar durante o próximo ano!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsídio de ligação concedido a {COMPANY}!{}{}{STRING} ligação de {STATION} para {STATION} pagará a quadruplicar durante o próximo ano!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} a autoridade local recusa permitir que outro aeroporto seja construído nesta cidade
 STR_2036_COTTAGES                                               :Casas de campo
 STR_2037_HOUSES                                                 :Casas
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}  Custo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e a carga usem somente estações da sua companhia.{} Custo: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {STRING} provoca 6 meses de miséria aos condutores!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {COMPANY} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (em construção)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...local impróprio
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Impossível plantar árvore aqui...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...demasiados sinais
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Não pode colocar um sinal aqui...
 STR_280A_SIGN                                                   :Sinal
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paragens de autocarro
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Too many lorry stations
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Muito junto de uma estação/local de carga
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Precisa de demolir a estação primeiro
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Demasiado perto de outro aeroporto
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Precisa de demolir o aeroporto primeiro
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Demasiado perto de outra estação de carga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa de demolir a estação de autocarros primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa de demolir a estação de carga primeiro
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estações
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estações
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...sítio inadequado
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Muito perto de outra doca
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Aeroporto Metropolitano
 STR_305AB_LARGE                                                 :{BLACK}Aeroporto Internacional
 STR_305B_SIZE                                                   :{BLACK}Tamanho
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Estação ferroviária
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Aeroporto
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Abrir Jogo
 STR_4002_SAVE                                                   :{BLACK}Guardar
 STR_4003_DELETE                                                 :{BLACK}Eliminar
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes livres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Não é possível ler unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Falha ao Guardar Jogo
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produção no último mês:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar visualização na localização da indústria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nova {STRING} em construção em {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nova {STRING} está a ser plantada em {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Sem nome{SKIP}
+STR_SV_UNNAMED                                                  :Sem nome
 STR_SV_TRAIN_NAME                                               :Comboio {COMMA}
 STR_SV_ROADVEH_NAME                                             :Veículo de Estrada {COMMA}
 STR_SV_SHIP_NAME                                                :Barco {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Norte
-STR_SV_STNAME_SOUTH                                             :{STRING} Sul
-STR_SV_STNAME_EAST                                              :{STRING} Este
-STR_SV_STNAME_WEST                                              :{STRING} Oeste
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transporte
-STR_SV_STNAME_HALT                                              :{STRING} Paragem
-STR_SV_STNAME_VALLEY                                            :Vale de {STRING}
-STR_SV_STNAME_HEIGHTS                                           :Montes de {STRING}
-STR_SV_STNAME_WOODS                                             :Floresta de {STRING}
-STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING}
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Intercâmbio
-STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING}
-STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING}
-STR_SV_STNAME_MINES                                             :Minas de {STRING}
-STR_SV_STNAME_DOCKS                                             :Docas de {STRING}
-STR_SV_STNAME_BUOY_1                                            :{STRING} Bóia 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Bóia 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Bóia 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Bóia 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Bóia 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Bóia 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Bóia 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Bóia 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Bóia 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Anexo
-STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING}
-STR_SV_STNAME_BRANCH                                            :Ramal de {STRING}
-STR_SV_STNAME_UPPER                                             :{STRING} de cima
-STR_SV_STNAME_LOWER                                             :{STRING} de baixo
-STR_SV_STNAME_HELIPORT                                          :Heliporto de {STRING}
-STR_SV_STNAME_FOREST                                            :Floresta de {STRING}
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Norte
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sul
+STR_SV_STNAME_EAST                                              :{STRING1} Este
+STR_SV_STNAME_WEST                                              :{STRING1} Oeste
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transporte
+STR_SV_STNAME_HALT                                              :{STRING1} Paragem
+STR_SV_STNAME_VALLEY                                            :Vale de {STRING1}
+STR_SV_STNAME_HEIGHTS                                           :Montes de {STRING1}
+STR_SV_STNAME_WOODS                                             :Floresta de {STRING1}
+STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING1}
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Intercâmbio
+STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING1}
+STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING1}
+STR_SV_STNAME_MINES                                             :Minas de {STRING1}
+STR_SV_STNAME_DOCKS                                             :Docas de {STRING1}
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Bóia 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Bóia 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Bóia 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Bóia 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Bóia 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Bóia 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Bóia 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Bóia 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Bóia 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Anexo
+STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING1}
+STR_SV_STNAME_BRANCH                                            :Ramal de {STRING1}
+STR_SV_STNAME_UPPER                                             :{STRING1} de cima
+STR_SV_STNAME_LOWER                                             :{STRING1} de baixo
+STR_SV_STNAME_HELIPORT                                          :Heliporto de {STRING1}
+STR_SV_STNAME_FOREST                                            :Floresta de {STRING1}
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Jogador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Cores
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nome do Presidente
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Não é possível alterar o nome da empresa...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Não é possível alterar o nome do presidente...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanças {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanças {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Despesas/Lucros
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construção
 STR_7012_NEW_VEHICLES                                           :{GOLD}Novos Veículos
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Circulação de Comboios
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Rendimentos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Clique no novo esquema de cor
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Aumentar empréstimo
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Pagar parte do empréstimo
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Veículos:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} comboio
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} comboios
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Avaliações da empresa (máximo=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valor da empresa
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Classificação de Empresas
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Empresa de transportes em dificuldades!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Presidente)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Presidente)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fusão de empresa de transportes!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} foi vendida a {STRING} por {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {STRING} por {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} foi vendida a {COMPANY} por {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Falida!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} foi fechada pelos credores e todos os seus bens foram vendidos!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} foi fechada pelos credores e todos os seus bens foram vendidos!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nova empresa de transportes!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} inicia construção em {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} inicia construção em {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Não é possível comprar empresa...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Tarifas por carga
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dias em trânsito
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender 25% de acções nesta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Não é possível comprar 25% de acções nesta empresa...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Não é possível vender 25% de acções nesta empresa...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propriedade de {STRING}{}   {COMMA}% propriedade de {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} foi comprada por {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propriedade de {COMPANY}{}   {COMMA}% propriedade de {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Esta empresa ainda não troca acções...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Depósito Ferroviário
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalhes)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detalhes)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Comboio no caminho
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Ir para {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ir para {STATION} (Transferir e levar carga)
 STR_8808_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informação
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Comboio muito longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os comboios só podem ser alterados quando parados num depósito
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Comboios
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Comboios
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Veículos Ferroviários
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Veículos Monocarril
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Veículos Maglev
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Ir Para
 STR_8827_FULL_LOAD                                              :{BLACK}Carga
 STR_8828_UNLOAD                                                 :{BLACK}Descarga
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Ordens)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fim de Ordens - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Manutenção
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Não é possível construir veículo ferroviário...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}A carregar / descarregar
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Comboio tem que estar parado dentro do depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Não é possível mandar o comboio para o depósito...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novo {STRING} disponível!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potência: {COMMA}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Custo: {CURRENCY} Peso: {COMMA}t{}Velocidade: {VELOCITY}  Potência: {COMMA}hp{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Avariado
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potência: {LTBLUE}{COMMA}hp{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veículo de estrada no caminho
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Veículos de Estrada
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Veículos de Estrada
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Depósito de Veículos de Estrada
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novos Veículos
 STR_9005_INFORMATION                                            :{BLACK}Informação
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construir Veículo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Não é possível construir veículo de estrada...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Deverá construir depósito de veículos de estrada primeiro
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Ordens)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detalhes)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve estar parado num depósito de veículos de estrada
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Não é possível vender veículo de estrada...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Não é possível iniciar/parar veículo de estrada...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construir o veículo de estrada seleccionado
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo veículo de estrada disponível!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Custo: {CURRENCY}{}Velocidade: {VELOCITY}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Custo: {CURRENCY}{}Velocidade: {VELOCITY}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renomear veículo de estrada
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Não é possível renomear veículo de estrada...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Não é possível construir doca aqui...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Depósito Naval
 STR_9804_NEW_SHIPS                                              :{BLACK}Novos Barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Não é possível construir barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}É necessário construir depósito naval primeiro
 STR_9808_NEW_SHIPS                                              :{WHITE}Novos Barcos
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Não é possível vender barco...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Não é possível construir barco...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Barco no caminho
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Ordens)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detalhes)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_9813_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Não é possível iniciar/parar barco...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Não é possível mandar barco para o depósito...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Não é possível encontrar depósito local
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostrar detalhes do barco
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Novo barco disponível!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {STRING}{}Custo de circulação: {CURRENCY}/ano
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {STRING1}{}Custo de circulação: {CURRENCY}/ano
 STR_982F_NAME_SHIP                                              :{BLACK}Renomear barco
 
 STR_9831_NAME_SHIP                                              :{WHITE}Renomear barco
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Renomear tipo de barco
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Não é possível renomear tipo de barco...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Adaptar barco de mercadorias para um tipo de carga diferente
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Adaptar)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Adaptar)
 STR_983C_REFIT_SHIP                                             :{BLACK}Adaptar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga do barco
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Adaptar barco para transportar a carga seleccionada
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING1}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Não é possível adaptar barco...
 STR_9842_REFITTABLE                                             :(adaptável)
 STR_GO_TO_SHIP_DEPOT                                            :Ir para o depósito naval de {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Não é possível construir aeronave...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronaves
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Ordens)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalhes)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronaves
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING2}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidade: {LTBLUE}{COMMA}%  {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Não é possível mandar aeronave para o hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Dirige-se ao hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Dirige-se ao hangar de {STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Não é possível iniciar/parar aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronave está em voo
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Deverá construir um aeroporto primeiro
-STR_A019_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}A aeronave deverá estar parada no hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Não é possível vender aeronave...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construir aeroporto
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Renomear tipo de aeronave
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Não é possível renomear tipo de aeronave...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Adaptar aeronave para um tipo de carga diferente
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Adaptar)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Adaptar)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Adaptar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga da aeronave
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Adaptar aeronave para transportar a carga seleccionada
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING1}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Não é possível adaptar aeronave...
 STR_A043_REFITTABLE                                             :(adaptável)
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir para o hangar de {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalhes
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Veículos:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estações:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar para Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar para Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mudar para Euro: {ORANGE}nunca
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prevêr: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Mudar parametro de moeda modificada
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{COMMA}cv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Custo de manutenção: {GOLD}{CURRENCY}/ano
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concebido: {GOLD}{NUMU16}{BLACK} Vida útil: {GOLD}{COMMA} anos
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concebido: {GOLD}{NUM}{BLACK} Vida útil: {GOLD}{COMMA} anos
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidade máxima: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Custo: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} passageiros, {COMMA} sacos de correio
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões Motorizados: {GOLD}+{COMMA}cv{BLACK} Peso: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões Motorizados: {GOLD}+{COMMA}cv{BLACK} Peso: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/romanian.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/romanian.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Necesitã teren plat
 STR_0008_WAITING                                                :{BLACK}În asteptare: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (plecat de la
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (plecat de la
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Acceptã: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Acceptã: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Harta - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Optiuni
 STR_00B2_MESSAGE                                                :{YELLOW}Mesaj
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mesaj de la {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mesaj de la {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nu pot face asta....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nu pot curãta terenul....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, toate drepturile rezervate
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Anglo-americane (Mile)
 STR_013A_METRIC_KILOMETERS                                      :Metrice (Kilometri)
-STR_013B_OWNED_BY                                               :{WHITE}...apartine companiei {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...apartine companiei {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Încãrcãturã
 STR_013D_INFORMATION                                            :{BLACK}Informatii
 STR_013E_CAPACITIES                                             :{BLACK}Capacitãti
 STR_013E_TOTAL_CARGO                                            :{BLACK}Încãrcãturi
-STR_013F_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Joc nou
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauzã joc (F1)
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Salvare/abandon/iesire joc
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afiseazã lista cu statiile companiei
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Costul demolãrii: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costul demolãrii: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Proprietar: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritatea localã: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Proprietar: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritatea localã: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :nici una
 STR_01AA_NAME                                                   :{BLACK}Nume
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Alege vizionarea unui tutorial (demonstratie)
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Încãrcãturi acceptate: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Încãrcãturi acceptate: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Încãrcãturi acceptate: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Încãrcãturi acceptate: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Încãrcãturi acceptate: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Încãrcãturi acceptate: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Piesa nr: {SETX 88}Titlul
 STR_01E9_SHUFFLE                                                :{TINYFONT}Amestecã
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programare piese muzicale
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Lista melodiilor
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Sterge
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Setare pentru tipurile de mesaje (da/nu/rezumat)
 STR_MESSAGE_SOUND                                               :{YELLOW}Sunet pentru mesajele-stiri
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prea departe de destinatia precedentã
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Primele companii care au atins {NUMU16}{}(Nivelul {STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Clasamentul companiilor in {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Primele companii care au atins {NUM}{}(Nivelul {STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Clasamentul companiilor in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Om de afaceri
 STR_0214_ENTREPRENEUR                                           :Întreprinzãtor
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnatul Secolului
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} a dobandit titlul de '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} al {STRING} dobandeste titlul de '{STRING}'!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} a dobandit titlul de '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} al {COMPANY} dobandeste titlul de '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Alege mãrimea orasului
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Mãrime oras:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Re-afiseazã ultimul mesaj
 STR_OFF                                                         :Oprit
 STR_SUMMARY                                                     :Pe scurt
 STR_FULL                                                        :Pe larg
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Lista oraselor (F5)
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Numele vehiculelor si modelelor
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :inactiv
 STR_CONFIG_PATCHES_ON                                           :activ
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afiseazã viteza vehiculelor in bara de jos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permite construirea pe coastã si in pantã: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permite arii de cuprindere mai realistice: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permite demolarea unui nr. mai mare constructii: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permite constructia de trenuri foarte lungi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permite acceleratie realisticã pentru trenuri: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Interzice trenurilor si navelor sa faca intoarceri de 90 de grade: {ORANGE}{STRING} {LTBLUE} (necesita NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Uneste gãrile alãturate: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Pãrãseste statia când orice tip de marfã este 'full load': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Foloseste algoritmul de LOAD imbunatatit: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livreazã marfa doar in statiile unde aceasta este ceruta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permite constructia de poduri foarte lungi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permite ordine de tipul "mergi la depou": {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permite constructia de industrii pentru materii prime: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permite mai multe industrii similare in acelasi oras: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrii identice pot fi construite aproape una de cealaltã: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Afiseazã intotdeauna data in format lung in bara de stare: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Afiseazã semnalele pe partea de circulatie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Afiseazã finantele la sfârsitul fiecãrui an: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Utilizeazã o metodã gen TTDPatch pentru 'non stop': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Autovehiculele formeazã o coadã (cu efecte cuantice): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Mutã imaginea când mouse-ul este la marginea ecranului: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permite mituirea autoritãtilor locale: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Metodã nouã pentru gãsire depou: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Statii neuniforme: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Algoritm nou pentru gãsirea drumurilor (trenuri): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nou pathfinding global(NPF, dezactiveaza NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afiseazã viteza vehiculelor in bara de jos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permite construirea pe coastã si in pantã: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permite arii de cuprindere mai realistice: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permite demolarea unui nr. mai mare constructii: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permite constructia de trenuri foarte lungi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permite acceleratie realisticã pentru trenuri: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Interzice trenurilor si navelor sa faca intoarceri de 90 de grade: {ORANGE}{STRING1} {LTBLUE} (necesita NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Uneste gãrile alãturate: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Pãrãseste statia când orice tip de marfã este 'full load': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Foloseste algoritmul de LOAD imbunatatit: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livreazã marfa doar in statiile unde aceasta este ceruta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permite constructia de poduri foarte lungi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permite ordine de tipul "mergi la depou": {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permite constructia de industrii pentru materii prime: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permite mai multe industrii similare in acelasi oras: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrii identice pot fi construite aproape una de cealaltã: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Afiseazã intotdeauna data in format lung in bara de stare: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Afiseazã semnalele pe partea de circulatie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Afiseazã finantele la sfârsitul fiecãrui an: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Utilizeazã o metodã gen TTDPatch pentru 'non stop': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Autovehiculele formeazã o coadã (cu efecte cuantice): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Mutã imaginea când mouse-ul este la marginea ecranului: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permite mituirea autoritãtilor locale: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Metodã nouã pentru gãsire depou: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Statii neuniforme: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Algoritm nou pentru gãsirea drumurilor (trenuri): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nou pathfinding global(NPF, dezactiveaza NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permite întotdeauna aeroporturi mici: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permite întotdeauna aeroporturi mici: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren este rãtãcit dacã nu face un progres timp de: {ORANGE}{STRING} zile
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren este rãtãcit dacã nu face un progres timp de: {ORANGE}{STRING1} zile
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Un tren este considerat rãtãcit dacã nu face un progres: {ORANGE}dezactivat
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Verificarea ordinelor vehiculelor: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Verificarea ordinelor vehiculelor: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nu
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :da, dar exclude vehiculele oprite
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :pentru toate vehiculele
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avertizare in cazul in care un tren are profit negativ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehiculele nu expirã niciodatã: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avertizare in cazul in care un tren are profit negativ: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehiculele nu expirã niciodatã: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Înnoire automatã pentru vehiculele învechite
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Înnoire automatã cu {ORANGE}{STRING}{LTBLUE} luni pânã la/dupã atingerea vechimii max.
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Fonduri minime pentru înnoire automatã: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Durata mesajelor de eroare: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Afiseaza populatia unui oras langa nume: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Ascunde arborii la alegerea optiunii 'clãdiri transparente': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitudinea de înzãpezire: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Mãrimea maximã a statiilor: {ORANGE}{STRING} {RED}(valorile mari încetinesc jocul!)
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service automat pentru elicoptere la helipaduri: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nr. max. de trenuri pentru un jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nr. max. de autovehicule pentru un jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nr. max. de aeronave pentru un jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nr. max. de nave pentru un jucãtor: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Înnoire automatã cu {ORANGE}{STRING1}{LTBLUE} luni pânã la/dupã atingerea vechimii max.
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Fonduri minime pentru înnoire automatã: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Durata mesajelor de eroare: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Afiseaza populatia unui oras langa nume: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Ascunde arborii la alegerea optiunii 'clãdiri transparente': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitudinea de înzãpezire: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Mãrimea maximã a statiilor: {ORANGE}{STRING1} {RED}(valorile mari încetinesc jocul!)
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service automat pentru elicoptere la helipaduri: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Dezactiveazã trenurile pentru jucãtorii PC: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Dezactiveazã autovehiculele pentru jucãtorii PC: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Dezactiveazã aeronavele pentru jucãtorii PC: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Dezactiveazã navele pentru jucãtorii PC: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nr. max. de trenuri pentru un jucãtor: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nr. max. de autovehicule pentru un jucãtor: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nr. max. de aeronave pentru un jucãtor: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nr. max. de nave pentru un jucãtor: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Foloseste noul AI (versiune alfa): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Dezactiveazã trenurile pentru jucãtorii PC: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Dezactiveazã autovehiculele pentru jucãtorii PC: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Dezactiveazã aeronavele pentru jucãtorii PC: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Dezactiveazã navele pentru jucãtorii PC: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalul de service presetat pentru trenuri: {ORANGE}{STRING} zile
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Foloseste noul AI (versiune alfa): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalul de service presetat pentru trenuri: {ORANGE}{STRING1} zile
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervalul de service presetat pentru trenuri: {ORANGE}dezactivat
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalul de service presetat pentru autovehicule: {ORANGE}{STRING} zile
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalul de service presetat pentru autovehicule: {ORANGE}{STRING1} zile
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Intervalul de service presetat pentru autovehicule: {ORANGE}dezactivat
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalul de service presetat pentru aeronave: {ORANGE}{STRING} zile
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalul de service presetat pentru aeronave: {ORANGE}{STRING1} zile
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Intervalul de service presetat pentru aeronave: {ORANGE}dezactivat
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalul de service presetat pentru nave: {ORANGE}{STRING} zile
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalul de service presetat pentru nave: {ORANGE}{STRING1} zile
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalul de service presetat pentru nave: {ORANGE}dezactivat
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Deactivare service cand defectiunile sunt anulate: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Deactivare service cand defectiunile sunt anulate: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Stirile în culori apar în anul: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Anul de început a jocului: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Termina jocul in: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Stirile în culori apar în anul: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Anul de început a jocului: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Termina jocul in: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Economie cu schimbãri de productie mai reduse, dar mai frecvente
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permite cumpararea de actiuni de la alte companii
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Plasare automatã a semnalelor la fiecare: {ORANGE}{STRING} pãtrãtele
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permite plasarea automata a semnalelor PBS: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozitia listei cu instrumente: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Plasare automatã a semnalelor la fiecare: {ORANGE}{STRING1} pãtrãtele
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permite plasarea automata a semnalelor PBS: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozitia listei cu instrumente: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :stânga
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :centru
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :dreapta
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Distanta de 'snap' pentru ferestre: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Distanta de 'snap' pentru ferestre: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Distanta de 'snap' pentru ferestre: {ORANGE}dezactivata
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfatã
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Concurenti
 
 STR_CONFIG_PATCHES_DISABLED                                     :dezactivat
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Schimbã valoarea setãrii
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Atentie! Esti pe cale sã-ti trãdezi colegii de joc! Nu uita cã aceastã rusine va rãmâne înregistratã pentru totdeauna!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Mãreste fondurile cu {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Joacã în locul jucãtorului: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Buldozer magic (demoleazã industrii si lucruri amovibile): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunelele se pot intersecta: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construieste în modul pauzã: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Buldozer magic (demoleazã industrii si lucruri amovibile): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunelele se pot intersecta: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construieste în modul pauzã: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Avioanele cu reactie nu se vor prãbusi (frecvent) pe aeroporturile mici: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Schimbã peisajul: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Schimbã data: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activeaza accesul la valorile de productie: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activeaza accesul la valorile de productie: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Merge spre {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Merge spre {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... baliza in uz!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordonate: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordonate: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nu pot demola o parte din statie...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Nu pot converti linia aici...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construieste minã de zahãr
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrii
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportat)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altã industrie
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Refit train to carry a different cargo type
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Refit)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Refit train
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfã transportat de tren
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Modificã trenul pentru a transporta marfa aleasã
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nu pot modifica trenul...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervaluri de service in procente: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervaluri de service in procente: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Schimba productia
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Salut! Sunt noul algoritm AI, încã în teste. Dacã apar probleme, salveazã un screenshot si pune-l pe forum. Baftã!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Marimea hartii:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versiune server:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serverului:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serverului:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Data de inceput:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data curenta:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protejat cu parola!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO COMPANIE
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Numele companiei:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaugurarea:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaugurarea:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valoarea companiei:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanta curenta:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Venituri anul trecut:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performanta:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performanta:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicule:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Statii:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicule:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Statii:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Jucatori:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Conectare...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Preluare info joc..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Preluare info companie..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} client(i) inaintea noastra
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes descarcati pana acum
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(i) inaintea noastra
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descarcati pana acum
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Deconectare
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nu am reusit sa incarc jocul-server salvat.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Nu pot porni serverul.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Nu pot efectua conectarea.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Conexiunea #{NUMU16} a expirat.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Conexiunea #{NUM} a expirat.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Eroare de protocol. Conexiunea a fost inchisa.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Versiunea acestui client este diferita de cea a serverului.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Parola gresita.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Marimea X a hartii: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Marimea Y a hartii: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Marimea X a hartii: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Marimea Y a hartii: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cheltuieli: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Orase
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Mai întâi trebuie sã demolezi clãdirea
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Populatia: {ORANGE}{COMMA}{BLACK}  Locuinte: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Afiseazã informatii referitoare la autoritatea localã
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Autoritatea localã din {TOWN}
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ratingul companiilor de transport:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventii (F6)
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subventii disponibile:
-STR_2027_FROM_TO                                                :{ORANGE}- {STRING} de la {STRING} la {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}- {STRING} de la {STRING2} la {STRING2}
 STR_2028_BY                                                     :{YELLOW} (data limitã: {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}- nici una
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Subventii acordate la ora actualã:
-STR_202C_FROM_TO                                                :{ORANGE}- {STRING} de la {STATION} la {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}- {STRING} de la {STATION} la {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, pânã în {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Ofertã expiratã:{}{}Transportul de {STRING} de la {STRING} la {STRING} nu va mai fi subventionat
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Ofertã expiratã:{}{}Transportul de {STRING} de la {STRING2} la {STRING2} nu va mai fi subventionat
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Ofertã închisã:{}{}Transportul de {STRING} de la {STATION} la {STATION} nu va mai fi subventionat
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subventie oferitã:{}{}Primul transport de {STRING} de la {STRING} la {STRING} va atrage subventionarea pe un an din partea autoritãtilor locale
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {STRING}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri cu 50% mai mari timp de un an!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {STRING}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri duble timp de un an!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {STRING}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri triple timp de un an!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {STRING}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri de patru ori mai mari timp de un an!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subventie oferitã:{}{}Primul transport de {STRING} de la {STRING2} la {STRING2} va atrage subventionarea pe un an din partea autoritãtilor locale
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {COMPANY}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri cu 50% mai mari timp de un an!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {COMPANY}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri duble timp de un an!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {COMPANY}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri triple timp de un an!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subventie acordatã companiei {COMPANY}!{}{}Transportul de {STRING} de la {STATION} la {STATION} va aduce încasãri de patru ori mai mari timp de un an!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}Autoritatea localã din {TOWN} refuzã sã permitã construirea unui nou aeroport în acest oras
 STR_2036_COTTAGES                                               :Cãsute
 STR_2037_HOUSES                                                 :Case
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finanteazã constructia de noi clãdiri comerciale în oras.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Cumpãrã drepturile exclusive în acest oras pe o perioadã de un an. Autoritãtile locale vor folosi doar compania ta pentru transportul de pasageri si mãrfuri.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Mituieste autoritãtile locale pentru a-ti îmbunãtãti ratingul, dar cu riscul de a fi prins si de a plãti amenzi serioase.{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Haos pe strãzile din {TOWN}!{}{}Programul finantat de {STRING} pentru reconstructia strãzilor, aduce 6 luni de haos participantilor la trafic!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Haos pe strãzile din {TOWN}!{}{}Programul finantat de {COMPANY} pentru reconstructia strãzilor, aduce 6 luni de haos participantilor la trafic!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (în constructie)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...locatie nepotrivitã
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Nu pot planta arbori aici...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...prea multe semne
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Nu pot plasa un semn aici...
 STR_280A_SIGN                                                   :Semn
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Prea multe statii de autobuz
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Prea multe statii de camion
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Prea aproape de altã statie
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Mai întâi trebuie demolatã gara
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Prea aproape de alt aeroport
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Mai întâi trebuie demolat aeroportul
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Prea aproape de altã platformã pentru camioane
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Mai intâi trebuie demolatã statia de autbuz
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Mai intâi trebuie demolatã platforma pentru camioane
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Statii
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Statii
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nici una -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...locatie nepotrivitã
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Prea aproape de alt port
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolitan
 STR_305AB_LARGE                                                 :{BLACK}International
 STR_305B_SIZE                                                   :{BLACK}Mãrimea
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Garã
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar
 STR_3060_AIRPORT                                                :Aeroport
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Încarcã joc
 STR_4002_SAVE                                                   :{BLACK}Salveazã
 STR_4003_DELETE                                                 :{BLACK}Sterge
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes liberi
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nu pot citi acest drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Salvarea jocului esuatã
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Productia luna trecutã:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportat)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportat)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreazã imaginea pe locatia industriei
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Un nou obiectiv industrial ({STRING}) se construieste lângã {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}O nouã {STRING} se planteazã lângã {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :NoName{SKIP}
+STR_SV_UNNAMED                                                  :NoName
 STR_SV_TRAIN_NAME                                               :Trenul {COMMA}
 STR_SV_ROADVEH_NAME                                             :Autovehiculul {COMMA}
 STR_SV_SHIP_NAME                                                :Nava {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronava {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Nord
-STR_SV_STNAME_SOUTH                                             :{STRING} Sud
-STR_SV_STNAME_EAST                                              :{STRING} Est
-STR_SV_STNAME_WEST                                              :{STRING} Vest
-STR_SV_STNAME_CENTRAL                                           :{STRING} Centru
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
-STR_SV_STNAME_HALT                                              :Popasul {STRING}
-STR_SV_STNAME_VALLEY                                            :Valea {STRING}
-STR_SV_STNAME_HEIGHTS                                           :Dealurile {STRING}
-STR_SV_STNAME_WOODS                                             :Pãdurea {STRING}
-STR_SV_STNAME_LAKESIDE                                          :Lacul {STRING}
-STR_SV_STNAME_EXCHANGE                                          :Piata {STRING}
-STR_SV_STNAME_AIRPORT                                           :Aeroportul {STRING}
-STR_SV_STNAME_OILFIELD                                          :Platforma {STRING}
-STR_SV_STNAME_MINES                                             :Minele {STRING}
-STR_SV_STNAME_DOCKS                                             :Portul {STRING}
-STR_SV_STNAME_BUOY_1                                            :{STRING} Balizã 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Balizã 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Balizã 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Balizã 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Balizã 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Balizã 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Balizã 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Balizã 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Balizã 9
-STR_SV_STNAME_ANNEXE                                            :Anexa {STRING}
-STR_SV_STNAME_SIDINGS                                           :{STRING} Belvedere
-STR_SV_STNAME_BRANCH                                            :Ramura {STRING}
-STR_SV_STNAME_UPPER                                             :{STRING} de Sus
-STR_SV_STNAME_LOWER                                             :{STRING} de Jos
-STR_SV_STNAME_HELIPORT                                          :Heliportul {STRING}
-STR_SV_STNAME_FOREST                                            :Pãdurea {STRING}
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Nord
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sud
+STR_SV_STNAME_EAST                                              :{STRING1} Est
+STR_SV_STNAME_WEST                                              :{STRING1} Vest
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Centru
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Transfer
+STR_SV_STNAME_HALT                                              :Popasul {STRING1}
+STR_SV_STNAME_VALLEY                                            :Valea {STRING1}
+STR_SV_STNAME_HEIGHTS                                           :Dealurile {STRING1}
+STR_SV_STNAME_WOODS                                             :Pãdurea {STRING1}
+STR_SV_STNAME_LAKESIDE                                          :Lacul {STRING1}
+STR_SV_STNAME_EXCHANGE                                          :Piata {STRING1}
+STR_SV_STNAME_AIRPORT                                           :Aeroportul {STRING1}
+STR_SV_STNAME_OILFIELD                                          :Platforma {STRING1}
+STR_SV_STNAME_MINES                                             :Minele {STRING1}
+STR_SV_STNAME_DOCKS                                             :Portul {STRING1}
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Balizã 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Balizã 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Balizã 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Balizã 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Balizã 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Balizã 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Balizã 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Balizã 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Balizã 9
+STR_SV_STNAME_ANNEXE                                            :Anexa {STRING1}
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Belvedere
+STR_SV_STNAME_BRANCH                                            :Ramura {STRING1}
+STR_SV_STNAME_UPPER                                             :{STRING1} de Sus
+STR_SV_STNAME_LOWER                                             :{STRING1} de Jos
+STR_SV_STNAME_HELIPORT                                          :Heliportul {STRING1}
+STR_SV_STNAME_FOREST                                            :Pãdurea {STRING1}
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Jucãtorul {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Schimbã foto
 STR_7005_COLOR_SCHEME                                           :{BLACK}Culoare
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Numele noului presedinte
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nu pot schimba numele companiei...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nu pot schimba numele presedintelui...
-STR_700E_FINANCES                                               :{WHITE}Situatia financiarã a companiei {STRING} {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}Situatia financiarã a companiei {COMPANY} {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Cheltuieli/Venituri
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Constructii
 STR_7012_NEW_VEHICLES                                           :{GOLD}Vehicule noi
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Costuri trenuri
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graficul veniturilor
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Clic pe culoarea selectatã
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Împrumutã o nouã sumã de bani
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Plãteste inapoi o parte din credite
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presedinte)
-STR_7038_INAUGURATED                                            :{GOLD}Anul înfiintãrii: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Presedinte)
+STR_7038_INAUGURATED                                            :{GOLD}Anul înfiintãrii: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehicule:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trenuri
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Ratingul performantelor companiilor (rating maxim=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valorile companiilor
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Clasamentul companiilor
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Companie de transport cu probleme!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} va fi vândutã dacã situatia nu se va îmbunãtãti curând!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Presedinte)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} va fi vândutã dacã situatia nu se va îmbunãtãti curând!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Presedinte)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Fuziune între companiile de transport!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} a fost vândutã companiei {STRING} la pretul de {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Cãutãm o companie de transport care sã preia societatea noastrã {}{}Doriti sã cumpãrati {STRING} la pretul de {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} a fost vândutã companiei {COMPANY} la pretul de {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Cãutãm o companie de transport care sã preia societatea noastrã {}{}Doriti sã cumpãrati {COMPANY} la pretul de {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Faliment!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}Compania {STRING} a fost închisã si toate activele au fost valorificate de creditori!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}Compania {COMPANY} a fost închisã si toate activele au fost valorificate de creditori!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}A apãrut o nouã companie!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} si-a stabilit sediul lângã {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} si-a stabilit sediul lângã {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nu pot cumpãra compania...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Preturile transportului de cãlãtori si mãrfuri
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Zile în tranzit
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vinde 25% din actiunile aceste companii
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nu pot cumpãra 25% din aceastã companie...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nu pot vinde 25% din aceastã companie...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% detinute de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% detinute de {STRING}{}   {COMMA}% detinute de {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} a fost preluatã de {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% detinute de {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% detinute de {COMPANY}{}   {COMMA}% detinute de {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} a fost preluatã de {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Aceasta companie inca nu vinde actiuni...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}Depoul {TOWN}
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc {}sosirea primului tren la {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalii)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detalii)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren în drum
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Mergi la {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Mergi la {STATION} (Transferã si preia încãrcãtura)
 STR_8808_GO_TO_UNLOAD                                           :Mergi la {STATION} (Descarcã)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informatii
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren prea lung
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trenurile pot fi modificate doar când se aflã într-un depou
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trenuri
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trenuri
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Noi vehicule feroviare
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Noi vehicule monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Noi vehicule maglev
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Mergi la
 STR_8827_FULL_LOAD                                              :{BLACK}Full-load
 STR_8828_UNLOAD                                                 :{BLACK}Descãrcare
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Comenzi)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Comenzi)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Sfârsitul comenzilor - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Service
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nu pot construi vehiculul...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valoare: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Încarcã / Descarcã
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trenul trebuie oprit intr-un depou
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nu pot trimite trenul la depou...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Sãri peste aceastã comandã dacã nu este necesar un service
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Stiri: {STRING} este acum disponibil!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Greutate: {COMMA}t{}Vitezã: {VELOCITY}  Putere: {COMMA}cp{}Cost de rulare: {CURRENCY}/an{}Capacitate: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cost: {CURRENCY} Greutate: {COMMA}t{}Vitezã: {VELOCITY}  Putere: {COMMA}cp{}Cost de rulare: {CURRENCY}/an{}Capacitate: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Defectiune
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vechimea: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vechimea: {LTBLUE}{STRING2}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Greutate: {LTBLUE}{COMMA}t  {BLACK}Putere: {LTBLUE}{COMMA}cp{BLACK} Vitezã max.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Autovehicul in cale
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA}Autovehicule
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA}Autovehicule
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Autobaza {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Autovehicule noi
 STR_9005_INFORMATION                                            :{BLACK}Informatii
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Cumpãrã vehicul
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nu pot cumpãra autovehicul...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Mai intâi trebuie construitã o autobazã
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Comenzi)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detalii)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING2}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_900E_MAX_SPEED                                              :{BLACK}Vitezã max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...trebuie oprit intr-o autobazã
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nu pot vinde autovehiculul...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nu pot opri/porni autovehiculul...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Cumpãrã autovehiculul selectat
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Un nou autovehicul disponibil!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pret: {CURRENCY}{}Vitezã: {VELOCITY}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pret: {CURRENCY}{}Vitezã: {VELOCITY}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Numele autovehiculului
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nu pot redenumi autovehiculul...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nu pot construi port aici...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Santierul Naval {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nave noi
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA}Nave
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA}Nave
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nu pot construi nave...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Construieste mai intâi un santier
 STR_9808_NEW_SHIPS                                              :{WHITE}Nave noi
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Nu pot vinde nava...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Nu pot construi nava...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Navã în cale
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Comenzi)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detalii)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING2}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_9813_MAX_SPEED                                              :{BLACK}Viteza max.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nu pot opri/porni nava...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nu pot trimite nava în santier...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nu pot gãsi un santier apropiat
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afiseazã detaliile navei
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}O nouã navã este disponibilã!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {STRING}{}Cost de rulare: {CURRENCY}/an
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {STRING1}{}Cost de rulare: {CURRENCY}/an
 STR_982F_NAME_SHIP                                              :{BLACK}Alege un nume pentru aceastã navã
 
 STR_9831_NAME_SHIP                                              :{WHITE}Alege un nume pentru aceastã navã
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Redenumeste modelul navei
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nu pot schimba numele modelului acestei nave...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Schimbã tipul de marfã transportat
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Schimb marfã)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Schimb marfã)
 STR_983C_REFIT_SHIP                                             :{BLACK}Schimbã marfa transportatã
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de încãrcãturã ce va fi transportat de navã
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Schimbã tipul de încãrcãturã al acestei nave
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege tipul încãrcãturii:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING1}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nu pot schimba tipul navei...
 STR_9842_REFITTABLE                                             :(suportã alte mãrfuri)
 STR_GO_TO_SHIP_DEPOT                                            :Mergi la Santierul Naval {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Aeronavã nouã
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Cumpãrã aeronavã
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nu pot cumpãra aeronava...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronave
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Comenzi)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalii)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârstã: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronave
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Comenzi)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârstã: {LTBLUE}{STRING2}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_A00E_MAX_SPEED                                              :{BLACK}Vitezã max.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat în: {LTBLUE}{NUMU16}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Cumpãrat în: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nu pot trimite nava într+un hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Merge la Hangarul {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Merge la Hangarul{STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nu pot opri/porni aeronava...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronavã se aflã în zbor
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Mai întâi trebuie sã construiesti un aeroport
-STR_A019_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aeronava trebuie sã se afle într-un hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nu pot vinde aeronava...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Constructie aeroport
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Redenumeste modelul aeronavei
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nu pot schimba numele aceste aeronave...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimbã tipul de încãrcãturã transportat
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Schimbã încãrcãtura)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Schimbã încãrcãtura)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Schimbã tipul de încãrcãturã transportat
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege marfa care doresti sã fie transportatã
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimbã tipul de încãrcãturã al acestei aeronave
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege marfa de transportat:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING1}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nu pot schimba tipul de încãrcãturã...
 STR_A043_REFITTABLE                                             :(suportã alte mãrfuri)
 STR_GO_TO_AIRPORT_HANGAR                                        :Mergi la Hangarul {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalii
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehicule:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Statii:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufix:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Adera la Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Adera la Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Adera la Euro: {ORANGE}niciodata
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Previzualizare: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Schimba un parametru al monedei proprii
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Greutate: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Viteza: {GOLD}{VELOCITY}{BLACK}   Putere: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost de rulare: {GOLD}{CURRENCY}/an
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitate: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}An aparitie: {GOLD}{NUMU16}{BLACK} Durata de viata: {GOLD}{COMMA} years
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitate: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}An aparitie: {GOLD}{NUM}{BLACK} Durata de viata: {GOLD}{COMMA} years
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Eficienta max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Greutate: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Viteza: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitate: {GOLD}{COMMA} calatori, {COMMA} saci de posta
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagoane electrificate: {GOLD}+{COMMA}cp{BLACK} Greutate: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagoane electrificate: {GOLD}+{COMMA}cp{BLACK} Greutate: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/slovak.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/slovak.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Potrebny rovny teren
 STR_0008_WAITING                                                :{BLACK}Caka: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (na ceste z
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (na ceste z
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Prijima: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Prijima: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Nastavenia Hry
 STR_00B2_MESSAGE                                                :{YELLOW}Sprava
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Sprava od {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Sprava od {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Takto sa to neda...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Oblast sa neda vycistit...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (mile)
 STR_013A_METRIC_KILOMETERS                                      :Metric (kilometre)
-STR_013B_OWNED_BY                                               :{WHITE}...vlastnik {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...vlastnik {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Naklad
 STR_013D_INFORMATION                                            :{BLACK}Informacia
 STR_013E_CAPACITIES                                             :{BLACK}Kapacita
 STR_013E_TOTAL_CARGO                                            :{BLACK}Celkovy Naklad
-STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Celkovy naklad (kapacita) tohoto vlaku:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nova Hra
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pauza
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Ulozit hru, opustit hru, ukoncit program
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zoznam stanic spolocnosti
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cena za zburanie: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cena za zburanie: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Nezname
-STR_01A7_OWNER                                                  :{BLACK}Vlastnik: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Miestna sprava: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Vlastnik: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Miestna sprava: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Nezname
 STR_01AA_NAME                                                   :{BLACK}Meno
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Vybrat Nacvik / Ukazku
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Prijma naklad: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Prijma naklad: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Prijma naklad: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Prijma naklad: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Prijma naklad: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Prijma naklad: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Stopa{SETX 88}Title
 STR_01E9_SHUFFLE                                                :{TINYFONT}Nahodne
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Vyber hudobneho programu
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Cislo stopy
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Zmazat
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Nastavenie pre vsetky typov sprav (vypnute/strucne/zapnute)
 STR_MESSAGE_SOUND                                               :{YELLOW}Prehrat zvuk pre strucne novinove spravy
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prilis daleko z predchadzajuceho ciela
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Najlepsie spolocnosti, ktore dosiahli {NUMU16}{}({STRING} uroven)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabulka spolocnosti v roku {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Najlepsie spolocnosti, ktore dosiahli {NUM}{}({STRING} uroven)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabulka spolocnosti v roku {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Obchodnik
 STR_0214_ENTREPRENEUR                                           :Podnikatel
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} ziskal oznacenie '{STRING}' !
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} z {STRING} ziskal oznacenie '{STRING}' !
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} ziskal oznacenie '{STRING}' !
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} ziskal oznacenie '{STRING}' !
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Vyber velkost mesta
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Velkost mesta:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Zobraz poslednu spravu alebo novinku
 STR_OFF                                                         :Vypnute
 STR_SUMMARY                                                     :Obsah
 STR_FULL                                                        :Plne
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Zoznam miest
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nazvy vozidiel
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Vyp.
 STR_CONFIG_PATCHES_ON                                           :Zap.
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Zobraz rychlost vozidla v stavovej liste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Umoznit vystavbu na sikmine a pobrezi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Povolit v oblasti pokrytia realistickejsiu velkost: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Umoznit odstranenie viacerych mestskych ciest, mostov... : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Umoznit stavbu dlhych vlakov: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Zapnut realnu akceleraciu vlakov: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakazat vlakom a lodiam otacenie o 90 st.: {ORANGE}{STRING} {LTBLUE} (vyzaduje NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Umoznit spajat stanice: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Opustit stanicu ked jeden z nakladov je plny, pri 'plne naloz': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Pouzit vylepseny algoritmus nakladania: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Vykladat tovar v stanici len ked je dopyt: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Umoznit stavbu dlhych mostov: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Umoznit prikaz chod do depa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Umoznit vystavbu priemyslu produkujuceho suroviny: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Umoznit rozne priemysly v meste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Ten isty priemysel moze byt stavany blizko seba: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Ukazuj dlhy format datumu v stavovej liste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Zobrazuj signaly na strane cesty: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Ukaz rozpocet na konci roku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompaktibilne nonstop ovladanie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Radenie cestnych vozidiel (podla mnozstva tovaru): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Posuvanie okna ked je mys na kraji: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Umoznit podplacanie miestnej spravy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nove vyhladavanie depa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Roznorode stanice: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novy algoritmus pre hladanie smeru: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Novy globalny algoritmus hladania cesty (NPF namiesto NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Zobraz rychlost vozidla v stavovej liste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Umoznit vystavbu na sikmine a pobrezi: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Povolit v oblasti pokrytia realistickejsiu velkost: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Umoznit odstranenie viacerych mestskych ciest, mostov... : {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Umoznit stavbu dlhych vlakov: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Zapnut realnu akceleraciu vlakov: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakazat vlakom a lodiam otacenie o 90 st.: {ORANGE}{STRING1} {LTBLUE} (vyzaduje NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Umoznit spajat stanice: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Opustit stanicu ked jeden z nakladov je plny, pri 'plne naloz': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Pouzit vylepseny algoritmus nakladania: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacia: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Vykladat tovar v stanici len ked je dopyt: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Umoznit stavbu dlhych mostov: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Umoznit prikaz chod do depa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Umoznit vystavbu priemyslu produkujuceho suroviny: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Umoznit rozne priemysly v meste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Ten isty priemysel moze byt stavany blizko seba: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Ukazuj dlhy format datumu v stavovej liste: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Zobrazuj signaly na strane cesty: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Ukaz rozpocet na konci roku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompaktibilne nonstop ovladanie: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Radenie cestnych vozidiel (podla mnozstva tovaru): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Posuvanie okna ked je mys na kraji: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Umoznit podplacanie miestnej spravy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nove vyhladavanie depa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Roznorode stanice: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novy algoritmus pre hladanie smeru: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Novy globalny algoritmus hladania cesty (NPF namiesto NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Vzdy povolit male letiska: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Vzdy povolit male letiska: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Vlak sa strati pokial nic nedosiahne za: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Vlak sa strati pokial nic nedosiahne za: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Vlak bude zruseny, ak neurobi zisk za: {ORANGE}vypnute
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Obnovenie prikazu vozidla: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Obnovenie prikazu vozidla: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nie
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ano, okrem zastavenych vozidiel (v garazi)
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :ano, u vsetkych vozidiel
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Upozornit na stratu vlaku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Stare vozidla sa neprestanu vyrabat: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Upozornit na stratu vlaku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Stare vozidla sa neprestanu vyrabat: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automaticka obnova dopravnych prostriedkov, ked su stare
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING}{LTBLUE} mesiacov pred/po dosiahnuti max. veku
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Min. mnozstvo penazi pre aut. obnovovanie vozidiel: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Dlzka zobrazenia chybovej spravy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zobrazit populaciu mesta v jeho nazve: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Neviditelne stromy (pri priesvitnych budovach): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Uroven ciary snehu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max. pokrytie stanice: {ORANGE}{STRING} {RED}Pozor: Vysoke hodnoty spomaluju hru
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Automaticke opravy vrtulnikov v heliporte: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximalny pocet vlakov hraca: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximalny pocet automobilov hraca: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximalny pocet lietadiel hraca: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximalny pocet lodi hraca: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING1}{LTBLUE} mesiacov pred/po dosiahnuti max. veku
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Min. mnozstvo penazi pre aut. obnovovanie vozidiel: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Dlzka zobrazenia chybovej spravy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zobrazit populaciu mesta v jeho nazve: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Neviditelne stromy (pri priesvitnych budovach): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Uroven ciary snehu: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max. pokrytie stanice: {ORANGE}{STRING1} {RED}Pozor: Vysoke hodnoty spomaluju hru
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Automaticke opravy vrtulnikov v heliporte: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Zakazat vlaky pre pocitac: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Zakazat automobily pre pocitac: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Zakazat lietadla pre pocitac: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Zakazat lode pre pocitac: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximalny pocet vlakov hraca: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximalny pocet automobilov hraca: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximalny pocet lietadiel hraca: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Maximalny pocet lodi hraca: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Povolit nove AI (alpha verzia): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Zakazat vlaky pre pocitac: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Zakazat automobily pre pocitac: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Zakazat lietadla pre pocitac: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Zakazat lode pre pocitac: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Implicitny servisny interval pre vlaky: {ORANGE}{STRING} dni
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Povolit nove AI (alpha verzia): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Implicitny servisny interval pre vlaky: {ORANGE}{STRING1} dni
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Implicitny servisny interval pre vlaky: {ORANGE}vypnuty
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Implicitny servisny interval pre automobily: {ORANGE}{STRING} dni/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Implicitny servisny interval pre automobily: {ORANGE}{STRING1} dni/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Implicitny servisny interval pre automobily: {ORANGE}vypnuty
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Imlicitny servisny interval pre lietadla: {ORANGE}{STRING} dni/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Imlicitny servisny interval pre lietadla: {ORANGE}{STRING1} dni/%
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Implicitny servisny interval pre lietadla: {ORANGE}vypnuty
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Implicitny servisny interval pre lode: {ORANGE}{STRING} dni/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Implicitny servisny interval pre lode: {ORANGE}{STRING1} dni/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Implicitny servisny interval pre lode: {ORANGE}vypnuty
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Vypnut servisy, ak su vypnute poruchy: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Vypnut servisy, ak su vypnute poruchy: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farebne novinky sa objavia v roku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Datum zaciatku hry: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Ukoncit hru v roku: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farebne novinky sa objavia v roku: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Datum zaciatku hry: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Ukoncit hru v roku: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Mierne zmeny ekonomiky (viac mensich zmien)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Povolit nakup akcii od ostatnych spolocnosti
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Pri tahani umiestnit semafory kazdych(e): {ORANGE}{STRING} dlazdic(e)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Automaticke umiestnenie semaforov pbs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozicia hlavneho menu: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Pri tahani umiestnit semafory kazdych(e): {ORANGE}{STRING1} dlazdic(e)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Automaticke umiestnenie semaforov pbs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozicia hlavneho menu: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Na lavo
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :V strede
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Na pravo
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Vzdialenost pre uchytenie okna: {ORANGE}{STRING} bodov
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Vzdialenost pre uchytenie okna: {ORANGE}{STRING1} bodov
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Vzdialenost pre uchytenie okna: {ORANGE}vypnute
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Rozhranie
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Protivnici
 
 STR_CONFIG_PATCHES_DISABLED                                     :zakazane
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Zmenit hodnotu nastavenia
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Varovanie! Chcete podviest vasich protihracov. Tento podvod sa navzdy zapameta.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Zvysit hotovost o {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Hrat ako hrac: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magicky buldozer (odstrani priemysel, budovy): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunely sa mozu navzajom krizit: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Umoznit vystavbu v pauze: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magicky buldozer (odstrani priemysel, budovy): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunely sa mozu navzajom krizit: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Umoznit vystavbu v pauze: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Triskove lietadla nebudu havarovat (casto) na malych letiskach: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Zmenit klimu: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Zmenit datum: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povolit zmenu objemu vyroby: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povolit zmenu objemu vyroby: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Smeruje do {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Smeruje do {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... boja sa pouziva!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Suradnice: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Suradnice: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nemozno odstranit cast stanice...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Tu nemozno zkonvertovat typ zeleznice...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Postavit cukrovu banu
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Priemysel
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% prevezenych)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% prenesenych)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% prevezenych)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% prenesenych)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prilis blizko ineho priemyslu
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Prerobit vlak na prepravu ineho nakladu
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Prerobit)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Prerobit vlak
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vybrat typ prepravovaneho nakladu
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Prerobit vlak na prepravu vybraneho nakladu
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nemozno prerobit vlak...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Servisne intervaly su v percentach: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Servisne intervaly su v percentach: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmenit produkciu
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Vitajte v novom AI. Mozete ocakavat problemy. Ak by nejake nastali urobte screenshot a poslite ho na forum.
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Prostredie:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzia servera:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Datum zaciatku:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aktualny date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Heslo:
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO O SPOLOCNOSTI
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nazov spolocnosti:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Zalozene:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Zalozene:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Hodnota spolocnosti:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Stav uctu:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Zisk v minulom roku:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Vykon:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Vykon:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozidla:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stanice:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vozidla:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stanice:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Hraci:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Pripajam sa...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Prijem informacii o hre..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Prijem informacii o spolocnosti..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} klient(i) pred nami
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kB stiahnute
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(i) pred nami
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kB stiahnute
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Odpojit sa
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nedokazem nahrat hru zo servera
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nemozem spustit server.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nemozem sa pripojit.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Vyprsal casovy limit pre spojenie #{NUMU16}.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Vyprsal casovy limit pre spojenie #{NUM}.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Chyba vznikla v protokole a spojenie je zatvorene.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Revizia hry u tohto klienta nezodpoveda revizii hry na serveri.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Chybne heslo.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-rozmer mapy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-rozmer mapy: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-rozmer mapy: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-rozmer mapy: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Cena: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Mesta
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budova sa musi zburat
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Obyvatelstvo: {ORANGE}{COMMA}{BLACK}  Domov: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Zobrazit informacie o miestnej sprave
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} Miestna sprava
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Hodnotenie dopravnych spolocnosti:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Dotacie
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Ponuknute dotacie:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING} do {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING2} do {STRING2}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Nie je
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Uz dotovane:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Dotacia skoncila:{}{}Preprava {STRING} z {STRING} do {STRING} uz nebude dotovana.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Dotacia skoncila:{}{}Preprava {STRING} z {STRING2} do {STRING2} uz nebude dotovana.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Vyska dotacie:{}{}Preprava {STRING} z {STATION} do {STATION} uz nieje dotovana.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Ponuka dotacie:{}{}Prva preprava {STRING} z {STRING} do {STRING} bude dotovana miestnou spravou!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {STRING}!{}{}Preprava {STRING} z {STATION} do {STATION} bude buduci rok o 50% vynosnejsia!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {STRING}!{}{}Preprava {STRING} z {STATION} to {STATION} bude buduci rok 2x vynosejnsia!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {STRING}!{}{}Preprava {STRING} z {STATION} do {STATION} bude buduci rok 3x vynosnejsia!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {STRING}!{}{}Preprava {STRING} z {STATION} do {STATION} bude buduci rok 4x vynosnejsia!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Ponuka dotacie:{}{}Prva preprava {STRING} z {STRING2} do {STRING2} bude dotovana miestnou spravou!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {COMPANY}!{}{}Preprava {STRING} z {STATION} do {STATION} bude buduci rok o 50% vynosnejsia!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {COMPANY}!{}{}Preprava {STRING} z {STATION} to {STATION} bude buduci rok 2x vynosejnsia!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {COMPANY}!{}{}Preprava {STRING} z {STATION} do {STATION} bude buduci rok 3x vynosnejsia!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotacia udelena spolocnosti {COMPANY}!{}{}Preprava {STRING} z {STATION} do {STATION} bude buduci rok 4x vynosnejsia!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} miestna sprava odmietla stavbu letiska v tomto meste
 STR_2036_COTTAGES                                               :Chaty
 STR_2037_HOUSES                                                 :Domy
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financovat vystavbu administrativnych a obchodnych budov.{}  Cena: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Na 1 rok kupit exkluzivne dopravne prava pre vasu spolocnost. Miestna sprava vam zaruci vyuzivanie dopravnych sluzieb len vasej spolocnosti.{} Cena: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Podplatit miestnu spravu pre zvysenie hodnotenia vasej spolocnosti, s rizikom tazkeho postihu ked sa to prevali!{}  Cost: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}V meste {TOWN} zavladol dopravny chaos!{}{}Rekonstrukcia ciest financovana {STRING} prinesie 6 mesiacov utrpenia pre motoristov!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}V meste {TOWN} zavladol dopravny chaos!{}{}Rekonstrukcia ciest financovana {COMPANY} prinesie 6 mesiacov utrpenia pre motoristov!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (v rekonstrukcii)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...nevhodne miesto
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Tu sa strom neda zasadit...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...prilis vela popisov
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Tu sa neda dat popis...
 STR_280A_SIGN                                                   :Popis
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Prilis vela autobusovych zastavok
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Prilis vela zastavok nakladnych automobilov
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Prilis blizko inej stanice/vykladky
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Zeleznicna stanica sa musi naskor zburat
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Prilis blizko ineho letiska
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Letisko sa musi najskor zburat
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Prilis blizko inej vykladky
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Zastavka musi byt najskor zburana
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Vykladka musi byt najskor zburana
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stanice
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stanice
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nie je -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...miesto je nepouzitelne
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Priliz blizko ineho pristavu
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolitan airport
 STR_305AB_LARGE                                                 :{BLACK}Medzinarodne letisko
 STR_305B_SIZE                                                   :{BLACK}Velkost
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Zeleznicna stanica
 STR_305F_AIRCRAFT_HANGAR                                        :Letecky hangar
 STR_3060_AIRPORT                                                :Letisko
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Nahrat Hru
 STR_4002_SAVE                                                   :{BLACK}Ulozit
 STR_4003_DELETE                                                 :{BLACK}Vymazat
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabajtov volnych
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Zariadenie je necitatelne
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Ulozenie hry zlyhalo
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkcia za posledny mesiac:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% prepravene)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% prepravene)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Vycentrovanie pohladu na poziciu tovarne
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}{STRING} sa zacina stavat nedaleko {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}{STRING} sa vysadza nedaleko {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Bez mena{SKIP}
+STR_SV_UNNAMED                                                  :Bez mena
 STR_SV_TRAIN_NAME                                               :Vlak {COMMA}
 STR_SV_ROADVEH_NAME                                             :Automobil {COMMA}
 STR_SV_SHIP_NAME                                                :Lod {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Lietadlo {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Sever
-STR_SV_STNAME_SOUTH                                             :{STRING} Juh
-STR_SV_STNAME_EAST                                              :{STRING} Vychod
-STR_SV_STNAME_WEST                                              :{STRING} Zapad
-STR_SV_STNAME_CENTRAL                                           :{STRING} Stred
-STR_SV_STNAME_TRANSFER                                          :{STRING} Razcestie
-STR_SV_STNAME_HALT                                              :{STRING} Za horou
-STR_SV_STNAME_VALLEY                                            :{STRING} Udolie
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Na kopci
-STR_SV_STNAME_WOODS                                             :{STRING} Lesy
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Jazera
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Predmestie
-STR_SV_STNAME_AIRPORT                                           :{STRING} Letisko
-STR_SV_STNAME_OILFIELD                                          :{STRING} Vrtna plosina
-STR_SV_STNAME_MINES                                             :{STRING} Bane
-STR_SV_STNAME_DOCKS                                             :{STRING} Pristav
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boja 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boja 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boja 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boja 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boja 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boja 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boja 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boja 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boja 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Zatavka
-STR_SV_STNAME_SIDINGS                                           :{STRING} Sihot
-STR_SV_STNAME_BRANCH                                            :{STRING} Za rohom
-STR_SV_STNAME_UPPER                                             :Horny {STRING}
-STR_SV_STNAME_LOWER                                             :Dolny {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
-STR_SV_STNAME_FOREST                                            :{STRING} Les
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Sever
+STR_SV_STNAME_SOUTH                                             :{STRING1} Juh
+STR_SV_STNAME_EAST                                              :{STRING1} Vychod
+STR_SV_STNAME_WEST                                              :{STRING1} Zapad
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Stred
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Razcestie
+STR_SV_STNAME_HALT                                              :{STRING1} Za horou
+STR_SV_STNAME_VALLEY                                            :{STRING1} Udolie
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} Na kopci
+STR_SV_STNAME_WOODS                                             :{STRING1} Lesy
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} Jazera
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Predmestie
+STR_SV_STNAME_AIRPORT                                           :{STRING1} Letisko
+STR_SV_STNAME_OILFIELD                                          :{STRING1} Vrtna plosina
+STR_SV_STNAME_MINES                                             :{STRING1} Bane
+STR_SV_STNAME_DOCKS                                             :{STRING1} Pristav
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boja 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boja 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boja 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boja 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boja 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boja 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boja 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boja 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boja 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Zatavka
+STR_SV_STNAME_SIDINGS                                           :{STRING1} Sihot
+STR_SV_STNAME_BRANCH                                            :{STRING1} Za rohom
+STR_SV_STNAME_UPPER                                             :Horny {STRING1}
+STR_SV_STNAME_LOWER                                             :Dolny {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
+STR_SV_STNAME_FOREST                                            :{STRING1} Les
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Hrac {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova tvar
 STR_7005_COLOR_SCHEME                                           :{BLACK}Farebna schema
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Meno prezidenta
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nazov spolocnosti sa neda zmenit...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Meno prezidenta sa neda zmenit...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Financie {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Financie {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Vydaje/Prijmy
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Vystavba
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nove vozidla
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Cena prevadzky vlakov
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Spolu:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf zisku
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Kliknut pre vyber novej farby
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Zvysit velkost pozicky
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Vratit cast pozicky
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Prezident)
-STR_7038_INAUGURATED                                            :{GOLD}Zvoleny: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Prezident)
+STR_7038_INAUGURATED                                            :{GOLD}Zvoleny: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Strojov:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} vlak
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} vlakov
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Hodnotenie produktivity spolocnosti (maximalna produktivita je 1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Hodnota spolocnosti
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Hodnotenie spolocnosti
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Dopravna spolocnost ma problemy!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} bude predana alebo vyhlasi bankrot pokial coskoro nezvysi produktivitu!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Prezident)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} bude predana alebo vyhlasi bankrot pokial coskoro nezvysi produktivitu!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Prezident)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Dopravne spolocnosti sa zlucili!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} bola predana {STRING} za {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Hladame zaujemcu na kupu nasej spolocnosti{}{}Chcete kupit nasu spolocnost {STRING} za {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} bola predana {COMPANY} za {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Hladame zaujemcu na kupu nasej spolocnosti{}{}Chcete kupit nasu spolocnost {COMPANY} za {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrot!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} bola zavreta veritelmi a cely majetok bol rozpredany!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} bola zavreta veritelmi a cely majetok bol rozpredany!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Zalozena nova dopravna spolocnost!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} zacina stavat nedaleko {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} zacina stavat nedaleko {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Spolocnost sa neda kupit...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Ceny prepravy
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Pocet dni transportu
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Predat 25% podiel v tejto spolocnosti
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}25% podiel v tejto spolocnosti sa neda kupit...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}25% podiel v tejto spolocnosti sa neda predat...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastnene {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% vlastnene {STRING}{}   {COMMA}% vlastnene {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} bola kupena spolocnostou {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastnene {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% vlastnene {COMPANY}{}   {COMMA}% vlastnene {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} bola kupena spolocnostou {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Tato spolocnost zatial neobchoduje s akciami...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Depo
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy vlak dorazil do stanice {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detaily)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detaily)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vlak v ceste
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Chod do {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Chod do {STATION} (prelozit a nalozit iny naklad)
 STR_8808_GO_TO_UNLOAD                                           :Chod do {STATION} (vylozit)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Informacie
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Vlak je prilis dlhy
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Vlaky sa daju prerobit len v depe
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Vlaky
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Vlaky
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nove vlaky
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nove jednokolajove vlaky
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nove magneticke vlaky
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Chod do
 STR_8827_FULL_LOAD                                              :{BLACK}Plne naloz
 STR_8828_UNLOAD                                                 :{BLACK}Vylozit
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Prikazy)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Koniec prikazov - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Oprava
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nemozno vyrobit vlak...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} cena: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} cena: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Cena: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Naklada/Vyklada
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musi byt zastaveny v depe
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Vlak sa neda poslat do depa...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Vynechat tento prikaz pokial nieje potrebna oprava
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nove {STRING} je uz dostupne!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Nosnost: {COMMA}t{}Rychlost: {VELOCITY}  Vykon: {COMMA}hp{}Cena prevadzky: {CURRENCY}/rok{}Kapacita: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Cena: {CURRENCY} Nosnost: {COMMA}t{}Rychlost: {VELOCITY}  Vykon: {COMMA}hp{}Cena prevadzky: {CURRENCY}/rok{}Kapacita: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Pokazene
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING2}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Nosnost: {LTBLUE}{COMMA}t  {BLACK}Vykon: {LTBLUE}{COMMA}hp{BLACK} Max. Rychlost: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (predchadzajuci rok: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automobil v ceste
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Automobily
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Automobily
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Garaz
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nove vozidla
 STR_9005_INFORMATION                                            :{BLACK}Informacia
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Vyrobit vozidlo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nemozno vyrobit automobil...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Najskor musi byt postavena garaz
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detaily)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING2}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_900E_MAX_SPEED                                              :{BLACK}Max. Rychlost: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (posledny rok: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} Cena: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...musi byt zastaveny v garazi
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nemozno predat automobil...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nemozno zastavit/spustit automobil...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Vyrobit vybrany automobil
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novy automobil dostupny!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Rychlost: {VELOCITY}{}Cena prevadzky: {CURRENCY}/rok{}Kapacita: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Rychlost: {VELOCITY}{}Cena prevadzky: {CURRENCY}/rok{}Kapacita: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Pomenovat automobil
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nemozno pomenovat automobil...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Tu nemozno postavit dok...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Lodenica
 STR_9804_NEW_SHIPS                                              :{BLACK}Nove lode
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Lode
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Lode
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Nemozno vyrobit lode...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Najskor musi byt postavena lodenica
 STR_9808_NEW_SHIPS                                              :{WHITE}Nove lode
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Nemozno predat lod...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}nemozno vyrobit lod...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Lod na ceste
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detaily)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING2}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_9813_MAX_SPEED                                              :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (posledny rok: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nemozno zastavit/spustit lod...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nemozno poslat lod do lodenice...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nemozno najst miestnu lodenicu
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Zobrazit detaily o lodi
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nova lod je dostupna!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {STRING}{}Cena prevadzky: {CURRENCY}/rok
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {STRING1}{}Cena prevadzky: {CURRENCY}/rok
 STR_982F_NAME_SHIP                                              :{BLACK}Pomenovat lod
 
 STR_9831_NAME_SHIP                                              :{WHITE}Pomenovat lod
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Premenovat typ lode
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nemozno premenovat typ lode...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Prerobit lod na iny typ nakladu
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Prerobit)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Prerobit)
 STR_983C_REFIT_SHIP                                             :{BLACK}Prerobit lod
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vybrat typ nakladu pre lod
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Prerobit lod na vybrany typ nakladu
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vyber typ nakladu:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova kapacita: {GOLD}{STRING}{}{BLACK}Cena prerabky: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova kapacita: {GOLD}{STRING1}{}{BLACK}Cena prerabky: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nemozno prerobit lod...
 STR_9842_REFITTABLE                                             :(prerobitelna)
 STR_GO_TO_SHIP_DEPOT                                            :Chod do {TOWN} Lodenice
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nove Lietadlo
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Vyrobit lietadlo
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nemozno vyrobit lietadlo...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Lietadlo
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Prikazy)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaily)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Lietadlo
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Prikazy)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING2}{BLACK}   Cena prevadzky: {LTBLUE}{CURRENCY}/rok
 STR_A00E_MAX_SPEED                                              :{BLACK}Max. Rychlost: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (posledny rok: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pokazene od posledneho servisu: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUMU16}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nemozno poslat lietadlo do hangaru...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Smeruje do {STATION} hangaru
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Smeruje do {STATION} hangaru, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nemozno zastavit/spustit lietadlo
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lietadlo leti
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Najskor treba postavit letisko
-STR_A019_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Letadlo sa musi zastavit v hangari
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nemozno predat lietadlo...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Vystavba letiska
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Premenovat typ lietadla
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nemozno premenovat typ lietadla...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Prerobit lietadlo na iny typ nakladu
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Prerobit)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Prerobit)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Prerobit lietadlo
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vyber novy typ nakladu
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Prerobit lietadlo na novy typ nakladu
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vybrat typ noveho nakladu:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}nova kapacita: {GOLD}{STRING}{}{BLACK}cena prerobenia: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}nova kapacita: {GOLD}{STRING1}{}{BLACK}cena prerobenia: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nemozno prerobit na novy typ nakladu...
 STR_A043_REFITTABLE                                             :(prerobitelne)
 STR_GO_TO_AIRPORT_HANGAR                                        :Chod do {STATION} Hangaru
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Podrobne
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vozidla:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stanice:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddelovac:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Predpona:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Pripona:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Prechod na Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Prechod na Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Prechod na Euro: {ORANGE}nikdy
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Nahlad: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zmenit parametre vlastnej meny
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Vykon: {GOLD}{COMMA}hp
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cena prevadzky: {GOLD}{CURRENCY}/yr
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyrobene: {GOLD}{NUMU16}{BLACK} Zivotnost: {GOLD}{COMMA} rokov
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyrobene: {GOLD}{NUM}{BLACK} Zivotnost: {GOLD}{COMMA} rokov
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spolahlivost: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rychlost: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{COMMA} cestujucich, {COMMA} balikov posty
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanane vagony: {GOLD}+{COMMA}hp{BLACK} Hmotnost: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pohanane vagony: {GOLD}+{COMMA}hp{BLACK} Hmotnost: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/spanish.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/spanish.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Se requiere terreno llano
 STR_0008_WAITING                                                :{BLACK}Esperando: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (en ruta desde
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (en ruta desde
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Acepta: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Acepta: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opciones del juego
 STR_00B2_MESSAGE                                                :{YELLOW}Mensaje
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensaje de {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensaje de {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}No se puede hacer eso....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}No se puede desbrozar esta zona....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Imperial (millas)
 STR_013A_METRIC_KILOMETERS                                      :Métrica (kilómetros)
-STR_013B_OWNED_BY                                               :{WHITE}...propiedad de {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...propiedad de {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Información
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carga total
-STR_013F_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidad) de este tren:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nuevo Juego
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pausar juego
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Guardar juego, abandonar juego, salir
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostrar lista de estaciones
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Coste de desbroce: {LTBLUE}N/D
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coste de desbroce: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
-STR_01A7_OWNER                                                  :{BLACK}Propietario: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridad local: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Propietario: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridad local: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ninguna
 STR_01AA_NAME                                                   :{BLACK}Nombre
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Seleccionar Tutorial/Demonstración
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Carga aceptada: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Carga aceptada: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Pista{SETX 88}Título
 STR_01E9_SHUFFLE                                                :{TINYFONT}Mezclar
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programa
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Selección del programa de música
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Índice de pistas
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programa - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Borrar
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Configuración para todos los mensajes (si/no/resumen)
 STR_MESSAGE_SOUND                                               :{YELLOW}Reproducir sonido para resumen de noticias
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...demasiado lejano del destino anterior
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de empresas que han alcanzado {NUMU16}{}(Nivel {STRING})
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabla clasificatoria de empresas en {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top de empresas que han alcanzado {NUM}{}(Nivel {STRING})
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Tabla clasificatoria de empresas en {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Hombre de negocios
 STR_0214_ENTREPRENEUR                                           :Empresario
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnate
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnate del siglo
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} logra el estado '{STRING}'!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} de {STRING} logra el estado '{STRING}'!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} logra el estado '{STRING}'!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} logra el estado '{STRING}'!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Selecciona el tamaño de la población
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Tamaño población:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Mostrar último mensaje/noticia
 STR_OFF                                                         :Apagado
 STR_SUMMARY                                                     :Resumen
 STR_FULL                                                        :Completo
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Directorio de poblaciones
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Nombres de diseño de vehículos
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,89 +992,89 @@
 
 STR_CONFIG_PATCHES_OFF                                          :No
 STR_CONFIG_PATCHES_ON                                           :Sí
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar velocidad del vehículo en la barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permitir la construcción en cuestas y orillas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir tamaño del área de captación más realista: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permitir demoler más propiedades de poblaciones: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permitir la construcción de trenes muy largos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar aceleración realista de trenes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibir a trenes y barcos realizar giros de 90 grados: {ORANGE}{STRING} {LTBLUE} (requires NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Unir estaciones de tren unas junto a otras: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Abandona est. con alguna carga completa, en 'carga completa': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo mejorado de carga: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacción: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar mercancía a una estación sólo si hay demanda: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir la construcción de puentes muy largos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permitir órdenes de ir a depósito: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Construcción de material en bruto usando industrias: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Construcción de más de una industria similar por población: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrias mismo tipo pueden construirse unas junto a otras: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar siempre fecha larga en la barra de estado: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar señales en el lado de conducción: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar ventana de finanzas al final del año: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Manejo sin parada compatible con TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Cola de vehículos de carretera (con efecto cuantificador): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Desplazar ventana mediante el cursor en los bordes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir sobornos a la autoridad local: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Encuentro de nuevos depósitos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estaciones no uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nuevo algoritmo para encuentro de rutas de los trenes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nuevo sistema de busq. de rutas global (NPF, anula a NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Mostrar velocidad del vehículo en la barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permitir la construcción en cuestas y orillas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permitir tamaño del área de captación más realista: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permitir demoler más propiedades de poblaciones: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permitir la construcción de trenes muy largos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Activar aceleración realista de trenes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibir a trenes y barcos realizar giros de 90 grados: {ORANGE}{STRING1} {LTBLUE} (requires NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Unir estaciones de tren unas junto a otras: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Abandona est. con alguna carga completa, en 'carga completa': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo mejorado de carga: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacción: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar mercancía a una estación sólo si hay demanda: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir la construcción de puentes muy largos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permitir órdenes de ir a depósito: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Construcción de material en bruto usando industrias: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Construcción de más de una industria similar por población: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrias mismo tipo pueden construirse unas junto a otras: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Mostrar siempre fecha larga en la barra de estado: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Mostrar señales en el lado de conducción: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Mostrar ventana de finanzas al final del año: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Manejo sin parada compatible con TTDPatch: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Cola de vehículos de carretera (con efecto cuantificador): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Desplazar ventana mediante el cursor en los bordes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir sobornos a la autoridad local: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Encuentro de nuevos depósitos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estaciones no uniformes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Nuevo algoritmo para encuentro de rutas de los trenes: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nuevo sistema de busq. de rutas global (NPF, anula a NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir siempre aeropuertos pequeños: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir siempre aeropuertos pequeños: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren está perdido si no hay progreso durante: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Un tren está perdido si no hay progreso durante: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Un tren está perdido si no hay progreso durante: {ORANGE}desactivado
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Revisar ordenes de los vehículos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Revisar ordenes de los vehículos: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :no
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :si, pero excluye los detenidos
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :de todos los vehículos
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar si los ingresos de un tren son negativos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Los vehículos nunca caducan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avisar si los ingresos de un tren son negativos: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Los vehículos nunca caducan: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Renovación automática de vehículos cuando se vuelven viejos
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Renovación aut. si tiene {ORANGE}{STRING}{LTBLUE} meses antes/después edad máx.
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Renovar auto. usando la menor cantidad de dinero: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duración del mensaje de error: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Muestra la población de esta población en esta etiqueta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árboles invisibles (con edificios transparentes): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura de la línea de nieve: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Expansión máxima de est.: {ORANGE}{STRING} {RED}Atención: Valores altos relantizan
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Mantener los helicópteros en helipuertos automáticamente: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máx trenes por jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máx vehículos de carretera por jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Máx aeroplanos por jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Máx barcos por jugador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Renovación aut. si tiene {ORANGE}{STRING1}{LTBLUE} meses antes/después edad máx.
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Renovar auto. usando la menor cantidad de dinero: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Duración del mensaje de error: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Muestra la población de esta población en esta etiqueta: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Árboles invisibles (con edificios transparentes): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura de la línea de nieve: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Expansión máxima de est.: {ORANGE}{STRING1} {RED}Atención: Valores altos relantizan
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Mantener los helicópteros en helipuertos automáticamente: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar trenes para el ordenador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactivar vehículos de carretera para el ordenador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeroplanos para el ordenador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar barcos para el ordenador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máx trenes por jugador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máx vehículos de carretera por jugador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Máx aeroplanos por jugador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Máx barcos por jugador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nueva IA (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar trenes para el ordenador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactivar vehículos de carretera para el ordenador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeroplanos para el ordenador: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar barcos para el ordenador: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de despacho por defecto para trenes: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nueva IA (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de despacho por defecto para trenes: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervalo de despacho por defecto para trenes: {ORANGE}no
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de despacho por defecto para veh. de carretera: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Intervalo de despacho por defecto para veh. de carretera: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Intervalo de despacho por defecto para veh. de carretera: {ORANGE}no
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de despacho por defecto para aeroplanos: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Intervalo de despacho por defecto para aeroplanos: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Intervalo de despacho por defecto para aviones: {ORANGE}no
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}{STRING} días
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}{STRING1} días
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}no
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar servicio cuando las averías están desactivadas: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar servicio cuando las averías están desactivadas: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Noticias en color aparecen en: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Fecha de inicio: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Fin del juego en: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Noticias en color aparecen en: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Fecha de inicio: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Fin del juego en: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Activar economía suave (cambios más pequeños)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Permitir comprar acciones de otras empresas
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Cuando arrastre colocar señales cada: {ORANGE}{STRING} casilla(s)
-STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permitir colocación automática de señales pbs: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posición de la barra de herramientas principal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Cuando arrastre colocar señales cada: {ORANGE}{STRING1} casilla(s)
+STR_CONFIG_AUTO_PBS_PLACEMENT                                   :{LTBLUE}Permitir colocación automática de señales pbs: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Posición de la barra de herramientas principal: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Izquierda
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centro
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Derecha
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Radio de snap de ventana: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Radio de snap de ventana: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Radio de snap de ventana: {ORANGE}desactivado
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfaz
@@ -1089,7 +1085,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competidores
 
 STR_CONFIG_PATCHES_DISABLED                                     :desactivado
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Cambiar valor de la opción
@@ -1105,13 +1101,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Atención! Usted está a punto de traicionar a sus competidores. Tenga presente que tal deshonra será recordada para toda la eternidad.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementar dinero en {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Jugar como el jugador: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (elimina industrias, etc.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Los túneles pueden cruzarse: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mientras se está en pausa: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer mágico (elimina industrias, etc.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Los túneles pueden cruzarse: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mientras se está en pausa: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Los Jets no se estrellarán (frecuentemente) en aeropuertos pequeños: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Cambiar clima: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Cambiar fecha: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificación de los valores de producción: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificación de los valores de producción: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Hacia {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Hacia {WAYPOINT}, {VELOCITY}
@@ -1165,7 +1161,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...boya en uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}No se puede retirar parte de la estación...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}No se puede convertir tipo de raíl aquí...
@@ -1203,19 +1199,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construir mina de azúcar
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cercano a otra industria
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Reformar tren para transportar otro tipo de carga
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Reformar)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Reformar tren
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Elegir tipo de carga para que el tren lleve
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Reformar tren para transportar mercancía resaltada
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}No se puede reformar tren...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervalo de despachos en porcentajes: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervalo de despachos en porcentajes: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar producción
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Bienvenido a esta nueva IA, en progreso. Puede esperar problemas. Cuando los encuentres, haz una captura de pantalla y envíala al foro. Disfruta!
@@ -1254,7 +1249,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Escenario:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión servidor:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección servidor:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección servidor:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Fecha inicio:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Fecha actual:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protegido por contraseña!
@@ -1323,14 +1318,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO EMPRESA
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nombre empresa:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguración:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguración:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valor empresa:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balance actual:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingresos último año:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendimiento:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendimiento:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehículos:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estaciones:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehículos:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estaciones:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Jugadores:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
@@ -1346,8 +1341,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Recibiendo información del juego..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Recibiendo información empresa..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} cliente(s) delante de usted
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbytes descargados
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) delante de usted
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descargados
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectado
 
@@ -1365,7 +1360,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} No es posible cargar el juego multijugador.
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} No se puede iniciar el servidor.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} No se puede conectar.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tiempo de espera agotado en conexión #{NUMU16}.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tiempo de espera agotado en conexión #{NUM}.
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Se ha producido un error de protocolo y la conexión ha sido cerrada.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La versión de este cliente no corresponde con la versión de este servidor.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Contraseña incorrecta.
@@ -1418,8 +1413,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Tamaño X del mapa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Tamaño Y del mapa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Tamaño X del mapa: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Tamaño Y del mapa: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Coste: {CURRENCY}
@@ -1517,10 +1512,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Poblaciones
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}El edificio debe demolerse primero
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Habitantes: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
@@ -1553,23 +1548,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Mostrar información sobre autoridades locales
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} autoridad local
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ranking de empresas de transporte:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subvenciones
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Se ofrecen subvenciones por llevar:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} desde {STRING} a {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} desde {STRING2} a {STRING2}
 STR_2028_BY                                                     :{YELLOW} (antes de {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Ninguna
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Líneas ya subvencionadas:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} desde {STATION} a {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} desde {STATION} a {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, hasta {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferta de subsidio caducada:{}{}{STRING} de {STRING} a {STRING} ya no conlleva una subvención.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferta de subsidio caducada:{}{}{STRING} de {STRING2} a {STRING2} ya no conlleva una subvención.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subvención retirada:{}{}Servicio de {STRING} desde {STATION} a {STATION} ya no está subvencionado.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Se ofrece subvención en la línea:{}{}El primer {STRING} que cubra la línea desde {STRING} a {STRING} recibirá una subvención durante un año por parte de las autoridades locales!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {STRING}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará el 50% más durante un año!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {STRING}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará tasa doble durante un año!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {STRING}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará tasa triple durante un año!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {STRING}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará tasa cuádruple durante un año!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Se ofrece subvención en la línea:{}{}El primer {STRING} que cubra la línea desde {STRING2} a {STRING2} recibirá una subvención durante un año por parte de las autoridades locales!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {COMPANY}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará el 50% más durante un año!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {COMPANY}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará tasa doble durante un año!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {COMPANY}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará tasa triple durante un año!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}¡Subvención otorgada a {COMPANY}!{}{}¡Servicio de {STRING} desde {STATION} a {STATION} pagará tasa cuádruple durante un año!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} la autoridad local rechaza la construcción de otro aeropuerto en esta población
 STR_2036_COTTAGES                                               :Cabañas
 STR_2037_HOUSES                                                 :Casas
@@ -1603,7 +1598,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Pagar la construcción de nuevos edificios comerciales en la población.{}  Coste: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compre la exclusiva durante 1 año de los derechos de transporte en esta población. Las autoridades solo permitirán el uso de las estaciones de su empresa.{} Coste: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Soborne a las autoridades locales para aumentar su ranking, con el riesgo de una severa penalización si es descubierto.{}  Coste: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Colapso circulatorio en {TOWN}!{}{}¡Programa de reconstrucción de carreteras patrocinado por {STRING} causa 6 meses de problemas a los conductores!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Colapso circulatorio en {TOWN}!{}{}¡Programa de reconstrucción de carreteras patrocinado por {COMPANY} causa 6 meses de problemas a los conductores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (bajo construcción)
@@ -1621,7 +1616,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...sitio no apropiado
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}No se pueden plantar árboles aquí...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...demasiadas señales
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}No se puede colocar una señal aquí...
 STR_280A_SIGN                                                   :Sign
@@ -1645,7 +1639,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paradas de Autobús
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas zonas de carga
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Demasiado cerca de otra estación/zona de carga
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Primero debe demolerse estación de tren
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Demasiado cerca de otro aeropuerto
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Primero debe demolerse el aeropuerto
@@ -1678,8 +1672,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}Demasiado cerca de otra estación de camione
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Primero debe demolerse estación de autobús
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Primero debe demolerse estación de camiones
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Estaciones
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estaciones
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ninguna -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...lugar inapropiado
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Demasiado cerca de otro muelle
@@ -1700,8 +1694,8 @@
 STR_305AA_LARGE                                                 :{BLACK}Aeropuerto Metropolitano
 STR_305AB_LARGE                                                 :{BLACK}Aeropuerto International
 STR_305B_SIZE                                                   :{BLACK}Tamaño
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Estación de tren
 STR_305F_AIRCRAFT_HANGAR                                        :Hangar de aeroplanos
 STR_3060_AIRPORT                                                :Aeropuerto
@@ -1734,7 +1728,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Cargar Juego
 STR_4002_SAVE                                                   :{BLACK}Guardar
 STR_4003_DELETE                                                 :{BLACK}Borrar
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes libres
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}No es posible leer la unidad
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Error guardando juego
@@ -1796,7 +1790,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producción mes anterior:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transportado)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transportado)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrar la vista sobre la industria
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nuevo {STRING} bajo construcción cerca de {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nuevo {STRING} está siendo plantado cerca de {TOWN}!
@@ -1876,45 +1870,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Sin nombre{SKIP}
+STR_SV_UNNAMED                                                  :Sin nombre
 STR_SV_TRAIN_NAME                                               :Tren {COMMA}
 STR_SV_ROADVEH_NAME                                             :Vehículo de carretera {COMMA}
 STR_SV_SHIP_NAME                                                :Barco {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Norte
-STR_SV_STNAME_SOUTH                                             :{STRING} Sur
-STR_SV_STNAME_EAST                                              :{STRING} Este
-STR_SV_STNAME_WEST                                              :{STRING} Oeste
-STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Intercambio
-STR_SV_STNAME_HALT                                              :{STRING} Parada
-STR_SV_STNAME_VALLEY                                            :Valle de {STRING}
-STR_SV_STNAME_HEIGHTS                                           :Cumbres de {STRING}
-STR_SV_STNAME_WOODS                                             :Arboleda de {STRING}
-STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING}
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Intercambio
-STR_SV_STNAME_AIRPORT                                           :Aeropuerto de {STRING}
-STR_SV_STNAME_OILFIELD                                          :Campo petrolífero de {STRING}
-STR_SV_STNAME_MINES                                             :Minas de {STRING}
-STR_SV_STNAME_DOCKS                                             :Muelles de {STRING}
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boya 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boya 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boya 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boya 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boya 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boya 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boya 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boya 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boya 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} Anexo
-STR_SV_STNAME_SIDINGS                                           :Proximidades de {STRING}
-STR_SV_STNAME_BRANCH                                            :Ramal de {STRING}
-STR_SV_STNAME_UPPER                                             :{STRING} Alto
-STR_SV_STNAME_LOWER                                             :{STRING} Bajo
-STR_SV_STNAME_HELIPORT                                          :Helipuerto de {STRING}
-STR_SV_STNAME_FOREST                                            :Bosque de {STRING}
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} Norte
+STR_SV_STNAME_SOUTH                                             :{STRING1} Sur
+STR_SV_STNAME_EAST                                              :{STRING1} Este
+STR_SV_STNAME_WEST                                              :{STRING1} Oeste
+STR_SV_STNAME_CENTRAL                                           :{STRING1} Central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} Intercambio
+STR_SV_STNAME_HALT                                              :{STRING1} Parada
+STR_SV_STNAME_VALLEY                                            :Valle de {STRING1}
+STR_SV_STNAME_HEIGHTS                                           :Cumbres de {STRING1}
+STR_SV_STNAME_WOODS                                             :Arboleda de {STRING1}
+STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING1}
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} Intercambio
+STR_SV_STNAME_AIRPORT                                           :Aeropuerto de {STRING1}
+STR_SV_STNAME_OILFIELD                                          :Campo petrolífero de {STRING1}
+STR_SV_STNAME_MINES                                             :Minas de {STRING1}
+STR_SV_STNAME_DOCKS                                             :Muelles de {STRING1}
+STR_SV_STNAME_BUOY_1                                            :{STRING1} Boya 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} Boya 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} Boya 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} Boya 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} Boya 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} Boya 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} Boya 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} Boya 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} Boya 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} Anexo
+STR_SV_STNAME_SIDINGS                                           :Proximidades de {STRING1}
+STR_SV_STNAME_BRANCH                                            :Ramal de {STRING1}
+STR_SV_STNAME_UPPER                                             :{STRING1} Alto
+STR_SV_STNAME_LOWER                                             :{STRING1} Bajo
+STR_SV_STNAME_HELIPORT                                          :Helipuerto de {STRING1}
+STR_SV_STNAME_FOREST                                            :Bosque de {STRING1}
 
 ############ end of	savegame specific region!
 
@@ -1993,7 +1987,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Jugador {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nueva Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema Color
@@ -2005,9 +1999,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Nombre del Presidente
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}No se puede cambiar el nombre de la empresa...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}No se puede cambiar el nombre del presidente...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Finanzas {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finanzas {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Gastos/Ingresos
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construcción
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nuevos vehículos
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Coste operación Trenes
@@ -2024,7 +2018,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Total:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Gráfico de Ingresos
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2049,8 +2043,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Click en esquema de color elegido
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Incrementar préstamo
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Pagar parte del préstamo
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(Presidente)
-STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
+STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehiculos:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tren
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} trenes
@@ -2078,18 +2072,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Calificaciones de actuación de compañías (tasa máx.=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valores de las empresas
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Ranking de Empresas
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}¡Empresa en problemas!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} debe ser vendida o declarada en bancarrota a no ser que mejore su actuación!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(Presidente)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} debe ser vendida o declarada en bancarrota a no ser que mejore su actuación!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Presidente)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}¡Absorción de empresa de transportes!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}¡{STRING} ha sido vendida a {STRING} por {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Estamos buscando una empresa de transportes para adquirir la nuestra{}{}¿Deseas comprar {STRING} por {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}¡{COMPANY} ha sido vendida a {COMPANY} por {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Estamos buscando una empresa de transportes para adquirir la nuestra{}{}¿Deseas comprar {COMPANY} por {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}¡Bancarrota!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} ha sido cerrada por acreedores y todos sus activos se han vendido!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} ha sido cerrada por acreedores y todos sus activos se han vendido!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}¡Nueva empresa de transportes!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} comienza su construcción cerca de {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} comienza su construcción cerca de {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}No se puede comprar la empresa...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Tasas de pago por carga
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Días en tránsito
@@ -2124,9 +2118,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vender 25% acciones de esta empresa
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}No se puede comprar el 25% de acciones...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}No se puede vender el 25% de acciones...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedad de {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propiedad de {STRING}{}   {COMMA}% propiedad de {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} ha sido comprada por {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedad de {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% propiedad de {COMPANY}{}   {COMMA}% propiedad de {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} ha sido comprada por {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Esta empresa todavía no dispone acciones a la venta...
 
 ##id 0x8000
@@ -2398,10 +2392,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN}, Depósito de tren
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer tren llega a {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalles)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Detalles)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren en camino
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Ir a {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Ir a {STATION} (Transferir y cargar)
 STR_8808_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
@@ -2433,7 +2427,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Información
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren demasiado largo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Los trenes únicamente puede ser modificados en el interior de los depósitos
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Trenes
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trenes
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nuevos vehículos de raíl
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nuevos vehículos de monorraíl
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nuevos vehículos de levitación magnética
@@ -2445,14 +2439,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Ir a
 STR_8827_FULL_LOAD                                              :{BLACK}Carga
 STR_8828_UNLOAD                                                 :{BLACK}Descarga
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Órdenes)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Órdenes)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fin de pedidos - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Servicio
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}No se puede construir vehículo...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construido: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construido: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Cargando / Descargando
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}El tren debe pararse dentro del depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}No se puede enviar el tren al depósito...
@@ -2501,9 +2495,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta orden a menos que el servicio sea necesario
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nuevo {STRING} ahora disponible!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA}t{}Velocidad: {VELOCITY}  Potencia: {COMMA}hp{}Coste Operativo: {CURRENCY}/año{}Capacidad: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Coste: {CURRENCY} Peso: {COMMA}t{}Velocidad: {VELOCITY}  Potencia: {COMMA}hp{}Coste Operativo: {CURRENCY}/año{}Capacidad: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Averiado
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING2}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Peso: {LTBLUE}{COMMA}t  {BLACK}Potencia: {LTBLUE}{COMMA}hp{BLACK} Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (último año: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último mantenimiento: {LTBLUE}{COMMA}
@@ -2526,8 +2520,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vehículo de carretera en camino
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vehículos de Carretera
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehículos de Carretera
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Depósito de vehículos
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nuevos vehículos
 STR_9005_INFORMATION                                            :{BLACK}Información
@@ -2535,14 +2529,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construir vehículo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}CNo se puede construir vehículo...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Primero debe construirse depósito
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Órdenes)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detalles)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING2}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (último año: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...debe estar detenido dentro de un depósito
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}No se puede vender vehículo...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No se puede detener/arrancar vehículo...
@@ -2567,7 +2560,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construir el vehículo resaltado
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}¡Nuevo vehículo de carretera disponible!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Coste: {CURRENCY}{}Velocidad: {VELOCITY}{}Coste Operativo: {CURRENCY}/año{}Capacidad: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Coste: {CURRENCY}{}Velocidad: {VELOCITY}{}Coste Operativo: {CURRENCY}/año{}Capacidad: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nombrar vehículo
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}No se puede nombrar vehículo...
@@ -2590,7 +2583,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}No se pueden construir muelles aquí...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Astillero de {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nuevos barcos
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Barcos
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Barcos
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}No se pueden construir barcos...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Primero debe construirse astillero
 STR_9808_NEW_SHIPS                                              :{WHITE}Nuevos barcos
@@ -2599,15 +2592,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}No se puede vender barco...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}No se puede construir barco...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Barco en camino
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Órdenes)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detalles)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING2}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_9813_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (año anterior: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}No se puede detener/arrancar barco...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}No se puede mandar barco a astillero...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}No se puede encontrar ruta al astillero
@@ -2631,7 +2623,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostrar detalles del barco
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}¡Nuevo barco ya disponible!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidad Máx.: {VELOCITY}{}Capacidad: {STRING}{}Coste Operativo: {CURRENCY}/año
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidad Máx.: {VELOCITY}{}Capacidad: {STRING1}{}Coste Operativo: {CURRENCY}/año
 STR_982F_NAME_SHIP                                              :{BLACK}Nombrar barco
 
 STR_9831_NAME_SHIP                                              :{WHITE}Nombrar barco
@@ -2644,12 +2636,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Renombrar tipo de barco
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}No se puede renombrar tipo de barco...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Reformar barco de carga para que transporte otro tipo de carga
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Reformar)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Reformar)
 STR_983C_REFIT_SHIP                                             :{BLACK}Reformar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccione tipo de carga para que el barco la lleve
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Reformar barco para que transporte el tipo de carga resaltado
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccione tipo de carga a llevar:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING1}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}No se puede reformar barco...
 STR_9842_REFITTABLE                                             :(reformable)
 STR_GO_TO_SHIP_DEPOT                                            :Ir al astillero de {TOWN}
@@ -2664,15 +2656,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nuevo avilón
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construir aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No se puede construir aeronave...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Aeronave
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Órdenes)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detalles)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronave
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Órdenes)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING2}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_A00E_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY}  (año anterior: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilidad: {LTBLUE}{COMMA}%  {BLACK}Averías desde último despacho: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUMU16}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Const.: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}No se puede enviar la aeronave al hangar
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}Ir al hangar de {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}Ir al hangar de {STATION}, {VELOCITY}
@@ -2681,8 +2673,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}No se puede detener/arrancar aeronave...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}La aeronave está en vuelo
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Primero debe construirse aeropuerto
-STR_A019_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}La aeronave debe estar parada en hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}No se puede vender la aeronave...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construir aeropuerto
@@ -2717,12 +2709,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Renombrar tipo de aeronave
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}No se puede renombrar el tipo de aeronave...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Reformar aeronave para llevar otro tipo de carga
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Reformar)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Reformar)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Reformar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccione tipo de carga para que la aeronave la lleve
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Reformar aeronave para que lleve el tipo de carga resaltado
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Elige tipo de carga para llevar:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING1}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No se puede reformar aeronave...
 STR_A043_REFITTABLE                                             :(reformable)
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir al hangar de {STATION}
@@ -2746,8 +2738,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalle
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehículos:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estaciones:
@@ -2784,7 +2776,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefijo:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufijo:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Cambio al Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Cambio al Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Cambio al Euro: {ORANGE}nunca
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Previa: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Cambiar parámetro de moneda personalizada
@@ -2834,11 +2826,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidad: {GOLD}{VELOCITY}{BLACK}   Potencia: {GOLD}{COMMA}cv
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coste de operación: {GOLD}{CURRENCY}/año
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidad: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Diseñado: {GOLD}{NUMU16}{BLACK} Vida: {GOLD}{COMMA} años
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidad: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Diseñado: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} años
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidad máxima: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Coste: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Coste: {GOLD}{CURRENCY}{BLACK} Velocidad: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidad: {GOLD}{COMMA} pasajeros, {COMMA} sacas de correo
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagones con motor: {GOLD}+{COMMA}cv{BLACK} Peso: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagones con motor: {GOLD}+{COMMA}cv{BLACK} Peso: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/lang/swedish.txt	Fri Jul 15 14:16:14 2005 +0000
+++ b/lang/swedish.txt	Fri Jul 15 14:53:44 2005 +0000
@@ -12,8 +12,8 @@
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Platt mark krävs
 STR_0008_WAITING                                                :{BLACK}Väntar: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{STRING}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING}{YELLOW}  (på väg från
+STR_0009                                                        :{WHITE}{STRING1}
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{STRING1}{YELLOW}  (på väg från
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepterar: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepterar: {GOLD}
@@ -182,7 +182,7 @@
 STR_00B0_MAP                                                    :{WHITE}Karta - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spelinställningar
 STR_00B2_MESSAGE                                                :{YELLOW}Meddelande
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Meddelande från {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Meddelande från {STRING1}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan inte utföra detta...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan inte röja området...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade
@@ -311,12 +311,12 @@
 
 STR_0139_IMPERIAL_MILES                                         :Engelsk mil (miles)
 STR_013A_METRIC_KILOMETERS                                      :Metrisk (kilometer)
-STR_013B_OWNED_BY                                               :{WHITE}...ägs av {STRING}
+STR_013B_OWNED_BY                                               :{WHITE}...ägs av {STRING2}
 STR_013C_CARGO                                                  :{BLACK}Gods
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Kapaciteter
 STR_013E_TOTAL_CARGO                                            :{BLACK}Gods Totalt
-STR_013F_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_013F_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Tågets totala kapacitet:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}{CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nytt spel
@@ -394,8 +394,8 @@
 ############ range for months ends
 
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
-STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
-STR_0170                                                        :{TINYFONT}{STRING}-
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING2}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Pausa spelet
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Spara spelet, avbryt spelet, avsluta spelet
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Visa lista över företagets stationer
@@ -457,8 +457,8 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kostnad att röja: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kostnad att röja: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Ägare: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kommun: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Ägare: {LTBLUE}{STRING1}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kommun: {LTBLUE}{STRING1}
 STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Namn
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
@@ -502,11 +502,7 @@
 STR_01CD_SELECT_TUTORIAL_DEMONSTRATION                          :{WHITE}Välj Tutorial/Demonstration
 
 ############ range for cargo acecpted starts
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepterat gods: {LTBLUE}{STRING}
-STR_01CF_CARGO_ACCEPTED                                         :{BLACK}Accepterat gods: {LTBLUE}{STRING}, {STRING}
-STR_01D0_CARGO_ACCEPTED                                         :{BLACK}Accepterat gods: {LTBLUE}{STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_4                                            :{BLACK}Accepterat gods: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}
-STR_CARGO_ACCEPTED_5                                            :{BLACK}Accepterat gods: {LTBLUE}{STRING}, {STRING}, {STRING}, {STRING}, {STRING}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepterat gods: {LTBLUE}
 ############ range for cargo acecpted ends
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
@@ -531,13 +527,13 @@
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
-STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING1}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Spår{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Slumpa
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musikprogram
-STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
-STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING}"
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING1}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA}   "{STRING1}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Spårindex
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Töm
@@ -575,8 +571,8 @@
 STR_MESSAGES_ALL                                                :{YELLOW}Inställning för alla meddelandetyper (på/av/summarisk)
 STR_MESSAGE_SOUND                                               :{YELLOW}Spela upp ljud för summariska nyhetsmeddelanden
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...för långt från föregående destination
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUMU16}{}({STRING} Level)
-STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUMU16}
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top companies who reached {NUM}{}({STRING} Level)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Company League Table in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Affärsman
 STR_0214_ENTREPRENEUR                                           :Entreprenör
@@ -585,10 +581,10 @@
 STR_0217_MAGNATE                                                :Magnat
 STR_0218_MOGUL                                                  :Mogul
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Århundradets Tycoon
-STR_HIGHSCORE_NAME                                              :{BIGFONT}{STRING}, {STRING}
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
-STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{STRING} uppnår '{STRING}' status!
-STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{STRING} från {STRING} uppnår '{STRING}' status!
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} uppnår '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} från {COMPANY} uppnår '{STRING}' status!
 STR_021D                                                        :{BLACK}
 STR_021E                                                        :{WHITE}
 STR_021F                                                        :{BLUE}{COMMA}
@@ -728,12 +724,12 @@
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Välj stadsstorlek
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Stadsstorlek:
 
-STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B6                                                        :{STRING}  -  {STRING5}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Visa senaste meddelande eller nyhet
 STR_OFF                                                         :Av
 STR_SUMMARY                                                     :Summering
 STR_FULL                                                        :Full
-STR_02BA                                                        :{SILVER}- -  {STRING}  - -
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Lista av städer
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Fordonens modellnamn
 STR_02BD                                                        :{BLACK}{STRING}
@@ -996,88 +992,88 @@
 
 STR_CONFIG_PATCHES_OFF                                          :Av
 STR_CONFIG_PATCHES_ON                                           :På
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Visa fordonshastighet i statusfältet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Tillåt byggnation på sluttningar och kuster: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Tillåt mer realistiska uppsamlingsområden för stationer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Tillåt borttagning av mera stadsägda vägar etc.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Tillåt väldigt långa tåg: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Aktivera realistisk acceleration för tåg: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Förbjud tåg och skepp att göra 90 graders svängar: {ORANGE}{STRING} {LTBLUE} (kräver NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Kombinera tågstationer som byggs bredvid varandra: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Lämna stationen när något gods är fullt, om 'full load': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Använd förbättrad algoritm: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Leverera gods till en station enbart om någon frågar efter det: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillåt väldigt långa broar: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Tillåt order att gå till depå/bussgarage: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Tillåt byggnation av råmaterialsproducerande industrier: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Tillåt flera industrier av samma typ per stad: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrier av samma typ kan byggas nära varandra: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Visa alltid långt datum i statusfältet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Visa signaler på körsidan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Visa finansfönstret vid slutet av året: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch-kompatibel nonstop-hantering: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Vägfordonsköing (med kvanteffekter): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Scrolla vyn när musen är vid kanten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillåt mutning av den lokala kommunen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Ny algoritm för att hitta depå: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Icke-rektangulära stationer: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Ny algoritm för att hitta rutt (NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny globalt sätt att hitta rutt (NPF, åsidosätter NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Visa fordonshastighet i statusfältet: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Tillåt byggnation på sluttningar och kuster: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Tillåt mer realistiska uppsamlingsområden för stationer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Tillåt borttagning av mera stadsägda vägar etc.: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Tillåt väldigt långa tåg: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Aktivera realistisk acceleration för tåg: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Förbjud tåg och skepp att göra 90 graders svängar: {ORANGE}{STRING1} {LTBLUE} (kräver NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Kombinera tågstationer som byggs bredvid varandra: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Lämna stationen när något gods är fullt, om 'full load': {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Använd förbättrad algoritm: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Leverera gods till en station enbart om någon frågar efter det: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillåt väldigt långa broar: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Tillåt order att gå till depå/bussgarage: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Tillåt byggnation av råmaterialsproducerande industrier: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Tillåt flera industrier av samma typ per stad: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrier av samma typ kan byggas nära varandra: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Visa alltid långt datum i statusfältet: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Visa signaler på körsidan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Visa finansfönstret vid slutet av året: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch-kompatibel nonstop-hantering: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Vägfordonsköing (med kvanteffekter): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Scrolla vyn när musen är vid kanten: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillåt mutning av den lokala kommunen: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Ny algoritm för att hitta depå: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Icke-rektangulära stationer: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Ny algoritm för att hitta rutt (NTP): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny globalt sätt att hitta rutt (NPF, åsidosätter NTP): {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Tillåt alltid små flygplatser: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Tillåt alltid små flygplatser: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Ett tåg är vilse om ingen vidare framgång är nådd under: {ORANGE}{STRING} dagar
+STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Ett tåg är vilse om ingen vidare framgång är nådd under: {ORANGE}{STRING1} dagar
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Ett tåg är vilse om ingen vidare framgång är nådd under: {ORANGE}disabled
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Granska fordonens destinationer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Granska fordonens destinationer: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nej
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, förutom stannade fordon
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :ja, på alla fordon
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varna om ett tågs inkomst är negativ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Fordon blir aldrig gamla: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varna om ett tågs inkomst är negativ: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Fordon blir aldrig gamla: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Förnya fordon automatiskt när dom blir gamla
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Förnya automatiskt fordon {ORANGE}{STRING}{LTBLUE} månader före/efter maximal ålder
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minst mängd pengar i kassan för automatisk förnyelse av fordon: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Hur länge felmeddelanden visas: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Visa befolkningsmängd i stadsnamnet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Osynliga träd (när genomskinliga byggnader är valt): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snölinjeshöjd: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximal spridning av en station: {ORANGE}{STRING} {RED}Varning: Hög inställning slöar ner spelet
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Serva helikoptrar vid landningplattor automatiskt: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max antal tåg per spelare: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max antal vägfordon per spelare: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max antal flygplan per spelare: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max antal skepp per spelare: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Förnya automatiskt fordon {ORANGE}{STRING1}{LTBLUE} månader före/efter maximal ålder
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minst mängd pengar i kassan för automatisk förnyelse av fordon: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Hur länge felmeddelanden visas: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Visa befolkningsmängd i stadsnamnet: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Osynliga träd (när genomskinliga byggnader är valt): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Snölinjeshöjd: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximal spridning av en station: {ORANGE}{STRING1} {RED}Varning: Hög inställning slöar ner spelet
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Serva helikoptrar vid landningplattor automatiskt: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Förbjud tåg för datorn: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Förbjud vägfordon för datorn: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Förbjud flygplan för datorn: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Förbjud skepp för datorn: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max antal tåg per spelare: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max antal vägfordon per spelare: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max antal flygplan per spelare: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max antal skepp per spelare: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Dator med ny AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Förbjud tåg för datorn: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Förbjud vägfordon för datorn: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Förbjud flygplan för datorn: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Förbjud skepp för datorn: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standard serviceintervall för tåg: {ORANGE}{STRING} dagar
+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Dator med ny AI (alpha): {ORANGE}{STRING1}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Standard serviceintervall för tåg: {ORANGE}{STRING1} dagar
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Standard serviceintervall för tåg: {ORANGE}av
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standard serviceintervall för vägfordon: {ORANGE}{STRING} dagar
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Standard serviceintervall för vägfordon: {ORANGE}{STRING1} dagar
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Standard serviceintervall för vägfordon: {ORANGE}av
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standard serviceintervall för flygplan: {ORANGE}{STRING} dagar
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Standard serviceintervall för flygplan: {ORANGE}{STRING1} dagar
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Standard serviceintervall för flygplan: {ORANGE}av
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard serviceintervall för skepp: {ORANGE}{STRING} dagar
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard serviceintervall för skepp: {ORANGE}{STRING1} dagar
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Default service interval for ships: {ORANGE}av
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING1}
 
-STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Färgade nyheter visas i: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Startdatum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Avsluta spelet om: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Färgade nyheter visas i: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Startdatum: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Avsluta spelet om: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Lugn ekonomi (flera små ändringar)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Tillåt inköp av aktier från andra företag
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Vid utdragning av signaler, placera en signal var: {ORANGE}{STRING} ruta
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position av verktygsraden: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Vid utdragning av signaler, placera en signal var: {ORANGE}{STRING1} ruta
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Position av verktygsraden: {ORANGE}{STRING1}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Vänster
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centrerad
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Höger
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Fönstersnäppsradie: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Fönstersnäppsradie: {ORANGE}{STRING1} px
 STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Fönstersnäppsradie: {ORANGE}avaktiverad
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Gränssnitt
@@ -1088,7 +1084,7 @@
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Motståndare
 
 STR_CONFIG_PATCHES_DISABLED                                     :Avaktiverat
-STR_CONFIG_PATCHES_INT32                                        :{INT32}
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Ändra inställningsvärde
@@ -1104,13 +1100,13 @@
 STR_CHEATS_WARNING                                              :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att sådant aldrig glöms bort.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Öka pengar genom att {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelar som: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}trimmad bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnlar kan korsa varandra: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggnation i pause-läge: {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}trimmad bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING1}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnlar kan korsa varandra: {ORANGE}{STRING1}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggnation i pause-läge: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetplan kommer inte att störta (frekvent) på små flygplatser: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Byt klimat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Byt datum: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktivera modifierande produceringsvärden: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktivera modifierande produceringsvärden: {ORANGE}{STRING1}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}På väg mot {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}På väg mot {WAYPOINT}, {VELOCITY}
@@ -1164,7 +1160,7 @@
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... bojen används!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUMU16}x{NUMU16} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ej ta bort del av station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan ej konvertera spårtyp här...
@@ -1202,19 +1198,18 @@
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Bygg sockergruva
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}){YELLOW} ({COMMA}% transporterat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING}/{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporterat)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}){YELLOW} ({COMMA}% transporterat)
+STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{TOWN} {STRING}{BLACK} ({STRING1}/{STRING1}){YELLOW} ({COMMA}%/{COMMA}% transporterat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{TOWN} {STRING}
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... för nära annan industri
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa tåg för att bära annan godstyp
-STR_RAIL_REFIT                                                  :{WHITE}{STRING} (Anpassa)
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Anpassa tåg
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Välj godstyp för tåget att bära
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Anpassa tåg för att bära vald godstyp
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ej anpassa tåg...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Visa serviceintervall i procent: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Visa serviceintervall i procent: {ORANGE}{STRING1}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ändra produktion
 
 TEMP_AI_IN_PROGRESS                                             :{WHITE}Välkommen till denna nya AI, under uppbyggnad. Du kan räkna med att det finns problem med den. När något sådant händer, ta en skärmdump och lägg ut den på forumet. Mycket nöje!
@@ -1253,7 +1248,7 @@
 STR_NETWORK_TILESET                                             :{SILVER}Klimat:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorlek:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adress:  {WHITE}{STRING} : {NUMU16}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adress:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Startdatum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuvarande datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Lösenordsskyddad!
@@ -1322,14 +1317,14 @@
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}FÖRETAGSINFO
 
 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Företagsnamn: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Etableringsår:  {WHITE}{NUMU16}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Etableringsår:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Företagsvärde:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuvarande saldo:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Förra årets inkomst:  {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestandabetyg:  {WHITE}{NUMU16}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestandabetyg:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Fordon:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationer:  {WHITE}{NUMU16} {TRAIN}, {NUMU16} {LORRY}, {NUMU16} {BUS}, {NUMU16} {PLANE}, {NUMU16} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Fordon:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stationer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Spelare:  {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Ansluter...
@@ -1345,8 +1340,8 @@
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Hämtar spelinfo..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hämtar företagsinfo..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{INT32} klient(er) före oss
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{INT32} / {INT32} kbyte nerladdat hittills
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(er) före oss
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbyte nerladdat hittills
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Frånkopplad
 
@@ -1364,7 +1359,7 @@
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunde inte ladda det sparade spelet från servern
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Kunde inte starta servern.
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kunde inte ansluta.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Nätverkskoppling #{NUMU16} förlorad (klient slutade svara)
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Nätverkskoppling #{NUM} förlorad (klient slutade svara)
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Vi gjorde ett protokollfel och vår anslutningen är stängd.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Servern har en annan version än denna klient.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Fel lösenord.
@@ -1417,8 +1412,8 @@
 ############ end network gui strings
 
 
-STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-storleken på kartan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-storleken på kartan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-storleken på kartan: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-storleken på kartan: {ORANGE}{STRING1}
 
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Kostnad: {CURRENCY}
@@ -1513,10 +1508,10 @@
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Städer
-STR_TOWN_LABEL_POP                                              :{WHITE}{STRING} ({COMMA})
-STR_2001                                                        :{WHITE}{STRING}
-STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2003                                                        :{TINYFONT}{WHITE}{STRING}
+STR_TOWN_LABEL_POP                                              :{WHITE}{STRING1} ({COMMA})
+STR_2001                                                        :{WHITE}{STRING1}
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING1}
+STR_2003                                                        :{TINYFONT}{WHITE}{STRING1}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Byggnad måste rivas först
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Invånare: {ORANGE}{COMMA}{BLACK}  Hus: {ORANGE}{COMMA}
@@ -1549,23 +1544,23 @@
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Visa kommuninformation
 STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} kommun
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transportföretags värderingar:
-STR_2024                                                        :{YELLOW}{STRING}{STRING}: {ORANGE}{STRING}
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventioner
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Aktuella subventioner:-
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} från {STRING} till {STRING}
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} från {STRING2} till {STRING2}
 STR_2028_BY                                                     :{YELLOW} (tills {DATE_SHORT})
-STR_2029                                                        :{STRING} {STRING}
+STR_2029                                                        :{TOWN} {STRING}
 STR_202A_NONE                                                   :{ORANGE}Inga
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Redan subventionerade rutter:-
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} från {STATION} till {STATION}{YELLOW} ({STRING}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} från {STATION} till {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, tills {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subventionen har gått ut:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subventionen har gått ut:{}{}{STRING} från {STRING2} till {STRING2} är inte längre subventionerad
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subventionen gäller inte mer:{}{}{STRING} från {STATION} till {STATION} är inte längre subventionerad
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Ny subvention:{}{}Första transporten av {STRING} från {STRING} till {STRING} får ett års subvention från kommunen!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {STRING}!{}{}{STRING} från {STATION} till {STATION} ger 50% extra nästa år!
-STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {STRING}!{}{}{STRING} från {STATION} till {STATION} ger dubbelt så mycket nästa år!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {STRING}!{}{}{STRING} från {STATION} till {STATION} ger tre gånger så mycket nästa år!
-STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {STRING}!{}{}{STRING} från {STATION} till {STATION} ger fyra gånger så mycket nästa år!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Ny subvention:{}{}Första transporten av {STRING} från {STRING2} till {STRING2} får ett års subvention från kommunen!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {COMPANY}!{}{}{STRING} från {STATION} till {STATION} ger 50% extra nästa år!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {COMPANY}!{}{}{STRING} från {STATION} till {STATION} ger dubbelt så mycket nästa år!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {COMPANY}!{}{}{STRING} från {STATION} till {STATION} ger tre gånger så mycket nästa år!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subvention tilldelad {COMPANY}!{}{}{STRING} från {STATION} till {STATION} ger fyra gånger så mycket nästa år!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} kommunen tillåter inte att en ny flygplats byggs i staden
 STR_2036_COTTAGES                                               :Stuga
 STR_2037_HOUSES                                                 :Hus
@@ -1599,7 +1594,7 @@
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Bekosta uppbyggnad av nya kommersiella byggnader i staden.{}  Kostnad: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Köp 1 års exklusiv transporträttighet i staden. Stadens kommun kommer bara tillåta passagerare och gods till användning för ditt företags stationer.{} Kostnad: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Muta den lokala kommunen för att öka din värdering, på risken av att få höga böter om du blir upptäckt.{}  Kostnad: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i {TOWN}!{}{}Vägombyggnadsprogram bekostat av {STRING} medför 6 månader av elände för bilister!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i {TOWN}!{}{}Vägombyggnadsprogram bekostat av {COMPANY} medför 6 månader av elände för bilister!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under byggnation)
@@ -1617,7 +1612,6 @@
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...plats olämplig
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Kan inte plantera träd här...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2807                                                        :{TINYFONT}{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...för många skyltar
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kan inte placera skylt här...
 STR_280A_SIGN                                                   :Skylt
@@ -1641,7 +1635,7 @@
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}För många buss hållplatser
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}För många lastbils stationer
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}För nära en annan stationer/hållplatser
-STR_300A_0                                                      :{WHITE}{STATION} {STRINL 0x30D1}
+STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Måste riva järnvägsstation först
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}För nära en annan flygplats
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Måste riva flygplats först
@@ -1674,8 +1668,8 @@
 STR_3045_TOO_CLOSE_TO_ANOTHER_TRUCK                             :{WHITE}För nära en annan lastbilsbrygga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Måste riva busshållplats först
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Måste riva lastbilsbrygga först
-STR_3048_STATIONS                                               :{WHITE}{STRING} - {COMMA} Stationer
-STR_3049_0                                                      :{YELLOW}{STATION} {STRINL 0x30D1}
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stationer
+STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Inga -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...plats olämplig
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}För nära en annan hamn
@@ -1696,7 +1690,7 @@
 STR_305AA_LARGE                                                 :{BLACK}Metropolisk flygplats
 STR_305AB_LARGE                                                 :{BLACK}IInternationell flygplats
 STR_305B_SIZE                                                   :{BLACK}Storlek
-STR_305C_0                                                      :{STATION} {STRINL 0x30D1}
+STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Järnvägsstation
 STR_305F_AIRCRAFT_HANGAR                                        :Flygplanshangar
 STR_3060_AIRPORT                                                :Flygplats
@@ -1729,7 +1723,7 @@
 STR_4001_LOAD_GAME                                              :{WHITE}Öppna spel
 STR_4002_SAVE                                                   :{BLACK}Spara
 STR_4003_DELETE                                                 :{BLACK}Ta bort
-STR_4004                                                        :{STRING}, {DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabytes ledigt
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Kan inte läsa från disk
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Sparningen av spelet misslyckades
@@ -1791,7 +1785,7 @@
 ############ range for requires	ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion förra månaden:
-STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporterat)
+STR_482B_TRANSPORTED                                            :{YELLOW}{STRING1}{BLACK} ({COMMA}% transporterat)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centrera vyn ovanför industrin
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Ny {STRING} under byggnation nära {TOWN}!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Ny {STRING} planteras nära {TOWN}!
@@ -1871,45 +1865,45 @@
 ############ These strings may never get a new id, or savegames	will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
-STR_SV_UNNAMED                                                  :Inget namn{SKIP}
+STR_SV_UNNAMED                                                  :Inget namn
 STR_SV_TRAIN_NAME                                               :Tåg {COMMA}
 STR_SV_ROADVEH_NAME                                             :Vägfordon {COMMA}
 STR_SV_SHIP_NAME                                                :Skepp {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Flygplan {COMMA}
 
-STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} norr
-STR_SV_STNAME_SOUTH                                             :{STRING} söder
-STR_SV_STNAME_EAST                                              :{STRING} öster
-STR_SV_STNAME_WEST                                              :{STRING} väster
-STR_SV_STNAME_CENTRAL                                           :{STRING} central
-STR_SV_STNAME_TRANSFER                                          :{STRING} transfer
-STR_SV_STNAME_HALT                                              :{STRING} stopp
-STR_SV_STNAME_VALLEY                                            :{STRING} dalgång
-STR_SV_STNAME_HEIGHTS                                           :{STRING} höjder
-STR_SV_STNAME_WOODS                                             :{STRING} skogar
-STR_SV_STNAME_LAKESIDE                                          :{STRING} sjö
-STR_SV_STNAME_EXCHANGE                                          :{STRING} växel
-STR_SV_STNAME_AIRPORT                                           :{STRING} flygplats
-STR_SV_STNAME_OILFIELD                                          :{STRING} oljefält
-STR_SV_STNAME_MINES                                             :{STRING} gruva
-STR_SV_STNAME_DOCKS                                             :{STRING} Hamnar
-STR_SV_STNAME_BUOY_1                                            :{STRING} boj 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} boj 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} boj 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} boj 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} boj 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} boj 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} boj 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} boj 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} boj 9
-STR_SV_STNAME_ANNEXE                                            :{STRING} annex
-STR_SV_STNAME_SIDINGS                                           :{STRING} sida
-STR_SV_STNAME_BRANCH                                            :{STRING} område
-STR_SV_STNAME_UPPER                                             :Övre {STRING}
-STR_SV_STNAME_LOWER                                             :Nedre {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Helikopterplats
-STR_SV_STNAME_FOREST                                            :{STRING} Skog
+STR_SV_STNAME                                                   :{STRING1}
+STR_SV_STNAME_NORTH                                             :{STRING1} norr
+STR_SV_STNAME_SOUTH                                             :{STRING1} söder
+STR_SV_STNAME_EAST                                              :{STRING1} öster
+STR_SV_STNAME_WEST                                              :{STRING1} väster
+STR_SV_STNAME_CENTRAL                                           :{STRING1} central
+STR_SV_STNAME_TRANSFER                                          :{STRING1} transfer
+STR_SV_STNAME_HALT                                              :{STRING1} stopp
+STR_SV_STNAME_VALLEY                                            :{STRING1} dalgång
+STR_SV_STNAME_HEIGHTS                                           :{STRING1} höjder
+STR_SV_STNAME_WOODS                                             :{STRING1} skogar
+STR_SV_STNAME_LAKESIDE                                          :{STRING1} sjö
+STR_SV_STNAME_EXCHANGE                                          :{STRING1} växel
+STR_SV_STNAME_AIRPORT                                           :{STRING1} flygplats
+STR_SV_STNAME_OILFIELD                                          :{STRING1} oljefält
+STR_SV_STNAME_MINES                                             :{STRING1} gruva
+STR_SV_STNAME_DOCKS                                             :{STRING1} Hamnar
+STR_SV_STNAME_BUOY_1                                            :{STRING1} boj 1
+STR_SV_STNAME_BUOY_2                                            :{STRING1} boj 2
+STR_SV_STNAME_BUOY_3                                            :{STRING1} boj 3
+STR_SV_STNAME_BUOY_4                                            :{STRING1} boj 4
+STR_SV_STNAME_BUOY_5                                            :{STRING1} boj 5
+STR_SV_STNAME_BUOY_6                                            :{STRING1} boj 6
+STR_SV_STNAME_BUOY_7                                            :{STRING1} boj 7
+STR_SV_STNAME_BUOY_8                                            :{STRING1} boj 8
+STR_SV_STNAME_BUOY_9                                            :{STRING1} boj 9
+STR_SV_STNAME_ANNEXE                                            :{STRING1} annex
+STR_SV_STNAME_SIDINGS                                           :{STRING1} sida
+STR_SV_STNAME_BRANCH                                            :{STRING1} område
+STR_SV_STNAME_UPPER                                             :Övre {STRING1}
+STR_SV_STNAME_LOWER                                             :Nedre {STRING1}
+STR_SV_STNAME_HELIPORT                                          :{STRING1} Helikopterplats
+STR_SV_STNAME_FOREST                                            :{STRING1} Skog
 
 ############ end of	savegame specific region!
 
@@ -1988,7 +1982,7 @@
 
 ##id 0x7000
 STR_7000                                                        :
-STR_7001                                                        :{WHITE}{STRING} {BLACK}{STRING}
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Spelare {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nytt ansikte
 STR_7005_COLOR_SCHEME                                           :{BLACK}Färgval
@@ -2000,9 +1994,9 @@
 STR_700B_PRESIDENT_S_NAME                                       :Namn på VD
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Kan inte ändra företagsnamn...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Kan inte ändra namnet på VD:n...
-STR_700E_FINANCES                                               :{WHITE}{STRING} Budget {BLACK}{STRING}
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Budget {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Utgifter/inkomster
-STR_7010                                                        :{WHITE}{NUMU16}
+STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Konstruktioner
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nya fordon
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Kostnad för tåg
@@ -2019,7 +2013,7 @@
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Totalt:
-STR_7021                                                        :{STRING}{STRING}
+STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf över inkomster
 STR_CURRCOMPACT32                                               :{CURRCOMPACT}
 STR_CURRCOMPACT64                                               :{CURRCOMPACT64}
@@ -2044,8 +2038,8 @@
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Fälj ny färg
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Öka lånets storlek
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Återbetala en del av lånet
-STR_7037_PRESIDENT                                              :{WHITE}{STRING}{}{GOLD}(President)
-STR_7038_INAUGURATED                                            :{GOLD}Etablerades: {WHITE}{NUMU16}
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(President)
+STR_7038_INAUGURATED                                            :{GOLD}Etablerades: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Fordon:
 STR_703A_TRAIN                                                  :{WHITE}{COMMA} tåg
 STR_703B_TRAINS                                                 :{WHITE}{COMMA} tåg
@@ -2073,18 +2067,18 @@
 STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Företagets prestationsvärderingar (maxvärdering=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Företagsvärde
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Företagstabell
-STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING} '{STRING}'
-STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{STRING} {BLACK}{STRING}  '{STRING}'
+STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Transportföretag har problem!
-STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{STRING} kommer att säljas eller gå bankrutt om det inte går bättre snart!
-STR_7058_PRESIDENT                                              :{BLACK}{STRING}{}(President)
+STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} kommer att säljas eller gå bankrutt om det inte går bättre snart!
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(President)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Transportföretag slås ihop!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{STRING} har sålts till {STRING} för {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Vi letar efter någon som vill köpa och ta över vårt företag{}{}Vill du köpa {STRING} för {CURRENCY}?
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} har sålts till {COMPANY} för {CURRENCY}!
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Vi letar efter någon som vill köpa och ta över vårt företag{}{}Vill du köpa {COMPANY} för {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrutt!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{STRING} has been closed ned med creditors and all assets sold off!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} has been closed ned med creditors and all assets sold off!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Nytt transportföretag startat!
-STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{STRING} börjar bygga nära {TOWN}!
+STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} börjar bygga nära {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Kan inte köpa företag...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Fraktförtjänster
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dagar i transit
@@ -2119,9 +2113,9 @@
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Sälj 25% andel i detta företag
 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Kan inte köpa 25% andel i detta företag...
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan inte sälja 25% andel i detta företag...
-STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ägd av {STRING})
-STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% ägd av {STRING}{}   {COMMA}% ägd av {STRING})
-STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{STRING} har tagits över av {STRING}!
+STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ägd av {COMPANY})
+STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% ägd av {COMPANY}{}   {COMMA}% ägd av {COMPANY})
+STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} har tagits över av {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
 
 ##id 0x8000
@@ -2393,10 +2387,10 @@
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} depå
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första tåget ankommer till {STATION}!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Details)
+STR_8802_DETAILS                                                :{WHITE}{STRING1} (Details)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tåg i vägen
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING1}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1}
 STR_8806_GO_TO                                                  :Gå till {STATION}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Servning vid {TOWN} Tåg depå
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gå non-stop till {TOWN} depå
@@ -2416,7 +2410,7 @@
 STR_8818_INFORMATION                                            :{BLACK}Information
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tåg för långt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tåg kan bara ändras när det står still inuti en depå
-STR_881B_TRAINS                                                 :{WHITE}{STRING} - {COMMA} Tåg
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Tåg
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nytt tågfordon
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nytt monorail-fordon
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nytt maglev-Fordon
@@ -2428,14 +2422,14 @@
 STR_8826_GO_TO                                                  :{BLACK}Gå Till
 STR_8827_FULL_LOAD                                              :{BLACK}Lasta
 STR_8828_UNLOAD                                                 :{BLACK}Lasta av
-STR_8829_ORDERS                                                 :{WHITE}{STRING} (Orders)
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Slut på order - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Servning
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Kan inte bygga järnvägfordon...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Värde: {LTBLUE}{CURRENCY}
-STR_882E                                                        :{WHITE}{STRING}
+STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Lastar / lastar av
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Tåget måste stoppas inne i depån
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan inte skicka tåg till depå...
@@ -2484,9 +2478,9 @@
 STR_SERVICE_HINT                                                :{BLACK}Skippa den här ordern om inte servning behövs
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} nu tillgängligt!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kostnad: {CURRENCY} Vikt: {COMMA}t{}Hastighet: {VELOCITY}  Effekt: {COMMA}hp{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Kostnad: {CURRENCY} Vikt: {COMMA}t{}Hastighet: {VELOCITY}  Effekt: {COMMA}hp{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {STRING1}
 STR_885C_BROKEN_DOWN                                            :{RED}Motorstopp
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING2}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Vikt: {LTBLUE}{COMMA}t  {BLACK}Effekt: {LTBLUE}{COMMA}hp{BLACK} Tophastighet: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
@@ -2507,8 +2501,8 @@
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vägfordon i vägen
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{STRING} - {COMMA} Vägfordon
-STR_9002                                                        :{WHITE}{STRING}
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vägfordon
+STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Vägfordon Depå
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nytt Fordon
 STR_9005_INFORMATION                                            :{BLACK}Information
@@ -2516,14 +2510,13 @@
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Bygg Fordon
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan inte bygga vägfordon...
 STR_900A_MUST_BUILD_ROAD_VEHICLE                                :{WHITE}Måste bygga bussgarage först
-STR_900B_ORDERS                                                 :{WHITE}{STRING} (Order)
-STR_900C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING2}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_900E_MAX_SPEED                                              :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...måste stoppas inuti ett bussgarage
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan inte sälja vägfordon...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan inte stoppa/starta vägfordon...
@@ -2548,7 +2541,7 @@
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bygg markerat vägfordon
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nytt vägfordon tillgängligt!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kostnad: {CURRENCY}{}Hastighet: {VELOCITY}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kostnad: {CURRENCY}{}Hastighet: {VELOCITY}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {STRING1}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Byt namn på vägfordon
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Kan inte byta namn på vägfordon...
@@ -2571,7 +2564,7 @@
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan inte bygga hamn här...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skeppsdepå
 STR_9804_NEW_SHIPS                                              :{BLACK}Nytt Skepp
-STR_9805_SHIPS                                                  :{WHITE}{STRING} - {COMMA} Skepp
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Skepp
 STR_9806_CAN_T_BUILD_SHIPS                                      :{WHITE}Kan inte bygga skepp...
 STR_9807_MUST_BUILD_SHIP_DEPOT_FIRST                            :{WHITE}Måste bygga skeppsdepå först
 STR_9808_NEW_SHIPS                                              :{WHITE}Nytt Skepp
@@ -2580,15 +2573,14 @@
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Kan inte sälja skepp...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Kan inte bygga skepp...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Skepp i vägen
-STR_980F                                                        :{WHITE}{STRING}
-STR_9810_ORDERS                                                 :{WHITE}{STRING} (Order)
-STR_9811_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING2}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_9813_MAX_SPEED                                              :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan inte stoppa/starta skepp...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan inte skicka skepp till depå...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan inte finna lokal depå
@@ -2612,7 +2604,7 @@
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Visa skeppdetaljer
 STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nytt skepp tillgängligt!
 STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Tophastighet: {VELOCITY}{}Kapacitet: {STRING}{}Löpande kostnad: {CURRENCY}/år
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Tophastighet: {VELOCITY}{}Kapacitet: {STRING1}{}Löpande kostnad: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Byt namn på skepp
 
 STR_9831_NAME_SHIP                                              :{WHITE}Byt namn på skepp
@@ -2625,12 +2617,12 @@
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Byt namn på skeppstyp
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Kan inte byta namn på skeppstyp...
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Anpassa godsskepp att frakta en annan godstyp
-STR_983B_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_983C_REFIT_SHIP                                             :{BLACK}Anpassa skepp
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Välj typ av gods för skepp att frakta
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Anpassa skepp att frakta markerad godstyp
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Välj godstyp att frakta:-
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING1}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan inte anpassa skepp...
 STR_9842_REFITTABLE                                             :(anpassningsbart)
 STR_GO_TO_SHIP_DEPOT                                            :Gå till {TOWN} Båtdepå
@@ -2645,15 +2637,15 @@
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nytt Flygplan
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Bygg Flygplan
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kan inte bygga flygplan...
-STR_A009_AIRCRAFT                                               :{WHITE}{STRING} - {COMMA} Flygplan
-STR_A00A                                                        :{WHITE}{STRING}
-STR_A00B_ORDERS                                                 :{WHITE}{STRING} (Order)
-STR_A00C_DETAILS                                                :{WHITE}{STRING} (Detaljer)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Flygplan
+STR_A00A                                                        :{WHITE}{VEHICLE}
+STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Order)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detaljer)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING2}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/yr
 STR_A00E_MAX_SPEED                                              :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra år: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan förra service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUMU16}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan inte skicka flygplan till hangar...
 STR_HEADING_FOR_HANGAR                                          :{LTBLUE}På väg mot {STATION} Hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{LTBLUE}På väg mot {STATION} Hangar, {VELOCITY}
@@ -2662,8 +2654,8 @@
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan inte stoppa/starta flygplan...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Flygplan är i luften
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Måste bygga flygplats först
-STR_A019_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}, {STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING}
+STR_A019_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}, {STRING1}
+STR_A01A_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{STRING1}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Flygplan måste stoppas i hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Kan inte sälja flygplan...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Flygplatsbyggnation
@@ -2698,12 +2690,12 @@
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Byt namn på flygplanstyp
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Kan inte byta namn på flygplanstyp...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Anpassa flygplan att frakta en annan godstyp
-STR_A03C_REFIT                                                  :{WHITE}{STRING} (Refit)
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Refit)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Anpassa flygplan
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Välj godstyp för flygplan att frakta
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Anpassa flygplan att frakta markerad godstyp
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Välj godstyp att frakta:-
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING1}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan inte anpassa flygplan...
 STR_A043_REFITTABLE                                             :(anpassningsbart)
 STR_GO_TO_AIRPORT_HANGAR                                        :Gå till {STATION} Hangar
@@ -2727,8 +2719,8 @@
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaljer
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
-STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{INT32}%
-SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{INT32}
+STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vägfordon:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stationer:
@@ -2765,7 +2757,7 @@
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Avskiljare:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Går över till Euro: {ORANGE}{INT32}
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Går över till Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Går över till Euro: {ORANGE}aldrig
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Förhandsgranska: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Ändra valutaparametrar
@@ -2815,11 +2807,11 @@
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vikt: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{COMMA}hk
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Driftkostnader: {GOLD}{CURRENCY}/år
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitet: {GOLD}{STRING} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designår: {GOLD}{NUMU16}{BLACK} Livslängd: {GOLD}{COMMA} år
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitet: {GOLD}{STRING1} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designår: {GOLD}{NUM}{BLACK} Livslängd: {GOLD}{COMMA} år
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. tillförlitlighet: {GOLD}{COMMA} %
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kostnad: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vikt: {GOLD}{COMMA}t  ({COMMA}t)
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Hastighet: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitet: {GOLD}{COMMA} passagerare, {COMMA} säckar post
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motoriserade vagnar: {GOLD}+{COMMA}hk{BLACK} Vikt: {GOLD}+{COMMA}t
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motoriserade vagnar: {GOLD}+{COMMA}hk{BLACK} Vikt: {GOLD}+{COMMA}t
\ No newline at end of file
--- a/misc.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/misc.c	Fri Jul 15 14:53:44 2005 +0000
@@ -319,9 +319,6 @@
 
 char *GetName(int id, char *buff)
 {
-	if (id & 0x400) GetParamInt32();
-	if (id & 0x200) GetParamInt32();
-
 	return strecpy(buff, _name_array[id & ~0x600], NULL);
 }
 
--- a/misc_gui.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/misc_gui.c	Fri Jul 15 14:53:44 2005 +0000
@@ -75,23 +75,33 @@
 		}
 		DrawStringCentered(140,60, STR_01A8_LOCAL_AUTHORITY, 0);
 
-		str = STR_01CE_CARGO_ACCEPTED - 1;
+		{
+			char buf[512];
+			char *p = GetString(buf, STR_01CE_CARGO_ACCEPTED);
+			bool found = false;
 
-		/* XXX if a tile accepts more cargo types than there are template strings
-		 * this breaks */
-		for (i = 0; i < NUM_CARGO; ++i) {
-			if (lid->ac[i] > 0) {
-				if (lid->ac[i] < 8) {
-					SetDParam(idx++, STR_01D1_8);
-					SetDParam(idx++, lid->ac[i]);
+			for (i = 0; i < NUM_CARGO; ++i) {
+				if (lid->ac[i] > 0) {
+					// Add a comma between each item.
+					if (found) { *p++ = ','; *p++ = ' '; }
+					found = true;
+
+					// If the accepted value is less than 8, show it in 1/8:ths
+					if (lid->ac[i] < 8) {
+						int32 argv[2] = {
+							lid->ac[i],
+							_cargoc.names_s[i]
+						};
+						p = GetStringWithArgs(p, STR_01D1_8, argv);
+					} else {
+						p = GetString(p, _cargoc.names_s[i]);
+					}
 				}
-				SetDParam(idx++, _cargoc.names_s[i]);
-				str++;
 			}
-		}
 
-		if (str != (STR_01CE_CARGO_ACCEPTED - 1))
-			DrawStringMultiCenter(140, 76, str, 276);
+			if (found)
+				DrawStringMultiCenter(140, 76, BindCString(buf), 276);
+		}
 
 		if (lid->td.build_date != 0) {
 			SetDParam(0,lid->td.build_date);
--- a/strgen/strgen.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/strgen/strgen.c	Fri Jul 15 14:53:44 2005 +0000
@@ -34,66 +34,79 @@
 	const char *cmd;
 	ParseCmdProc proc;
 	long value;
+	int8 consumes;
 } CmdStruct;
 
-typedef struct LineName {
-	struct LineName *hash_next;
-	int value;
-	char str[VARARRAY_SIZE];
-} LineName;
-
 static int _cur_line;
-static bool _warnings;
+static int _errors, _warnings;
+
+static char *_strname[65536];     // Name of the string, NULL if not exists
+static char *_master[65536];      // English text
+static char *_translated[65536];  // Translated text
+static uint16 _hash_next[65536];			// next hash entry
+
+#define HASH_SIZE 32767
+static uint16 _hash_head[HASH_SIZE];
+
+static byte _put_buf[4096];
+static int _put_pos;
+static int _next_string_id;
 
 static uint32 _hash;
-static char _lang_name[32];
-static char _lang_ownname[32];
-static char _lang_isocode[16];
+static char _lang_name[32], _lang_ownname[32], _lang_isocode[16];
 
-#define HASH_SIZE 1023
-static LineName *_hash_head[HASH_SIZE];
 
 static uint HashStr(const char *s)
 {
 	uint hash = 0;
-	for (; *s; s++) hash = ((hash << 3) | (hash >> 29)) ^ *s;
+	for(; *s; s++)
+		hash = ((hash << 3) | (hash >> 29)) ^ *s;
 	return hash % HASH_SIZE;
 }
 
 static void HashAdd(const char *s, int value)
 {
-	uint len = strlen(s) + 1;
-	LineName *ln = malloc(sizeof(*ln) + len);
 	uint hash = HashStr(s);
-
-	ln->hash_next = _hash_head[hash];
-	_hash_head[hash] = ln;
-	ln->value = value;
-	memcpy(ln->str, s, len);
+	_hash_next[value] = _hash_head[hash];
+	_hash_head[hash] = value + 1;
 }
 
 static int HashFind(const char *s)
 {
-	LineName *ln;
-
-	for (ln = _hash_head[HashStr(s)]; ln != NULL; ln = ln->hash_next) {
-		if (strcmp(ln->str, s) == 0) return ln->value;
+	int idx = _hash_head[HashStr(s)];
+	while (--idx >= 0) {
+		if (!strcmp(_strname[idx], s)) return idx;
+		idx = _hash_next[idx];
 	}
 	return -1;
 }
 
-static void warning(const char *s, ...)
+
+static void CDECL Warning(const char *s, ...)
 {
 	char buf[1024];
 	va_list va;
 	va_start(va, s);
 	vsprintf(buf, s, va);
 	va_end(va);
-	fprintf(stderr, "%d: ERROR: %s\n", _cur_line, buf);
-	_warnings = true;
+	fprintf(stderr, "%d: Warning: %s\n", _cur_line, buf);
+	_warnings++;
 }
 
-static void NORETURN error(const char *s, ...)
+
+static void CDECL Error(const char *s, ...)
+{
+	char buf[1024];
+	va_list va;
+	va_start(va, s);
+	vsprintf(buf, s, va);
+	va_end(va);
+	fprintf(stderr, "%d: Error: %s\n", _cur_line, buf);
+	_errors++;
+}
+
+
+static void NORETURN CDECL Fatal(const char *s, ...)
 {
 	char buf[1024];
 	va_list va;
@@ -104,6 +117,7 @@
 	exit(1);
 }
 
+
 static void ttd_strlcpy(char *dst, const char *src, size_t len)
 {
 	assert(len > 0);
@@ -113,219 +127,198 @@
 }
 
 
-// first byte tells if it's english.lng or a custom language file
-// second part is the name of the string
-// third part is the actual string contents
-static char *allstr[65536];
-
-static byte _put_buf[4096];
-static int _put_pos;
-static int _next_string_id;
-
-static void put_byte(byte c)
+static void PutByte(byte c)
 {
 	if (_put_pos == lengthof(_put_buf))
-		error("Put buffer too small");
+		Fatal("Put buffer too small");
 	_put_buf[_put_pos++] = c;
 }
 
-static void emit_buf(int ent)
-{
-	char *s;
-
-	if (ent < 0 || ent >= 0x10000) {
-		warning("Invalid string ID %d\n", ent);
-		return;
-	}
-
-	if (allstr[ent] != 0) {
-		warning("Duplicate string ID %d\n", ent);
-		return;
-	}
-
-	// Allocate the string, and put the uint16 before with the length.
-	s = (char*)malloc(sizeof(uint16) + _put_pos);
-	*((uint16*)s) = _put_pos;
-	memcpy(s + sizeof(uint16), _put_buf, _put_pos);
-
-	allstr[ent] = s;
-
-	_put_pos = 0;
-}
 
 static void EmitSingleByte(char *buf, int value)
 {
-	if (*buf != '\0') warning("Ignoring trailing letters in command");
-	put_byte((byte)value);
-}
-
-static void EmitEscapedByte(char *buf, int value)
-{
-	if (*buf != '\0') warning("Ignoring trailing letters in command");
-	put_byte((byte)0x85);
-	put_byte((byte)value);
+	if (*buf != '\0')
+		Warning("Ignoring trailing letters in command");
+	PutByte((byte)value);
 }
 
 
-static void EmitStringInl(char *buf, int value)
+static void EmitEscapedByte(char *buf, int value)
 {
-	int id;
+	if (*buf != '\0')
+		Warning("Ignoring trailing letters in command");
+	PutByte((byte)0x85);
+	PutByte((byte)value);
+}
 
-	if (*buf >= '0' && *buf <= '9') {
-		id = strtol(buf, NULL, 0);
-		if (id < 0 || id >= 0x10000) {
-			warning("Invalid inline num %s\n", buf);
-			return;
-		}
-	} else {
-		id = HashFind(buf);
-		if (id == -1) {
-			warning("Invalid inline string '%s'", buf);
-			return;
-		}
-	}
-
-	put_byte(0x81);
-	put_byte((byte)(id & 0xFF));
-	put_byte((byte)(id >> 8));
-}
 
 static void EmitSetX(char *buf, int value)
 {
 	char *err;
 	int x = strtol(buf, &err, 0);
+	if (*err != 0)
+		Fatal("SetX param invalid");
+	PutByte(1);
+	PutByte((byte)x);
+}
 
-	if (*err != '\0') error("SetX param invalid");
-	put_byte(1);
-	put_byte((byte)x);
-}
 
 static void EmitSetXY(char *buf, int value)
 {
 	char *err;
-	int x;
-	int y;
+	int x,y;
 
 	x = strtol(buf, &err, 0);
-	if (*err != '\0') error("SetXY param invalid");
-	y = strtol(err + 1, &err, 0);
-	if (*err != '\0') error("SetXY param invalid");
+	if (*err != 0) Fatal("SetXY param invalid");
+	y = strtol(err+1, &err, 0);
+	if (*err != 0) Fatal("SetXY param invalid");
 
-	put_byte(0x1F);
-	put_byte((byte)x);
-	put_byte((byte)y);
+	PutByte(0x1F);
+	PutByte((byte)x);
+	PutByte((byte)y);
 }
 
+
 static const CmdStruct _cmd_structs[] = {
 	// Update position
-	{"SETX", EmitSetX, 1},
-	{"SETXY", EmitSetXY, 2},
+	{"SETX", EmitSetX, 1, 0},
+	{"SETXY", EmitSetXY, 2, 0},
 
 	// Font size
-	{"TINYFONT", EmitSingleByte, 8},
-	{"BIGFONT", EmitSingleByte, 9},
+	{"TINYFONT", EmitSingleByte, 8, 0},
+	{"BIGFONT", EmitSingleByte, 9, 0},
 
 	// New line
-	{"", EmitSingleByte, 10},
+	{"", EmitSingleByte, 10, 0},
 
 	// Colors
-	{"BLUE", EmitSingleByte, 15},
-	{"SILVER", EmitSingleByte, 16},
-	{"GOLD", EmitSingleByte, 17},
-	{"RED", EmitSingleByte, 18},
-	{"PURPLE", EmitSingleByte, 19},
-	{"LTBROWN", EmitSingleByte, 20},
-	{"ORANGE", EmitSingleByte, 21},
-	{"GREEN", EmitSingleByte, 22},
-	{"YELLOW", EmitSingleByte, 23},
-	{"DKGREEN", EmitSingleByte, 24},
-	{"CREAM", EmitSingleByte, 25},
-	{"BROWN", EmitSingleByte, 26},
-	{"WHITE", EmitSingleByte, 27},
-	{"LTBLUE", EmitSingleByte, 28},
-	{"GRAY", EmitSingleByte, 29},
-	{"DKBLUE", EmitSingleByte, 30},
-	{"BLACK", EmitSingleByte, 31},
+	{"BLUE", EmitSingleByte,    15, 0},
+	{"SILVER", EmitSingleByte,  16, 0},
+	{"GOLD", EmitSingleByte,    17, 0},
+	{"RED", EmitSingleByte,     18, 0},
+	{"PURPLE", EmitSingleByte,  19, 0},
+	{"LTBROWN", EmitSingleByte, 20, 0},
+	{"ORANGE", EmitSingleByte,  21, 0},
+	{"GREEN", EmitSingleByte,   22, 0},
+	{"YELLOW", EmitSingleByte,  23, 0},
+	{"DKGREEN", EmitSingleByte, 24, 0},
+	{"CREAM", EmitSingleByte,   25, 0},
+	{"BROWN", EmitSingleByte,   26, 0},
+	{"WHITE", EmitSingleByte,   27, 0},
+	{"LTBLUE", EmitSingleByte,  28, 0},
+	{"GRAY", EmitSingleByte,    29, 0},
+	{"DKBLUE", EmitSingleByte,  30, 0},
+	{"BLACK", EmitSingleByte,   31, 0},
 
 	// 0x7B=123 is the LAST special character we may use.
 
 	// Numbers
-	{"COMMA", EmitSingleByte, 0x7B},
+	{"COMMA", EmitSingleByte, 0x7B, 1}, // Number with comma
+	{"NUM", EmitSingleByte,  0x7E, 1}, // Signed number
 
-	{"NUMU16", EmitSingleByte, 0x7E}, // These two do the same thing nowadays
-	{"INT32", EmitSingleByte, 0x7E},	// signed 32 bit integer
-
-	{"CURRENCY", EmitSingleByte, 0x7F},
+	{"CURRENCY", EmitSingleByte, 0x7F, 1},
 
 	// 0x85
-	{"CURRCOMPACT", EmitEscapedByte, 0},		// compact currency (32 bits)
-	{"REV", EmitEscapedByte, 2},						// openttd revision string
-	{"SHORTCARGO", EmitEscapedByte, 3},			// short cargo description, only ### tons, or ### litres
-	{"CURRCOMPACT64", EmitEscapedByte, 4},	// compact currency 64 bits
-
-	{"STRINL", EmitStringInl, 0x81},
-
-	{"DATE_LONG", EmitSingleByte, 0x82},
-	{"DATE_SHORT", EmitSingleByte, 0x83},
+	{"CURRCOMPACT", EmitEscapedByte, 0, 1},		// compact currency (32 bits)
+	{"REV", EmitEscapedByte, 2, 0},						// openttd revision string
+	{"SHORTCARGO", EmitEscapedByte, 3, 2},		// short cargo description, only ### tons, or ### litres
+	{"CURRCOMPACT64", EmitEscapedByte, 4, 2},	// compact currency 64 bits
 
-	{"VELOCITY", EmitSingleByte, 0x84},
-	{"SKIP16", EmitSingleByte, 0x85},
-	{"SKIP", EmitSingleByte, 0x86},
-	{"VOLUME", EmitSingleByte, 0x87},
+	{"COMPANY", EmitEscapedByte, 5, 1},				// company string. This is actually a {STRING1}
+																						// The first string includes the second string.
 
-	{"STRING", EmitSingleByte, 0x88},
+	{"PLAYERNAME", EmitEscapedByte, 5, 1},		// playername string. This is actually a {STRING1}
+																						// The first string includes the second string.
 
-	{"CARGO", EmitSingleByte, 0x99},
-	{"STATION", EmitSingleByte, 0x9A},
-	{"TOWN", EmitSingleByte, 0x9B},
-	{"CURRENCY64", EmitSingleByte, 0x9C},
-	{"WAYPOINT", EmitSingleByte, 0x9D}, // waypoint name
-	{"DATE_TINY", EmitSingleByte, 0x9E},
+	{"VEHICLE", EmitEscapedByte, 5, 1},		// playername string. This is actually a {STRING1}
+																						// The first string includes the second string.
+
+
+	{"STRING1", EmitEscapedByte, 5, 1},				// included string that consumes ONE argument
+	{"STRING2", EmitEscapedByte, 6, 2},				// included string that consumes TWO arguments
+	{"STRING3", EmitEscapedByte, 7, 3},				// included string that consumes THREE arguments
+	{"STRING4", EmitEscapedByte, 8, 4},				// included string that consumes FOUR arguments
+	{"STRING5", EmitEscapedByte, 9, 5},				// included string that consumes FIVE arguments
+
+	{"STATIONFEATURES", EmitEscapedByte, 10, 1},				// station features string, icons of the features
+
+	{"DATE_LONG", EmitSingleByte, 0x82, 1},
+	{"DATE_SHORT", EmitSingleByte, 0x83, 1},
+
+	{"VELOCITY", EmitSingleByte, 0x84, 1},
+
+	{"SKIP", EmitSingleByte, 0x86, 1},
+	{"VOLUME", EmitSingleByte, 0x87, 1},
+
+	{"STRING", EmitSingleByte, 0x88, 1},
+
+	{"CARGO", EmitSingleByte, 0x99, 2},
+	{"STATION", EmitSingleByte, 0x9A, 1},
+	{"TOWN", EmitSingleByte, 0x9B, 1},
+	{"CURRENCY64", EmitSingleByte, 0x9C, 2},
+	{"WAYPOINT", EmitSingleByte, 0x9D, 1}, // waypoint name
+	{"DATE_TINY", EmitSingleByte, 0x9E, 1},
 	// 0x9E=158 is the LAST special character we may use.
 
-	{"UPARROW", EmitSingleByte, 0xA0},
-	{"POUNDSIGN", EmitSingleByte, 0xA3},
-	{"YENSIGN", EmitSingleByte, 0xA5},
-	{"COPYRIGHT", EmitSingleByte, 0xA9},
-	{"DOWNARROW", EmitSingleByte, 0xAA},
-	{"CHECKMARK", EmitSingleByte, 0xAC},
-	{"CROSS", EmitSingleByte, 0xAD},
-	{"RIGHTARROW", EmitSingleByte, 0xAF},
+	{"UPARROW", EmitSingleByte, 0xA0, 0},
+	{"POUNDSIGN", EmitSingleByte, 0xA3, 0},
+	{"YENSIGN", EmitSingleByte, 0xA5, 0},
+	{"COPYRIGHT", EmitSingleByte, 0xA9, 0},
+	{"DOWNARROW", EmitSingleByte, 0xAA, 0},
+	{"CHECKMARK", EmitSingleByte, 0xAC, 0},
+	{"CROSS", EmitSingleByte, 0xAD, 0},
+	{"RIGHTARROW", EmitSingleByte, 0xAF, 0},
 
-	{"TRAIN", EmitSingleByte, 0xb4},
-	{"LORRY", EmitSingleByte, 0xb5},
-	{"BUS",   EmitSingleByte, 0xb6},
-	{"PLANE", EmitSingleByte, 0xb7},
-	{"SHIP",  EmitSingleByte, 0xb8},
+	{"TRAIN", EmitSingleByte, 0xb4, 0},
+	{"LORRY", EmitSingleByte, 0xb5, 0},
+	{"BUS",   EmitSingleByte, 0xb6, 0},
+	{"PLANE", EmitSingleByte, 0xb7, 0},
+	{"SHIP",  EmitSingleByte, 0xb8, 0},
 
-	{"SMALLUPARROW", EmitSingleByte, 0xBC},
-	{"SMALLDOWNARROW", EmitSingleByte, 0xBD},
-	{"THREE_FOURTH", EmitSingleByte, 0xBE},
+	{"SMALLUPARROW", EmitSingleByte, 0xBC, 0},
+	{"SMALLDOWNARROW", EmitSingleByte, 0xBD, 0},
+	{"THREE_FOURTH", EmitSingleByte, 0xBE, 0},
 };
 
+
 static const CmdStruct *FindCmd(const char *s, int len)
 {
-	const CmdStruct *cs;
-
-	for (cs = _cmd_structs; cs != endof(_cmd_structs); cs++) {
-		if (strncmp(cs->cmd, s, len) == 0 && cs->cmd[len] == '\0') return cs;
+	int i;
+	const CmdStruct *cs = _cmd_structs;
+	for(i=0; i != lengthof(_cmd_structs); i++, cs++) {
+		if (!strncmp(cs->cmd, s, len) && cs->cmd[len] == '\0')
+			return cs;
 	}
 	return NULL;
 }
 
 
-/* Returns command struct of next command in str
- * NULL if command is invalid or if there are no more commands in str
- */
-static const CmdStruct *ParseCommandString(char **str, char *param, const char *errortext)
+// returns NULL on eof
+// else returns command struct
+static const CmdStruct *ParseCommandString(char **str, char *param, int *argno, bool show_err)
 {
-	char *s = *str;
-	char *start;
+	char *s = *str, *start;
+	const CmdStruct *cmd;
+	int plen = 0;
 	byte c;
-	const CmdStruct *cmd;
 
-	for (; *s != '{'; s++) if (*s == '\0') return NULL;
-	s++;
+	*argno = -1;
+
+	// Scan to the next command, exit if there's no next command.
+	for(; *s != '{'; s++) {
+		if (*s == '\0')
+			return NULL;
+	}
+	s++; // Skip past the {
+
+	if (*s >= '0' && *s <= '9') {
+		char *end;
+		*argno = strtoul(s, &end, 0);
+		if (*end != ':') {
+				Fatal("missing arg #");
+			}
+		s = end + 1;
+	}
 
 	// parse command name
 	start = s;
@@ -334,14 +327,14 @@
 		if (c == '}' || c == ' ')
 			break;
 		if (c == '\0') {
-			if (errortext) warning("Missing } from command '%s' in '%s'", start, errortext);
+			Error("Missing } from command '%s'", start);
 			return NULL;
 		}
 	}
 
 	cmd = FindCmd(start, s - start - 1);
 	if (cmd == NULL) {
-		if (errortext) warning("Undefined command '%.*s' in '%s'", s - start - 1, start, errortext);
+		Error("Undefined command '%.*s'", s - start - 1, start);
 		return NULL;
 	}
 
@@ -351,13 +344,14 @@
 		for(;;) {
 			c = *s++;
 			if (c == '}') break;
-			if (c == 0) {
-				if (errortext) warning("Missing } from command '%s' in '%s'", start, errortext);
+			if (c == '\0') {
+				Error("Missing } from command '%s'", start);
 				return NULL;
 			}
+			if ( s - start == 60)
+				Fatal("param command too long");
 			*param++ = c;
 		}
-
 	}
 	*param = 0;
 
@@ -367,48 +361,144 @@
 }
 
 
-static void handle_pragma(char *str)
+static void HandlePragma(char *str)
 {
-	if (memcmp(str, "id ", 3) == 0) {
+	if (!memcmp(str, "id ", 3)) {
 		_next_string_id = strtoul(str + 3, NULL, 0);
-	} else if (memcmp(str, "name ", 5) == 0) {
+	} else if (!memcmp(str, "name ", 5)) {
 		ttd_strlcpy(_lang_name, str + 5, sizeof(_lang_name));
-	} else if (memcmp(str, "ownname ", 8) == 0) {
+	} else if (!memcmp(str, "ownname ", 8)) {
 		ttd_strlcpy(_lang_ownname, str + 8, sizeof(_lang_ownname));
-	} else if (memcmp(str, "isocode ", 8) == 0) {
+	} else if (!memcmp(str, "isocode ", 8)) {
 		ttd_strlcpy(_lang_isocode, str + 8, sizeof(_lang_isocode));
 	} else {
-		error("unknown pragma '%s'", str);
+		Fatal("unknown pragma '%s'", str);
 	}
 }
 
-static bool check_commands_match(char *a, char *b)
+typedef struct CmdPair {
+	const CmdStruct *a;
+	char *v;
+} CmdPair;
+
+typedef struct ParsedCommandStruct {
+	int np;
+	CmdPair pairs[32];
+	const CmdStruct *cmd[32]; // ordered by param #
+} ParsedCommandStruct;
+
+
+static void ExtractCommandString(ParsedCommandStruct *p, char *s, bool warnings)
 {
 	const CmdStruct *ar;
-	const CmdStruct *br;
 	char param[100];
+	int argno;
+	int argidx = 0;
 
-	do {
-		ar = ParseCommandString(&a, param, NULL);
-		br = ParseCommandString(&b, param, NULL);
+	memset(p, 0, sizeof(*p));
 
-		// make sure they are identical
-		if (ar != br) return false;
-	} while (ar != NULL);
+	for(;;) {
+		// read until next command from a.
+		ar = ParseCommandString(&s, param, &argno, warnings);
+		if (ar == NULL)
+			break;
 
-	return true;
+		// Sanity checking
+		if (argno != -1 && !ar->consumes) Fatal("Non consumer param can't have a paramindex");
+
+		if (ar->consumes) {
+			if (argno != -1)
+				argidx = argno;
+			if (argidx < 0 || argidx >= lengthof(p->cmd)) Fatal("invalid param idx %d", argidx);
+			if (p->cmd[argidx] != NULL && p->cmd[argidx] != ar) Fatal("duplicate param idx %d", argidx);
+
+			p->cmd[argidx++] = ar;
+		} else if (ar->cmd[0] != '\0') { // Ignore {}.. it can appear in any order.
+			if (p->np >= lengthof(p->pairs)) Fatal("too many commands in string, max %d", lengthof(p->pairs));
+			p->pairs[p->np].a = ar;
+			p->pairs[p->np].v = param[0]?strdup(param):"";
+			p->np++;
+		}
+	}
 }
 
-static void handle_string(char *str, bool master)
+
+static const CmdStruct *TranslateCmdForCompare(const CmdStruct *a)
 {
-	char *s;
-	char *t;
-	char *r;
+	if (!a) return NULL;
+
+	if (!strcmp(a->cmd, "STRING1") ||
+			!strcmp(a->cmd, "STRING2") ||
+			!strcmp(a->cmd, "STRING3") ||
+			!strcmp(a->cmd, "STRING4") ||
+			!strcmp(a->cmd, "STRING5"))
+		return FindCmd("STRING", 6);
+
+	if (!strcmp(a->cmd, "SKIP"))
+		return NULL;
+
+	return a;
+}
+
+
+static bool CheckCommandsMatch(char *a, char *b)
+{
+	ParsedCommandStruct templ;
+	ParsedCommandStruct lang;
+	int i,j;
+	bool result = true;
+
+	ExtractCommandString(&templ, b, true);
+	ExtractCommandString(&lang, a, true);
+
+	// For each string in templ, see if we find it in lang
+	if (templ.np != lang.np) {
+		Error("template string and language string have a different # of commands");
+		result = false;
+	}
+
+	for(i = 0; i < templ.np; i++) {
+		// see if we find it in lang, and zero it out
+		bool found = false;
+		for(j = 0; j < lang.np; j++) {
+			if (templ.pairs[i].a == lang.pairs[j].a &&
+					!strcmp(templ.pairs[i].v, lang.pairs[j].v)) {
+				// it was found in both. zero it out from lang so we don't find it again
+				lang.pairs[j].a = NULL;
+				found = true;
+				break;
+			}
+		}
+
+		if (!found) {
+			Error("Command '%s' exists in template file but not in language file", templ.pairs[i].a->cmd);
+			result = false;
+		}
+	}
+
+	// if we reach here, all non consumer commands match up.
+	// Check if the non consumer commands match up also.
+	for(i = 0; i < lengthof(templ.cmd); i++) {
+		if (TranslateCmdForCompare(templ.cmd[i]) != TranslateCmdForCompare(lang.cmd[i])) {
+			Error("Param idx #%d '%s' doesn't match with template command '%s'", i,
+				!lang.cmd[i] ? "<empty>" : lang.cmd[i]->cmd,
+				!templ.cmd[i] ? "<empty>" : templ.cmd[i]->cmd);
+			result = false;
+		}
+	}
+
+	return result;
+}
+
+
+static void HandleString(char *str, bool master)
+{
+	char *s,*t;
 	int ent;
 
 	if (*str == '#') {
 		if (str[1] == '#' && str[2] != '#')
-			handle_pragma(str + 2);
+			HandlePragma(str + 2);
 		return;
 	}
 
@@ -418,155 +508,136 @@
 
 	s = strchr(str, ':');
 	if (s == NULL) {
-		warning("Line has no ':' delimiter");
+		Error("Line has no ':' delimiter");
 		return;
 	}
 
-	// Trim spaces
-	for (t = s; t > str && (t[-1] == ' ' || t[-1] == '\t'); t--);
-	*t = '\0';
-
-	ent = HashFind(str);
+	// Trim spaces.
+	// After this str points to the command name, and s points to the command contents
+	for(t = s; t > str && (t[-1]==' ' || t[-1]=='\t'); t--);
+	*t = 0;
+	s++;
 
-	s++; // skip :
-
-	// allocate string entry
-	r = malloc(strlen(str) + strlen(s) + 3);
-	*r = master;
-	strcpy(r + 1, str);
-	strcpy(r + 2 + strlen(str), s);
+	// Check if this string already exists..
+	ent = HashFind(str);
 
 	if (master) {
 		if (ent != -1) {
-			warning("String name '%s' is used multiple times", str);
+			Error("String name '%s' is used multiple times", str);
 			return;
 		}
 
 		ent = _next_string_id++;
-		if (allstr[ent]) {
-			warning("String ID 0x%X for '%s' already in use by '%s'", ent, str, allstr[ent] + 1);
+		if (_strname[ent]) {
+			Error("String ID 0x%X for '%s' already in use by '%s'", ent, str, _strname[ent]);
 			return;
 		}
-		allstr[ent] = r;
+		_strname[ent] = strdup(str);
+		_master[ent] = strdup(s);
 
 		// add to hash table
 		HashAdd(str, ent);
 	} else {
 		if (ent == -1) {
-			warning("String name '%s' does not exist in master file", str);
-			_warnings = 0; // non-fatal
+			Error("String name '%s' does not exist in master file", str);
 			return;
 		}
 
-		if (!allstr[ent][0]) {
-			warning("String name '%s' is used multiple times", str);
-			_warnings = 0; // non-fatal
-			return;
-		}
-
-		// check that the commands match
-		if (!check_commands_match(s, allstr[ent] + 2 + strlen(allstr[ent] + 1))) {
-			fprintf(stderr, "Warning: String name '%s' does not match the layout of the master string\n", str);
-			_warnings = 0; // non-fatal
+		if (_translated[ent]) {
+			Error("String name '%s' is used multiple times", str);
 			return;
 		}
 
 		if (s[0] == ':' && s[1] == '\0') {
-			allstr[ent][0] = 0; // use string from master file legitiately
-			free(r);
+			// Special syntax :: means we should just inherit the master string
+			_translated[ent] = strdup(_master[ent]);
 		} else {
-			free(allstr[ent]);
-			allstr[ent] = r;
+			// check that the commands match
+			if (!CheckCommandsMatch(s, _master[ent])) {
+				Error("String name '%s' does not match the layout of the master string\n", str);
+				return;
+			}
+			_translated[ent] = strdup(s);
 		}
 	}
 }
 
-static uint32 my_hash_str(uint32 hash, const char *s)
+
+static void rstrip(char *buf)
 {
-	for (; *s != '\0'; s++) {
-		hash = ((hash << 3) | (hash >> 29)) ^ *s;
-		if (hash & 1) hash = (hash >> 1) ^ 0xDEADBEEF; else hash >>= 1;
-	}
-	return hash;
-
+	int i = strlen(buf);
+	while (i>0 && (buf[i-1]=='\r' || buf[i-1]=='\n' || buf[i-1] == ' ')) i--;
+	buf[i] = 0;
 }
 
-static void parse_file(const char *file, bool english)
+
+static void ParseFile(const char *file, bool english)
 {
+	FILE *in;
 	char buf[2048];
-	int i;
-	FILE *in;
 
 	in = fopen(file, "r");
-	if (in == NULL) error("Cannot open file '%s'", file);
-
+	if (in == NULL) { Fatal("Cannot open file '%s'", file); }
 	_cur_line = 1;
 	while (fgets(buf, sizeof(buf),in) != NULL) {
-		i = strlen(buf);
-		while (i > 0 && (buf[i - 1] == '\r' || buf[i - 1] == '\n' || buf[i - 1] == ' ')) i--;
-		buf[i] = '\0';
-
-		handle_string(buf, english);
+		rstrip(buf);
+		HandleString(buf, english);
 		_cur_line++;
 	}
-
 	fclose(in);
-
-	// make a hash of the file to get a unique "version number"
-	if (english) {
-		uint32 hash = 0;
-
-		for (i = 0; i != 65536; i++) {
-			char *s = allstr[i];
+}
 
-			if (s != NULL) {
-				const CmdStruct *cs;
 
-				hash ^= i * 0x717239;
-				if (hash & 1) hash = (hash >> 1) ^ 0xDEADBEEF; else hash >>= 1;
-				hash = my_hash_str(hash, s + 1);
+static uint32 MyHashStr(uint32 hash, const char *s)
+{
+	for(; *s; s++) {
+		hash = ((hash << 3) | (hash >> 29)) ^ *s;
+		if (hash & 1) hash = (hash>>1) ^ 0xDEADBEEF; else hash >>= 1;
+	}
+	return hash;
+}
 
-				s = s + 2 + strlen(s + 1);
-				while ((cs = ParseCommandString(&s, buf, NULL)) != NULL) {
-					hash ^= (cs - _cmd_structs) * 0x1234567;
-					if (hash & 1) hash = (hash >> 1) ^ 0xF00BAA4; else hash >>= 1;
-				}
+
+// make a hash of the file to get a unique "version number"
+static void MakeHashOfStrings()
+{
+	uint32 hash = 0;
+	char *s;
+	const CmdStruct *cs;
+	char buf[128];
+	int i;
+	int argno;
+
+	for(i = 0; i != 65536; i++) {
+		if ((s=_strname[i]) != NULL) {
+			hash ^= i * 0x717239;
+			if (hash & 1) hash = (hash>>1) ^ 0xDEADBEEF; else hash >>= 1;
+			hash = MyHashStr(hash, s + 1);
+
+			s = _master[i];
+			while ((cs = ParseCommandString(&s, buf, &argno, false)) != NULL) {
+				hash ^= (cs - _cmd_structs) * 0x1234567;
+				if (hash & 1) hash = (hash>>1) ^ 0xF00BAA4; else hash >>= 1;
 			}
 		}
-		_hash = hash;
 	}
+	_hash = hash;
 }
 
-static int count_inuse(int grp)
+
+static int CountInUse(int grp)
 {
 	int i;
 
-	for (i = 0x800; --i >= 0;) {
-		if (allstr[(grp << 11) + i] != NULL) break;
+	for(i = 0x800; --i >= 0;) {
+		if (_strname[(grp<<11)+i] != NULL)
+			break;
 	}
 	return i + 1;
 }
 
-static void check_all_used(void)
-{
-	int i;
-	LineName *ln;
-	int num_warn = 10;
 
-	for (i = 0; i != HASH_SIZE; i++) {
-		for (ln = _hash_head[i]; ln != NULL; ln = ln->hash_next) {
-			if (allstr[ln->value] == 0) {
-				if (++num_warn < 50) {
-					warning("String %s has no definition. Using NULL value", ln->str);
-				}
-				_put_pos = 0;
-				emit_buf(ln->value);
-			}
-		}
-	}
-}
-
-static void write_length(FILE *f, uint length)
+static void WriteLength(FILE *f, uint length)
 {
 	if (length < 0xC0) {
 		fputc(length, f);
@@ -574,49 +645,12 @@
 		fputc((length >> 8) | 0xC0, f);
 		fputc(length & 0xFF, f);
 	} else {
-		error("string too long");
+		Fatal("string too long");
 	}
 }
 
-static void gen_output(FILE *f)
-{
-	uint16 in_use[32];
-	uint16 in_use_file[32];
-	int i;
-	int j;
-	int tot_str = 0;
-
-	check_all_used();
-
-	for (i = 0; i != 32; i++) {
-		int n = count_inuse(i);
-
-		in_use[i] = n;
-		in_use_file[i] = TO_LE16(n);
-		tot_str += n;
-	}
 
-	fwrite(in_use_file, 32 * sizeof(uint16), 1, f);
-
-	for (i = 0; i != 32; i++) {
-		for (j = 0; j != in_use[i]; j++) {
-			char *s = allstr[(i << 11) + j];
-			if (s == NULL) error("Internal error, s == NULL");
-
-			write_length(f, *(uint16*)s);
-			fwrite(s + sizeof(uint16), *(uint16*)s , 1, f);
-			tot_str--;
-		}
-	}
-
-	fputc(0, f); // write trailing nul character.
-
-	if (tot_str != 0) {
-		error("Internal error, tot_str != 0");
-	}
-}
-
-static bool compare_files(const char *n1, const char *n2)
+bool CompareFiles(const char *n1, const char *n2)
 {
 	FILE *f1, *f2;
 	char b1[4096];
@@ -627,13 +661,13 @@
 	if (f2 == NULL) return false;
 
 	f1 = fopen(n1, "rb");
-	if (f1 == NULL) error("can't open %s", n1);
+	if (f1 == NULL) Fatal("can't open %s", n1);
 
 	do {
 		l1 = fread(b1, 1, sizeof(b1), f1);
 		l2 = fread(b2, 1, sizeof(b2), f2);
 
-		if (l1 != l2 || memcmp(b1, b2, l1) != 0) {
+		if (l1 != l2 || memcmp(b1, b2, l1)) {
 			fclose(f2);
 			fclose(f1);
 			return false;
@@ -645,7 +679,8 @@
 	return true;
 }
 
-static void write_strings_h(const char *filename)
+
+static void WriteStringsH(const char *filename)
 {
 	FILE *out;
 	int i;
@@ -653,20 +688,20 @@
 	int lastgrp;
 
 	out = fopen("tmp.xxx", "w");
-	if (out == NULL) error("can't open tmp.xxx");
+	if (out == NULL) { Fatal("can't open tmp.xxx"); }
 
 	fprintf(out, "enum {");
 
 	lastgrp = 0;
 
-	for (i = 0; i != 65536; i++) {
-		if (allstr[i]) {
+	for(i = 0; i != 65536; i++) {
+		if (_strname[i]) {
 			if (lastgrp != (i >> 11)) {
 				lastgrp = (i >> 11);
 				fprintf(out, "};\n\nenum {");
 			}
 
-			fprintf(out, next == i ? "%s,\n" : "\n%s = 0x%X,\n", allstr[i] + 1, i);
+			fprintf(out, next == i ? "%s,\n" : "\n%s = 0x%X,\n", _strname[i], i);
 			next = i + 1;
 		}
 	}
@@ -679,9 +714,10 @@
 		"\tLANGUAGE_PACK_VERSION = 0x%X,\n"
 		"};\n", (uint)_hash);
 
+
 	fclose(out);
 
-	if (compare_files("tmp.xxx", filename)) {
+	if (CompareFiles("tmp.xxx", filename)) {
 		// files are equal. tmp.xxx is not needed
 		unlink("tmp.xxx");
 	} else {
@@ -689,26 +725,45 @@
 #if defined(WIN32)
 		unlink(filename);
 #endif
-		if (rename("tmp.xxx", filename) == -1) error("rename() failed");
+		if (rename("tmp.xxx", filename) == -1) Fatal("rename() failed");
 	}
 }
 
-static void write_langfile(const char *filename, int show_todo)
+
+static void PutArgidxCommand(ParsedCommandStruct *pcs, int argidx)
+{
+	int i, sum;
+
+	if (argidx >= lengthof(pcs->cmd))
+		Fatal("invalid argidx %d", argidx);
+
+	for(i = sum = 0; i < argidx; i++) {
+		const CmdStruct *cs = pcs->cmd[i++];
+		sum += cs ? cs->consumes : 1;
+	}
+
+	PutByte(0x7C);
+	PutByte((byte)sum);
+}
+
+
+static void WriteLangfile(const char *filename, int show_todo)
 {
 	FILE *f;
 	int in_use[32];
 	LanguagePackHeader hdr;
-	int i;
-	int j;
+	int i,j;
 	const CmdStruct *cs;
 	char param[128];
+	int argno;
+	ParsedCommandStruct pcs;
 
 	f = fopen(filename, "wb");
-	if (f == NULL) error("can't open %s", filename);
+	if (f == NULL) Fatal("can't open %s", filename);
 
 	memset(&hdr, 0, sizeof(hdr));
-	for (i = 0; i != 32; i++) {
-		int n = count_inuse(i);
+	for(i = 0; i != 32; i++) {
+		int n = CountInUse(i);
 		in_use[i] = n;
 		hdr.offsets[i] = TO_LE16(n);
 	}
@@ -722,39 +777,63 @@
 
 	fwrite(&hdr, sizeof(hdr), 1, f);
 
-	for (i = 0; i != 32; i++) {
-		for (j = 0; j != in_use[i]; j++) {
-			char *s = allstr[(i << 11) + j];
+	for(i = 0; i != 32; i++) {
+		for(j = 0; j != in_use[i]; j++) {
+			int idx = (i<<11)+j;
+			char *str;
+			int argidx;
 
-			if (s == NULL) {
-				write_length(f, 0);
-			} else {
-				// move to string
-				char* str = s + 2 + strlen(s + 1);
+			// For undefined strings, just set that it's an empty string
+			if (_strname[idx] == NULL) {
+				WriteLength(f, 0);
+				continue;
+			}
 
-				if (show_todo && s[0]) {
-					if (show_todo == 2) {
-						fprintf(stderr, "Warning:%s: String '%s' is untranslated\n", filename, s + 1);
-					} else {
-						const char *s = "<TODO> ";
-						while(*s) put_byte(*s++);
+			// Produce a message if a string doesn't have a translation.
+			if (show_todo && _translated[idx] == NULL) {
+				if (show_todo == 2) {
+					Warning("'%s' is untranslated", _strname[idx]);
+				} else {
+					const char *s = "<TODO> ";
+					while(*s) PutByte(*s++);
+				}
+			}
+
+			// Extract the strings and stuff from the english command string
+			ExtractCommandString(&pcs, _master[idx], false);
+
+			str = _translated[idx] ? _translated[idx] : _master[idx];
+			argidx = 0;
+
+			while (*str != '\0') {
+				// Process characters as they are until we encounter a {
+				if (*str != '{') {
+					PutByte(*str++);
+					continue;
+				}
+				cs = ParseCommandString(&str, param, &argno, false);
+				if (cs == NULL) break;
+
+				// For params that consume values, we need to handle the argindex properly
+				if (cs->consumes) {
+					// Check if we need to output a move-param command
+					if (argno!=-1 && argno != argidx) {
+						argidx = argno;
+						PutArgidxCommand(&pcs, argidx);
 					}
+
+					// Output the one from the master string... it's always accurate.
+					cs = pcs.cmd[argidx++];
+					if (!cs)
+						Fatal("cs == NULL");
 				}
 
-				while (*str != '\0') {
-					if (*str != '{') {
-						put_byte(*str++);
-					} else {
-						cs = ParseCommandString(&str, param, s[0] ? "english.lng" : filename);
-						if (cs == NULL) break;
-						cs->proc(param, cs->value);
-					}
-				}
+				cs->proc(param, cs->value);
+			}
 
-				write_length(f, _put_pos);
-				fwrite(_put_buf, 1, _put_pos, f);
-				_put_pos = 0;
-			}
+			WriteLength(f, _put_pos);
+			fwrite(_put_buf, 1, _put_pos, f);
+			_put_pos = 0;
 		}
 	}
 
@@ -763,53 +842,56 @@
 	fclose(f);
 }
 
+
 int CDECL main(int argc, char* argv[])
 {
+	char *r;
+	char buf[256];
 	int show_todo = 0;
 
-	if (argc > 1 &&
-			(strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0)) {
+	if (argc > 1 && (!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version"))) {
 		puts("$Revision$");
 		return 0;
 	}
 
-	if (argc > 1 && strcmp(argv[1], "-t") == 0) {
+	if (argc > 1 && !strcmp(argv[1], "-t")) {
 		show_todo = 1;
-		argc--;
-		argv++;
+		argc--, argv++;
 	}
 
-	if (argc > 1 && strcmp(argv[1], "-w") == 0) {
+	if (argc > 1 && !strcmp(argv[1], "-w")) {
 		show_todo = 2;
-		argc--;
-		argv++;
+		argc--, argv++;
 	}
 
 
 	if (argc == 1) {
 		// parse master file
-		parse_file("lang/english.txt", true);
-		if (_warnings) return 1;
+		ParseFile("lang/english.txt", true);
+		MakeHashOfStrings();
+		if (_errors) return 1;
 
 		// write english.lng and strings.h
 
-		write_langfile("lang/english.lng", 0);
-		write_strings_h("table/strings.h");
+		WriteLangfile("lang/english.lng", 0);
+		WriteStringsH("table/strings.h");
+
 	} else if (argc == 2) {
-		char buf[256];
-		char *r;
+		ParseFile("lang/english.txt", true);
+		MakeHashOfStrings();
+		ParseFile(argv[1], false);
 
-		parse_file("lang/english.txt", true);
-		parse_file(argv[1], false);
-		if (_warnings) return 1;
+		if (_errors) return 1;
+
 		strcpy(buf, argv[1]);
 		r = strrchr(buf, '.');
-		if (r == NULL || strcmp(r, ".txt") != 0) r = strchr(buf, 0);
+		if (!r || strcmp(r, ".txt")) r = strchr(buf, 0);
 		strcpy(r, ".lng");
-		write_langfile(buf, show_todo);
+		WriteLangfile(buf, show_todo);
 	} else {
 		fprintf(stderr, "invalid arguments\n");
 	}
 
 	return 0;
 }
+
--- a/strings.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/strings.c	Fri Jul 15 14:53:44 2005 +0000
@@ -11,11 +11,11 @@
 #include "screenshot.h"
 #include "waypoint.h"
 
-static char *StationGetSpecialString(char *buff);
-static char *GetSpecialTownNameString(char *buff, int ind);
-static char *GetSpecialPlayerNameString(char *buff, int ind);
+static char *StationGetSpecialString(char *buff, int x);
+static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed);
+static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv);
 
-static char *DecodeString(char *buff, const char *str);
+static char *FormatString(char *buff, const char *str, const int32 *argv);
 
 extern const char _openttd_revision[];
 
@@ -125,6 +125,35 @@
 };
 
 
+// Read an int64 from the argv array.
+static inline int64 GetInt64(const int32 **argv)
+{
+	int64 result;
+
+	assert(argv);
+	result = (uint32)(*argv)[0] + ((uint64)(uint32)(*argv)[1] << 32);
+	(*argv)+=2;
+	return result;
+}
+
+// Read an int32 from the argv array.
+static inline int32 GetInt32(const int32 **argv)
+{
+	assert(argv);
+	return *(*argv)++;
+}
+
+// Read an array from the argv array.
+static inline const int32 *GetArgvPtr(const int32 **argv, int n)
+{
+	const int32 *result;
+	assert(*argv);
+	result = *argv;
+	(*argv) += n;
+	return result;
+}
+
+
 #define NUM_BOUND_STRINGS 8
 
 // Array to hold the bound strings.
@@ -141,41 +170,38 @@
 	return _langpack_offs[_langtab_start[string >> 11] + (string & 0x7FF)];
 }
 
-char *GetString(char *buffr, StringID string)
+char *GetStringWithArgs(char *buffr, StringID string, const int32 *argv)
 {
 	uint index = string & 0x7FF;
 	uint tab = string >> 11;
 
-	switch (string) {
-		case 0:
-			error("!invalid string id 0 in GetString");
-			break;
-
-		case 0x30D1:
-			return StationGetSpecialString(buffr);
+	if (!string) {
+		error("!invalid string id 0 in GetString");
 	}
 
 	switch (tab) {
 		case 4:
-			if (index >= 0xC0) return GetSpecialTownNameString(buffr, index - 0xC0);
+			if (index >= 0xC0)
+				return GetSpecialTownNameString(buffr, index - 0xC0, GetInt32(&argv));
 			break;
 
 		case 14:
-			if (index >= 0xE4) return GetSpecialPlayerNameString(buffr, index - 0xE4);
+			if (index >= 0xE4)
+				return GetSpecialPlayerNameString(buffr, index - 0xE4, argv);
 			break;
 
+		// User defined name
 		case 15:
 			return GetName(index, buffr);
 
-		case 31: // special or dynamic strings
+		case 31:
+			// dynamic strings. These are NOT to be passed through the formatter,
+			// but passed through verbatim.
 			if (index < (STR_SPEC_USERSTRING & 0x7FF)) {
-				return DecodeString(buffr, _bound_strings[index]);
-			} else {
-				return DecodeString(buffr, _userstring);
+				return strecpy(buffr, _bound_strings[index], NULL);
 			}
 
-		default:
-			break;
+			return FormatString(buffr, _userstring, NULL);
 	}
 
 	if (index >= _langtab_num[tab])
@@ -184,9 +210,15 @@
 			"Probably because an old version of the .lng file.\n", string
 		);
 
-	return DecodeString(buffr, GetStringPtr(string));
+	return FormatString(buffr, GetStringPtr(string), argv);
 }
 
+char *GetString(char *buffr, StringID string)
+{
+	return GetStringWithArgs(buffr, string, (int32*)_decode_parameters);
+}
+
+
 // This function takes a C-string and allocates a temporary string ID.
 // The duration of the bound string is valid only until the next GetString,
 // so be careful.
@@ -208,21 +240,6 @@
 	memmove(_decode_parameters + amount, _decode_parameters, sizeof(_decode_parameters) - amount * sizeof(uint32));
 }
 
-int32 GetParamInt32(void)
-{
-	int32 result = GetDParam(0);
-	memmove(&_decode_parameters[0], &_decode_parameters[1], sizeof(uint32) * (lengthof(_decode_parameters)-1));
-	return result;
-}
-
-static int64 GetParamInt64(void)
-{
-	int64 result = GetDParam(0) + ((uint64)GetDParam(1) << 32);
-	memmove(&_decode_parameters[0], &_decode_parameters[2], sizeof(uint32) * (lengthof(_decode_parameters)-2));
-	return result;
-}
-
-
 static const uint32 _divisor_table[] = {
 	1000000000,
 	100000000,
@@ -400,9 +417,10 @@
 	return buff;
 }
 
-static char *DecodeString(char *buff, const char *str)
+static char *FormatString(char *buff, const char *str, const int32 *argv)
 {
 	byte b;
+	const int32 *argv_orig = argv;
 
 	while ((b = *str++) != '\0') {
 		switch (b) {
@@ -416,27 +434,33 @@
 			*buff++ = *str++;
 			break;
 		case 0x7B: // {COMMA}
-			buff = FormatCommaNumber(buff, GetParamInt32());
+			buff = FormatCommaNumber(buff, GetInt32(&argv));
+			break;
+		case 0x7C: // Move argument pointer
+			argv = argv_orig + (byte)*str++;
+			break;
+		case 0x7D:
+			assert(0);
 			break;
 		case 0x7E: // {NUMU16}, {INT32}
-			buff = FormatNoCommaNumber(buff, GetParamInt32());
+			buff = FormatNoCommaNumber(buff, GetInt32(&argv));
 			break;
 		case 0x7F: // {CURRENCY}
-			buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetParamInt32(), false);
+			buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetInt32(&argv), false);
 			break;
 		// 0x80 is reserved for EURO
 		case 0x81: // {STRINL}
 			str += 2;
-			buff = GetString(buff, READ_LE_UINT16(str-2));
+			buff = GetStringWithArgs(buff, READ_LE_UINT16(str-2), argv);
 			break;
 		case 0x82: // {DATE_LONG}
-			buff = FormatYmdString(buff, GetParamInt32());
+			buff = FormatYmdString(buff, GetInt32(&argv));
 			break;
 		case 0x83: // {DATE_SHORT}
-			buff = FormatMonthAndYear(buff, GetParamInt32());
+			buff = FormatMonthAndYear(buff, GetInt32(&argv));
 			break;
 		case 0x84: {// {VELOCITY}
-			int value = GetParamInt32();
+			int value = GetInt32(&argv);
 			if (_opt_ptr->kilometers) value = value * 1648 >> 10;
 			buff = FormatCommaNumber(buff, value);
 			if (_opt_ptr->kilometers) {
@@ -453,7 +477,7 @@
 		case 0x85:
 			switch (*str++) {
 			case 0: /* {CURRCOMPACT} */
-				buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetParamInt32(), true);
+				buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetInt32(&argv), true);
 				break;
 			case 2: /* {REV} */
 				buff = strecpy(buff, _openttd_revision, NULL);
@@ -462,17 +486,53 @@
 				// Short description of cargotypes. Layout:
 				// 8-bit = cargo type
 				// 16-bit = cargo count
-				StringID cargo_str = _cargo_string_list[_opt_ptr->landscape][GetParamInt32()];
+				StringID cargo_str = _cargo_string_list[_opt_ptr->landscape][GetInt32(&argv)];
 				uint16 multiplier = (cargo_str == STR_LITERS) ? 1000 : 1;
 				// liquid type of cargo is multiplied by 100 to get correct amount
-				buff = FormatCommaNumber(buff, GetParamInt32() * multiplier);
+				buff = FormatCommaNumber(buff, GetInt32(&argv) * multiplier);
 				buff = strecpy(buff, " ", NULL);
 				buff = strecpy(buff, GetStringPtr(cargo_str), NULL);
 			} break;
-			case 4: /* {CURRCOMPACT64} */
+			case 4: {/* {CURRCOMPACT64} */
 				// 64 bit compact currency-unit
-				buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetParamInt64(), true);
+				buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetInt64(&argv), true);
 				break;
+			}
+			case 5: { /* {STRING1} */
+				// String that consumes ONE argument
+				StringID str = GetInt32(&argv);
+				buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 1));
+				break;
+			}
+			case 6: { /* {STRING2} */
+				// String that consumes TWO arguments
+				StringID str = GetInt32(&argv);
+				buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 2));
+				break;
+			}
+			case 7: { /* {STRING3} */
+				// String that consumes THREE arguments
+				StringID str = GetInt32(&argv);
+				buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 3));
+				break;
+			}
+			case 8: { /* {STRING4} */
+				// String that consumes FOUR arguments
+				StringID str = GetInt32(&argv);
+				buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 4));
+				break;
+			}
+			case 9: { /* {STRING5} */
+				// String that consumes FIVE arguments
+				StringID str = GetInt32(&argv);
+				buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 5));
+				break;
+			}
+
+			case 10: {
+				buff = StationGetSpecialString(buff, GetInt32(&argv));
+				break;
+			}
 
 			default:
 				error("!invalid escape sequence in string");
@@ -480,81 +540,79 @@
 			break;
 
 		case 0x86: // {SKIP}
-			GetParamInt32();
-			//assert(0);
+			argv++;
 			break;
 		case 0x87: // {VOLUME}
-			buff = FormatCommaNumber(buff, GetParamInt32() * 1000);
+			buff = FormatCommaNumber(buff, GetInt32(&argv) * 1000);
 			buff = strecpy(buff, " ", NULL);
 			buff = strecpy(buff, GetStringPtr(STR_LITERS), NULL);
 			break;
 
-		case 0x88: // {STRING}
-			buff = GetString(buff, GetParamInt32());
+		case 0x88: {// {STRING}
+			StringID str = GetInt32(&argv);
+			// WARNING. It's prohibited for the included string to consume any arguments.
+			// For included strings that consume argument, you should use STRING1, STRING2 etc.
+			// To debug stuff you can set argv to NULL and it will tell you
+			buff = GetStringWithArgs(buff, str, argv);
 			break;
+		}
 
 		case 0x99: { // {CARGO}
 			// Layout now is:
 			//   8bit   - cargo type
 			//   16-bit - cargo count
-			int cargo_str = _cargoc.names_long_s[GetParamInt32()];
+			int cargo_str = _cargoc.names_long_s[GetInt32(&argv)];
 			// Now check if the cargo count is 1, if it is, increase string by 32.
-			if (GetDParam(0) != 1) cargo_str += 32;
-			buff = GetString(buff, cargo_str);
+			if (GetInt32(&argv) != 1) cargo_str += 32;
+			buff = GetStringWithArgs(buff, cargo_str, argv - 1);
 			break;
 		}
 
 		case 0x9A: { // {STATION}
 			Station *st;
-			InjectDParam(1);
-			st = GetStation(GetDParam(1));
+			int32 temp[2];
+
+			st = GetStation(GetInt32(&argv));
 			if (st->xy == 0) { // station doesn't exist anymore
-				buff = GetString(buff, STR_UNKNOWN_DESTINATION);
+				buff = GetStringWithArgs(buff, STR_UNKNOWN_DESTINATION, NULL);
 				break;
 			}
-			SetDParam(0, st->town->townnametype);
-			SetDParam(1, st->town->townnameparts);
-			buff = GetString(buff, st->string_id);
+			temp[0] = st->town->townnametype;
+			temp[1] = st->town->townnameparts;
+			buff = GetStringWithArgs(buff, st->string_id, temp);
 			break;
 		}
 		case 0x9B: { // {TOWN}
 			Town *t;
-			t = GetTown(GetDParam(0));
+			int32 temp[1];
+			t = GetTown(GetInt32(&argv));
 			assert(t->xy);
-			SetDParam(0, t->townnameparts);
-			buff = GetString(buff, t->townnametype);
+			temp[0] = t->townnameparts;
+			buff = GetStringWithArgs(buff, t->townnametype, temp);
 			break;
 		}
 
 		case 0x9C: { // {CURRENCY64}
-			buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetParamInt64(), false);
+			buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetInt64(&argv), false);
 			break;
 		}
 
 		case 0x9D: { // {WAYPOINT}
-			Waypoint *wp = GetWaypoint(GetDParam(0));
+			int32 temp[2];
+			Waypoint *wp = GetWaypoint(GetInt32(&argv));
 			StringID str;
-			int idx;
 			if (wp->string != STR_NULL) {
-				GetParamInt32(); // skip it
 				str = wp->string;
 			} else {
-				idx = wp->town_cn;
-				if (idx == 0) {
-					str = STR_WAYPOINTNAME_CITY;
-				} else {
-					InjectDParam(1);
-					SetDParam(1, idx + 1);
-					str = STR_WAYPOINTNAME_CITY_SERIAL;
-				}
-				SetDParam(0, wp->town_index);
+				temp[0] = wp->town_index;
+				temp[1] = wp->town_cn + 1;
+				str = wp->town_cn == 0 ? STR_WAYPOINTNAME_CITY : STR_WAYPOINTNAME_CITY_SERIAL;
 			}
-
-			buff = GetString(buff, str);
+			buff = GetStringWithArgs(buff, str, temp);
 		} break;
 
 		case 0x9E: { // {DATE_TINY}
-			buff = FormatTinyDate(buff, GetParamInt32());
+			buff = FormatTinyDate(buff, GetInt32(&argv));
 			break;
 		}
 
@@ -571,9 +629,8 @@
 }
 
 
-static char *StationGetSpecialString(char *buff)
+static char *StationGetSpecialString(char *buff, int x)
 {
-	int x = GetParamInt32();
 	if (x & 0x01) *buff++ = '\xB4';
 	if (x & 0x02) *buff++ = '\xB5';
 	if (x & 0x04) *buff++ = '\xB6';
@@ -583,11 +640,9 @@
 	return buff;
 }
 
-static char *GetSpecialTownNameString(char *buff, int ind)
+static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed)
 {
-	uint32 x = GetParamInt32();
-
-	_town_name_generators[ind](buff, x);
+	_town_name_generators[ind](buff, seed);
 
 	while (*buff != '\0') buff++;
 	return buff;
@@ -658,9 +713,8 @@
 	'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W',
 };
 
-static char *GenAndCoName(char *buff)
+static char *GenAndCoName(char *buff, uint32 arg)
 {
-	uint32 x = GetParamInt32();
 	uint base,num;
 
 	base = 0;
@@ -670,15 +724,14 @@
 		num = 12;
 	}
 
-	buff = strecpy(buff, _surname_list[base + (num * GB(x, 16, 8) >> 8)], NULL);
+	buff = strecpy(buff, _surname_list[base + (num * GB(arg, 16, 8) >> 8)], NULL);
 	buff = strecpy(buff, " & Co.", NULL);
 
 	return buff;
 }
 
-static char *GenPlayerName_4(char *buff)
+static char *GenPresidentName(char *buff, uint32 x)
 {
-	uint32 x = GetParamInt32();
 	uint i, base, num;
 
 	buff[0] = _initial_name_letters[(sizeof(_initial_name_letters) * (byte)x) >> 8];
@@ -731,25 +784,25 @@
 	"Hard Drivin'"
 };
 
-static char *GetSpecialPlayerNameString(char *buff, int ind)
+static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv)
 {
 	switch (ind) {
 		case 1: // not used
-			return strecpy(buff, _silly_company_names[GetParamInt32() & 0xFFFF], NULL);
+			return strecpy(buff, _silly_company_names[GetInt32(&argv) & 0xFFFF], NULL);
 
 		case 2: // used for Foobar & Co company names
-			return GenAndCoName(buff);
+			return GenAndCoName(buff, GetInt32(&argv));
 
 		case 3: // President name
-			return GenPlayerName_4(buff);
+			return GenPresidentName(buff, GetInt32(&argv));
 
 		case 4: // song names
-			return strecpy(buff, _song_names[GetParamInt32() - 1], NULL);
+			return strecpy(buff, _song_names[GetInt32(&argv) - 1], NULL);
 	}
 
 	// town name?
 	if (IS_INT_INSIDE(ind - 6, 0, SPECSTR_TOWNNAME_LAST-SPECSTR_TOWNNAME_START + 1)) {
-		buff = GetSpecialTownNameString(buff, ind - 6);
+		buff = GetSpecialTownNameString(buff, ind - 6, GetInt32(&argv));
 		return strecpy(buff, " Transport", NULL);
 	}
 
@@ -913,4 +966,4 @@
 
 	if (!ReadLanguagePack(def))
 		error("can't read language pack '%s'", dl->ent[def].file);
-}
+}
\ No newline at end of file
--- a/strings.h	Fri Jul 15 14:16:14 2005 +0000
+++ b/strings.h	Fri Jul 15 14:53:44 2005 +0000
@@ -10,6 +10,8 @@
 }
 
 char *GetString(char *buffr, uint16 string);
+char *GetStringWithArgs(char *buffr, uint16 string, const int32 *argv);
+
 void InjectDParam(int amount);
 int32 GetParamInt32(void);
 uint GetCurrentCurrencyRate(void);
--- a/town_gui.c	Fri Jul 15 14:16:14 2005 +0000
+++ b/town_gui.c	Fri Jul 15 14:53:44 2005 +0000
@@ -132,13 +132,7 @@
 					(str++, r <= RATING_EXCELLENT) ||											// Excellent
 					(str++, true);														// Outstanding
 
-					/*	WARNING ugly hack!
-							GetPlayerNameString sets up (Player #) if the player is human in an extra DPARAM16
-							It seems that if player is non-human, nothing is set up, so param is 0. GetString doesn't like
-							that because there is another param after it.
-							So we'll just shift the rating one back if player is AI and all is fine
-						*/
-					SetDParam((IS_HUMAN_PLAYER(p->index) ? 4 : 3), str);
+					SetDParam(4, str);
 					if (t->exclusivity == p->index) // red icon for player with exclusive rights
 						DrawSprite((SPR_BLOT) | 0x30b8000, 18, y);