summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-06-25 17:02:37 +0000
committerpeter1138 <peter1138@openttd.org>2007-06-25 17:02:37 +0000
commitff126a9c1dd8b71441a7d53a102f96986e882cad (patch)
tree662d290d06e5591d1da621996af75df1f9ed8345 /src
parentb957786ea4d338f94eb622aa4159fd2ba26abd8a (diff)
downloadopenttd-ff126a9c1dd8b71441a7d53a102f96986e882cad.tar.xz
(svn r10326) -Update: change to new string codes used in english.txt
Diffstat (limited to 'src')
-rw-r--r--src/lang/american.txt36
-rw-r--r--src/lang/brazilian_portuguese.txt36
-rw-r--r--src/lang/bulgarian.txt34
-rw-r--r--src/lang/catalan.txt30
-rw-r--r--src/lang/czech.txt36
-rw-r--r--src/lang/danish.txt30
-rw-r--r--src/lang/dutch.txt30
-rw-r--r--src/lang/esperanto.txt34
-rw-r--r--src/lang/estonian.txt30
-rw-r--r--src/lang/finnish.txt36
-rw-r--r--src/lang/french.txt34
-rw-r--r--src/lang/galician.txt32
-rw-r--r--src/lang/german.txt36
-rw-r--r--src/lang/hungarian.txt30
-rw-r--r--src/lang/icelandic.txt30
-rw-r--r--src/lang/italian.txt30
-rw-r--r--src/lang/japanese.txt36
-rw-r--r--src/lang/korean.txt36
-rw-r--r--src/lang/lithuanian.txt30
-rw-r--r--src/lang/norwegian_bokmal.txt34
-rw-r--r--src/lang/norwegian_nynorsk.txt36
-rw-r--r--src/lang/piglatin.txt36
-rw-r--r--src/lang/polish.txt34
-rw-r--r--src/lang/portuguese.txt36
-rw-r--r--src/lang/romanian.txt32
-rw-r--r--src/lang/russian.txt30
-rw-r--r--src/lang/simplified_chinese.txt34
-rw-r--r--src/lang/slovak.txt36
-rw-r--r--src/lang/slovenian.txt36
-rw-r--r--src/lang/spanish.txt34
-rw-r--r--src/lang/swedish.txt36
-rw-r--r--src/lang/traditional_chinese.txt30
-rw-r--r--src/lang/turkish.txt34
-rw-r--r--src/lang/ukrainian.txt30
34 files changed, 567 insertions, 567 deletions
diff --git a/src/lang/american.txt b/src/lang/american.txt
index e616c7ead..a7754cf9e 100644
--- a/src/lang/american.txt
+++ b/src/lang/american.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Owner: {
STR_01A8_LOCAL_AUTHORITY :{BLACK}Local authority: {LTBLUE}{STRING}
STR_01A9_NONE :None
STR_01AA_NAME :{BLACK}Name
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1st
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Local au
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}Trees
STR_2803_TREE_ALREADY_HERE :{WHITE}...tree already here
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_2806 :{WHITE}{SIGN}
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
@@ -2083,7 +2083,7 @@ STR_SV_STNAME_LOWER :Lower {STRING}
STR_SV_STNAME_HELIPORT :{STRING} Heliport
STR_SV_STNAME_FOREST :{STRING} Forest
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2163,7 +2163,7 @@ STR_683B_HOSTILE :Hostile
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Player {COMMA})
STR_7004_NEW_FACE :{BLACK}New Face
STR_7005_COLOR_SCHEME :{BLACK}Color Scheme
@@ -2175,7 +2175,7 @@ STR_700A_COMPANY_NAME :Company Name
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}{COMPANY} Finances {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finances {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Expenditure/Income
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construction
@@ -2194,7 +2194,7 @@ STR_701D_OTHER :{GOLD}Other
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Income Graph
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2243,8 +2243,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Units of
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transport company in trouble!
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)
@@ -2594,7 +2594,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :maglev locomoti
##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}{VEHICLE} (Details)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in the way
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2670,8 +2670,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - En
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}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Value: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Loading / Unloading
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Train must be stopped inside a depot
@@ -2756,8 +2756,8 @@ STR_TRAIN_NO_POWER :{RED}No power
STR_TRAIN_START_NO_CATENARY :This track lacks catenary, so the train can't start
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}New {STRING} now available!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STRING} now available! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STRING} now available! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Can't timetable vehicle...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Vehicles can only wait at stations.
@@ -2781,7 +2781,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Age: {LT
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}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacity: {LTBLUE}{CARGO}
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...
@@ -2857,7 +2857,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Age: {LT
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}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacity: {LTBLUE}{CARGO}
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...
@@ -2925,7 +2925,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Age: {LT
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}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Heading for {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index e5ece608b..99ab027f0 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -497,7 +497,7 @@ STR_01A7_OWNER :{BLACK}Propriet
STR_01A8_LOCAL_AUTHORITY :{BLACK}Autoridade local: {LTBLUE}{STRING}
STR_01A9_NONE :Nenhum
STR_01AA_NAME :{BLACK}Nome
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1683,7 +1683,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}O edifício precisa ser demolido primeiro
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}População: {ORANGE}{COMMA}{BLACK} Casas: {ORANGE}{COMMA}
@@ -1716,7 +1716,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Autorida
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Exibir informações sobre a autoridade local
STR_2022_LOCAL_AUTHORITY :{WHITE}autoridade local de {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Avaliações das empresas
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsídios
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ofertas de transporte subsidiados
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING}
@@ -1789,7 +1789,7 @@ STR_2802_TREES :{WHITE}Árvores
STR_2803_TREE_ALREADY_HERE :{WHITE}...árvore já plantada aqui
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_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...muitas placas
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Impossível colocar placa aqui...
STR_280A_SIGN :Placa
@@ -2087,7 +2087,7 @@ STR_SV_STNAME_LOWER :Sul de {STRING}
STR_SV_STNAME_HELIPORT :Heliporto de {STRING}
STR_SV_STNAME_FOREST :Floresta de {STRING}
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2167,7 +2167,7 @@ STR_683B_HOSTILE :Hostil
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Jogador {COMMA})
STR_7004_NEW_FACE :{BLACK}Novo Rosto
STR_7005_COLOR_SCHEME :{BLACK}Cores
@@ -2179,7 +2179,7 @@ STR_700A_COMPANY_NAME :Nome da Empresa
STR_700B_PRESIDENT_S_NAME :Nome do Presidente
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Impossível alterar o nome da empresa...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Impossível alterar o nome do presidente...
-STR_700E_FINANCES :{WHITE}Finanças de {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Finanças de {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Despesas/Lucros
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construção
@@ -2198,7 +2198,7 @@ STR_701D_OTHER :{GOLD}Outros
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Rendimentos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2247,8 +2247,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unidades
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Empresa de transportes em dificuldades!
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)
@@ -2598,7 +2598,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :locomotiva trem
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}Depósito ferroviário de {TOWN}
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro trem chega a {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Detalhes)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalhes)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Trem no caminho
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2674,8 +2674,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Manutenção
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Impossível construir veículo ferroviário...
-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_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Carregando / descarregando
STR_TRAIN_MUST_BE_STOPPED :{WHITE}O trem precisa estar parado dentro do depósito
@@ -2760,8 +2760,8 @@ STR_TRAIN_NO_POWER :{RED}Sem força
STR_TRAIN_START_NO_CATENARY :Essa linha não tem energia, portanto o trem não parte
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Novo {STRING} agora disponível!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo {STRING} agora disponível! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo {STRING} agora disponível! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Impossível programar veículo...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Veículos só podem aguardar em estações
@@ -2785,7 +2785,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}Confiabilidade: {LTBLUE}{COMMA}% {BLACK}Quebras desde a última manutenção: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...precisa estar parado dentro de uma garagem
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Impossível vender automóvel...
@@ -2861,7 +2861,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}Confiabilidade: {LTBLUE}{COMMA}% {BLACK}Quebras desde a última manutenção: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Impossível iniciar/parar embarcação...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Impossível enviar embarcação para o depósito...
@@ -2929,7 +2929,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}Confiabilidade: {LTBLUE}{COMMA}% {BLACK}Quebras desde a última manutenção: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Impossível enviar aeronave para o hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Dirigindo-se ao hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Dirigindo-se ao hangar de {STATION}, {VELOCITY}
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 86060e3eb..3a4444df7 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -497,7 +497,7 @@ STR_01A7_OWNER :{BLACK}Собс
STR_01A8_LOCAL_AUTHORITY :{BLACK}Община: {LTBLUE}{STRING}
STR_01A9_NONE :Нищо
STR_01AA_NAME :{BLACK}Име
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1-ви
@@ -1672,7 +1672,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Сградата първо трябва да бъде разрушена
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Население: {ORANGE}{COMMA}{BLACK} Жилища: {ORANGE}{COMMA}
@@ -1705,7 +1705,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Мест
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Показване на информация за местните власти
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} местни власти
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Рейтинги на транспортни компании:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Субсидии
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Субсидии за превоз на:
STR_2027_FROM_TO :{ORANGE}{STRING} от {STRING} до {STRING}
@@ -1776,7 +1776,7 @@ STR_2802_TREES :{WHITE}Дърв
STR_2803_TREE_ALREADY_HERE :{WHITE}...вече има дърво
STR_2804_SITE_UNSUITABLE :{WHITE}...неподходящо място
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Тук не може да бъде засадено дърво...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...твърде много знаци
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Тук не може да бъде поставян знак...
STR_280A_SIGN :Знак
@@ -2146,7 +2146,7 @@ STR_683B_HOSTILE :враждеб
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Играч {COMMA})
STR_7004_NEW_FACE :{BLACK}Ново лице
STR_7005_COLOR_SCHEME :{BLACK}Цветове
@@ -2158,7 +2158,7 @@ STR_700A_COMPANY_NAME :Име на к
STR_700B_PRESIDENT_S_NAME :Име на управителя
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Не може да бъде променено името на компанията...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Не може да се промени името на управителя...
-STR_700E_FINANCES :{WHITE}{COMPANY} Финанси {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Финанси {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Разходи/Приходи
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Строеж
@@ -2177,7 +2177,7 @@ STR_701D_OTHER :{GOLD}Друг
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Всичко:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Графика на приходите
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2226,8 +2226,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Брой
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Райтинг на представянето на компанията (максимален рейтинг=1000)
STR_7052_COMPANY_VALUES :{WHITE}Стойност на Компанията
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Класиране на Компаниите
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Транспортна компания в беда!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} ще бъде продадена или обявена в банкрут освен ако представянето й не се подобри скоро!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Manager)
@@ -2577,7 +2577,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :локомот
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Влаково депо
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи влак пристигна на {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Подробности)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Подробности)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Влак на пътя
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2646,8 +2646,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - К
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Ремонт
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Не може да купиш ЖП машина...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Купи: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Цена: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Купи: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Цена: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Товарене/ Разтоварване
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Влакът трябва да бъде спрян в депото
@@ -2722,8 +2722,8 @@ STR_TRAIN_NO_POWER :{RED}Няма
STR_TRAIN_START_NO_CATENARY :Влака не може да тръгне, защото ЖП линията няма catenary
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Нов {STRING} е на разположение!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Нов {STRING} е на разположение! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Нов {STRING} е на разположение! - {ENGINE}
##id 0x9000
@@ -2740,7 +2740,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Възр
STR_900E_MAX_SPEED :{BLACK}Макс. скорост: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Печалба тази година: {LTBLUE}{CURRENCY} (предходна година: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Надеждност: {LTBLUE}{COMMA}% {BLACK}Повреди от последния сервиз: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Производство: {LTBLUE}{NUM}{BLACK} Стойност: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Производство: {LTBLUE}{NUM}{BLACK} Стойност: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Капацитет: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...трябва да бъде спряно в сервиз за коли
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Не може да продаде колата...
@@ -2813,7 +2813,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Възр
STR_9813_MAX_SPEED :{BLACK}Макс. скорост: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Печалба тази година: {LTBLUE}{CURRENCY} (миналата година: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Надеждност: {LTBLUE}{COMMA}% {BLACK}Повреди след последния сервиз: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Купен: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Купен: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Вместимост: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Не може да спреш/задвижиш кораба...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Не може да пратиш кораба в депото...
@@ -2881,7 +2881,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Възр
STR_A00E_MAX_SPEED :{BLACK}Макс. скорост: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Печалба тази година: {LTBLUE}{CURRENCY} (предходната: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Надеждност: {LTBLUE}{COMMA}% {BLACK}Повреди от последния сервиз: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Произведен: {LTBLUE}{NUM}{BLACK} Стойност: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Произведен: {LTBLUE}{NUM}{BLACK} Стойност: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Не може да изпрати самолета в хангар...
STR_HEADING_FOR_HANGAR :{ORANGE}Отиващ към Хангара на летище {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Отиващ към Хангара на летище {STATION}, {VELOCITY}
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 706546e06..172dd73f7 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Autorita
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencions
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvencions per prestació de serveis oferts:
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} a {STRING}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}Arbres
STR_2803_TREE_ALREADY_HERE :{WHITE}...aquí ja hi ha arbres
STR_2804_SITE_UNSUITABLE :{WHITE}...lloc inadequat
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Aquí no es poden plantar arbres...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...massa senyals
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Aquí no es pot situar una senyal...
STR_280A_SIGN :Senyal
@@ -2161,7 +2161,7 @@ STR_683B_HOSTILE :Hostil
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Jugador {COMMA})
STR_7004_NEW_FACE :{BLACK}Nova Cara
STR_7005_COLOR_SCHEME :{BLACK}Esquema de color
@@ -2173,7 +2173,7 @@ STR_700A_COMPANY_NAME :Nom Empresa
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}{COMPANY} Economia {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Economia {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Despeses/Ingressos
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construcció
@@ -2192,7 +2192,7 @@ STR_701D_OTHER :{GOLD}Altres
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gràfic d'Ingressos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2241,8 +2241,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unitats
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Empresa de Transport en dificultats!
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)
@@ -2668,8 +2668,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - F
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Carregant / Descarregant
STR_TRAIN_MUST_BE_STOPPED :{WHITE}El tren s'ha de parar dins de la cotxera
@@ -2754,8 +2754,8 @@ STR_TRAIN_NO_POWER :{RED}Sense ener
STR_TRAIN_START_NO_CATENARY :Aquesta via no té catenària, el tren no pot arrencar
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nou {STRING} disponible!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nou/Nova {STRING} disponible! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nou/Nova {STRING} disponible! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Impossible establir l'horari del vehicle...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Els vehicles només poden esperar a les estacions.
@@ -2779,7 +2779,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Edat: {L
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}Avaries des del darrer manteniment: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacitat: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...s'ha de parar dins d'una cotxera
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}No pots vendre l'automòbil...
@@ -2855,7 +2855,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Edat: {L
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}Avaries des de l'últim manteniment: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacitat: {LTBLUE}{CARGO}
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...
@@ -2923,7 +2923,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Edat: {L
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}Avaries des de l'últim manteniment: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construït: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construït: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}No es pot enviar l'aeronau a l'hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Cap a l'hangar de {STATION}.
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 578aaf394..3823040e7 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -553,7 +553,7 @@ STR_01A7_OWNER :{BLACK}Vlastní
STR_01A8_LOCAL_AUTHORITY :{BLACK}Místní správa: {LTBLUE}{STRING}
STR_01A9_NONE :Nic
STR_01AA_NAME :{BLACK}Jméno
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1736,7 +1736,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Budova musí být nejprve zničena
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Populace: {ORANGE}{COMMA}{BLACK} Domů: {ORANGE}{COMMA}
@@ -1769,7 +1769,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Místní
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Ukázat informace o místní správě
STR_2022_LOCAL_AUTHORITY :{WHITE}Místní správa města {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Hodnocení společností:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Dotace
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Nabídnuté dotace pro službu:
STR_2027_FROM_TO :{ORANGE}{STRING.big} z {STRING} do {STRING}
@@ -1840,7 +1840,7 @@ STR_2802_TREES :{WHITE}Stromy
STR_2803_TREE_ALREADY_HERE :{WHITE}... strom už tu je
STR_2804_SITE_UNSUITABLE :{WHITE}... nepoužitelné místo
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Zde nemůžeš vysadit strom...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}... příliš mnoho popisků
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Zde nemůžeš umístit nápis...
STR_280A_SIGN :Nápis
@@ -2132,7 +2132,7 @@ STR_SV_STNAME_LOWER :dolní {STRING}
STR_SV_STNAME_HELIPORT :{STRING} heliport
STR_SV_STNAME_FOREST :{STRING} les
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2212,7 +2212,7 @@ STR_683B_HOSTILE :zaujatý
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(hráč {COMMA})
STR_7004_NEW_FACE :{BLACK}Nový obličej
STR_7005_COLOR_SCHEME :{BLACK}Barva
@@ -2224,7 +2224,7 @@ STR_700A_COMPANY_NAME :Jméno společn
STR_700B_PRESIDENT_S_NAME :Jméno prezidenta
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Nemohu změnit jméno společnosti.
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Nemohu změnit jméno prezidenta.
-STR_700E_FINANCES :{WHITE}{COMPANY} Finance {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finance {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Příjmy / výdaje
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Výstavba
@@ -2243,7 +2243,7 @@ STR_701D_OTHER :{GOLD}Další
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Celkem:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf příjmu
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2292,8 +2292,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Doručen
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Hodnocení společností (nejvyšší hodnocení=1000)
STR_7052_COMPANY_VALUES :{WHITE}Hodnota společností
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Tabulka pořadí společností
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Dopravní společnost má problémy!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} bude prodána nebo vyhlásí bankrot, pokud se brzy nezvýší výkonnost!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Prezident)
@@ -2649,7 +2649,7 @@ STR_8107_MAGLEV_LOCOMOTIVE.dat :
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}Železniční 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}{VEHICLE} (Detaily)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}V cestě je vlak
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2716,8 +2716,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Ko
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Údržba
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nemohu koupit vagon nebo lokomotivu...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
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
@@ -2796,8 +2796,8 @@ STR_TRAIN_NO_POWER :{RED}Bez proudu
STR_TRAIN_START_NO_CATENARY :Tato trať není elektrifikována, vlak nemůže odjet
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nov{G á ý é} {STRING} k dispozici!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G á ý é} {STRING} k dispozici! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G á ý é} {STRING} k dispozici! - {ENGINE}
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Silniční vozidlo v cestě
@@ -2813,7 +2813,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Stáří
STR_900E_MAX_SPEED :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Příjem 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}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Koupen: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}... musí být zastaven v garáži
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Nemohu prodat silniční vozidlo...
@@ -2889,7 +2889,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Stáří
STR_9813_MAX_SPEED :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Příjem 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}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Koupeno: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Nelze rozjet/zastavit loď...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Nelze poslat loď do depa...
@@ -2957,7 +2957,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Stáří
STR_A00E_MAX_SPEED :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Příjem 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}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Jedu do hangáru {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Jedu do hangáru {STATION}, {VELOCITY}
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 1d537af83..4af13642a 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Myndighe
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Vis information om de lokale myndigheder
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} lokal myndighed
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportselskabsbedømmelse:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Tilskudsordninger
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilskudsordninger i licitation:
STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}Træer
STR_2803_TREE_ALREADY_HERE :{WHITE}...der er allerede træer her
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_2806 :{WHITE}{SIGN}
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
@@ -2161,7 +2161,7 @@ STR_683B_HOSTILE :Fjendtlig
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Spiller {COMMA})
STR_7004_NEW_FACE :{BLACK}Nyt ansigt
STR_7005_COLOR_SCHEME :{BLACK}Farvetema
@@ -2173,7 +2173,7 @@ STR_700A_COMPANY_NAME :Selskabsnavn
STR_700B_PRESIDENT_S_NAME :Direktørens navn
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Kan ikke ændre selskabets navn...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Kan ikke ændre direktørens navn...
-STR_700E_FINANCES :{WHITE}{COMPANY} Finanser {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finanser {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Udgifter/Indkomst
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstruktion
@@ -2192,7 +2192,7 @@ STR_701D_OTHER :{GOLD}Andet
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf over indkomst
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2241,8 +2241,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Aflevere
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Selskabets ydelsesrate (maksimal=1000)
STR_7052_COMPANY_VALUES :{WHITE}Selskabsværdier
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Selskabsoversigt
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportselskab i vanskeligheder!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} vil blive erklæret konkurs eller solgt, hvis ikke ydelsen stiger snart!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Direktør)
@@ -2668,8 +2668,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Sl
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}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Værdi: {LTBLUE}{CURRENCY}
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
@@ -2754,8 +2754,8 @@ STR_TRAIN_NO_POWER :{RED}Ingen str
STR_TRAIN_START_NO_CATENARY :Toget kan ikke køre, fordi sporet ikke har køreledninger
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Ny {STRING} er nu tilgængelig!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING} er nu tilgængelig! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING} er nu tilgængelig! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan ikke lave køreplan for transportmiddel...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Transportmidler kan kun vente ved stationer.
@@ -2779,7 +2779,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_900E_MAX_SPEED :{BLACK}Maks. hastighed: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Afkast i år: {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}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapacitet: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...skal være stoppet inde i et værksted først
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Kan ikke sælge køretøj...
@@ -2855,7 +2855,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_9813_MAX_SPEED :{BLACK}Maks. hastighed: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Afkast i år: {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}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapacitet: {LTBLUE}{CARGO}
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 dok...
@@ -2923,7 +2923,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_A00E_MAX_SPEED :{BLACK}Maks. hastighed: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Afkast i år: {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}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Flyver til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 51d40fe9a..82208e059 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Gemeente
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}Bomen
STR_2803_TREE_ALREADY_HERE :{WHITE}....er staat hier al een boom
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_2806 :{WHITE}{SIGN}
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
@@ -2161,7 +2161,7 @@ STR_683B_HOSTILE :Negatief
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Speler {COMMA})
STR_7004_NEW_FACE :{BLACK}Nieuw gezicht
STR_7005_COLOR_SCHEME :{BLACK}Kleurenschema
@@ -2173,7 +2173,7 @@ STR_700A_COMPANY_NAME :Bedrijfsnaam
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 directeur niet veranderen...
-STR_700E_FINANCES :{WHITE}{COMPANY} Financiën {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Financiën {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Uitgaven/inkomsten
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Bouwkosten
@@ -2192,7 +2192,7 @@ STR_701D_OTHER :{GOLD}Overig
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totaal:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Inkomstengrafiek
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2241,8 +2241,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Eenheden
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportbedrijf in de problemen!
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)
@@ -2668,8 +2668,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Ei
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}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Waarde: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}In- en uitladen
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Trein moet gestopt zijn in depot
@@ -2754,8 +2754,8 @@ STR_TRAIN_NO_POWER :{RED}Geen stroo
STR_TRAIN_START_NO_CATENARY :Er is geen bovenleiding, de trein kan niet starten
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nieuw {STRING} nu beschikbaar!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nieuw {STRING} nu beschikbaar! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nieuw {STRING} nu beschikbaar! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan geen dienstregeling opzetten voor dit voertuig...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Voertuigen kunnen alleen wachten op stations.
@@ -2779,7 +2779,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Leeftijd
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}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capaciteit: {LTBLUE}{CARGO}
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...
@@ -2855,7 +2855,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Leeftijd
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}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capaciteit: {LTBLUE}{CARGO}
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...
@@ -2923,7 +2923,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Leeftijd
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}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Op weg naar {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Op weg naar {STATION} Hangar, {VELOCITY}
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 21119a3e3..2979103ca 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -496,7 +496,7 @@ STR_01A7_OWNER :{BLACK}Posedant
STR_01A8_LOCAL_AUTHORITY :{BLACK}Lokaj estroj: {LTBLUE}{STRING}
STR_01A9_NONE :Neniu
STR_01AA_NAME :{BLACK}Nomo
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1a de
@@ -1626,7 +1626,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Antaŭe forigu konstruaĵon
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Enloĝantoj: {ORANGE}{COMMA}{BLACK} Domoj: {ORANGE}{COMMA}
@@ -1659,7 +1659,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Lokaj es
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Montru informojn pri lokaj estroj
STR_2022_LOCAL_AUTHORITY :{WHITE}Lokaj estroj de {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Takso de transportkompanioj:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencioj
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvencioj haveblas por jenaj servoj:
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} al {STRING}
@@ -1730,7 +1730,7 @@ STR_2802_TREES :{WHITE}Arboj
STR_2803_TREE_ALREADY_HERE :{WHITE}...jam estas arbo
STR_2804_SITE_UNSUITABLE :{WHITE}...loko ne uzeblas
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Ne povas planti arbon ĉi tie...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...tro da afiŝoj
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Ne povas meti afiŝon ĉi tie...
STR_280A_SIGN :Afiŝo
@@ -2095,7 +2095,7 @@ STR_683B_HOSTILE :Gastige
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Ludanto {COMMA})
STR_7004_NEW_FACE :{BLACK}Nova Vizaĝo
STR_7005_COLOR_SCHEME :{BLACK}Kolorskemo
@@ -2107,7 +2107,7 @@ STR_700A_COMPANY_NAME :Kompania Nomo
STR_700B_PRESIDENT_S_NAME :Nomo de la Manaĝanto
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Ne povas ŝanĝi kompaninomon...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Ne povas ŝanĝi manaĝantnomon...
-STR_700E_FINANCES :{WHITE}Financoj de {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Financoj de {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Elspezo/Enspezo
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstruado
@@ -2126,7 +2126,7 @@ STR_701D_OTHER :{GOLD}Alia
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Entute:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Enspeza Grafiko
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2175,8 +2175,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Kiom da
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Kompania rendimento (maksimumo=1000)
STR_7052_COMPANY_VALUES :{WHITE}Kompaniaj valoroj
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Kompaniara tabelo
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportkompanio en problemoj!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} forvendiĝos aŭ bankrotiĝos krom se ĝi pli bone faros!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Manaĝanto)
@@ -2524,7 +2524,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :magleva lokomot
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Trajndeponejo
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua trajno alvenas ĉe {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Detaloj)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaloj)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Trajno okupas la lokon
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2591,8 +2591,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Prizorgo
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Ne povas krei relan veturilon...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valoro: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valoro: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Ŝarĝante / Deŝarĝante
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Trajno estu halta en deponejo
@@ -2667,8 +2667,8 @@ STR_TRAIN_NO_POWER :{RED}Senforte
STR_TRAIN_START_NO_CATENARY :Mankas ĉi-trake supera elektro, do la trajno ne povas starti
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nova {STRING} nun haveblas!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nova {STRING} nun haveblas! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nova {STRING} nun haveblas! - {ENGINE}
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vojveturilo okupas la lokon
@@ -2684,7 +2684,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Aĝo: {L
STR_900E_MAX_SPEED :{BLACK}Maksimuma rapideco: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ĉi-jara gajno: {LTBLUE}{CURRENCY} (lastjara: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Fidebleco: {LTBLUE}{COMMA}% {BLACK}Rompiĝoj post lasta prizorgo: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapablo: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...devas esti haltigata en vojveturila deponejo
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Ne povas vendi vojveturilon...
@@ -2756,7 +2756,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Aĝo: {L
STR_9813_MAX_SPEED :{BLACK}Maksimuma rapideco: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ĉi-jara gajno: {LTBLUE}{CURRENCY} (lastjara: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Fidebleco: {LTBLUE}{COMMA}% {BLACK}Rompiĝoj post lasta prizorgo: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapablo: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Ne povas haltigi/starti ŝipon...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Ne povas sendi ŝipon al deponejo...
@@ -2824,7 +2824,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Aĝo: {L
STR_A00E_MAX_SPEED :{BLACK}Maksimuma rapideco: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ĉi-jara gajno: {LTBLUE}{CURRENCY} (lastjara: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Fidebleco: {LTBLUE}{COMMA}% {BLACK}Rompiĝoj post lasta prizorgo: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Ne povas sendi aviadilon al hangaro...
STR_HEADING_FOR_HANGAR :{ORANGE}Irante al {STATION} Hangaro
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Irante al {STATION} Hangaro, {VELOCITY}
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 1711797f7..bb7c8e07b 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -1781,7 +1781,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Ehitis tuleb eelnevalt hävitada
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Rahvastik: {ORANGE}{COMMA}{BLACK} Ehitisi: {ORANGE}{COMMA}
@@ -1814,7 +1814,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Omavalit
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Näita teavet kohaliku omavalitsuse kohta
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} kohalik omavalitsus
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ettevõtete hinnangud:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Toetused
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Pakutavad toetused teenusepakkumise eest:
STR_2027_FROM_TO :{ORANGE}{STRING} kohast {STRING} kohta {STRING}
@@ -1885,7 +1885,7 @@ STR_2802_TREES :{WHITE}Puud
STR_2803_TREE_ALREADY_HERE :{WHITE}...siin on juba puu olemas
STR_2804_SITE_UNSUITABLE :{WHITE}...ebasobiv koht
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Siia ei saa puud istutada...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...liiga palju silte
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Siia ei saa silti paigaldada...
STR_280A_SIGN :Silt
@@ -2261,7 +2261,7 @@ STR_683B_HOSTILE :Vaenulik
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY}{BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY}{BLACK}{COMPANYNUM}
STR_7002_PLAYER : (mängija {COMMA})
STR_7004_NEW_FACE :{BLACK}Uus nägu
STR_7005_COLOR_SCHEME :{BLACK}Värvivalik
@@ -2273,7 +2273,7 @@ STR_700A_COMPANY_NAME :Ettevõtte nimi
STR_700B_PRESIDENT_S_NAME :Presidendi nimi
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Ei saa ettevõtte nime muuta...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Ei saa presidendi nime muuta...
-STR_700E_FINANCES :{WHITE}{COMPANY} rahavoogude aruanne {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} rahavoogude aruanne {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Kulud/tulud
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Ehituskulud
@@ -2292,7 +2292,7 @@ STR_701D_OTHER :{GOLD}Kõik muu
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Kokku:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Tulugraafik
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2341,8 +2341,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Veetud v
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Ettevõtte tegevushinnang (suurim hinnang saab olla 1000)
STR_7052_COMPANY_VALUES :{WHITE}Firmaväärtus
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Ettevõtete edetabel
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Ettevõttel on probleeme!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}Ettevõte {COMPANY} müüakse maha ja kuulutatakse pankrot, kui tulemused peatselt ei parane!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(President)
@@ -2768,8 +2768,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - K
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Hooldus
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Raudteesõidukit ei saa ehitada...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Veose ümberlaadimine
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Rong peab olema depoos peatatud
@@ -2854,8 +2854,8 @@ STR_TRAIN_NO_POWER :{RED}Vool puudu
STR_TRAIN_START_NO_CATENARY :Selle raja ahel puudub, rong ei saa sõitu alustada
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Uus {STRING} saadaval!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uus {STRING} saadaval! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uus {STRING} saadaval! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Sõidukile ei saa sõiduplaani anda...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Sõidukid saavad ainult peatustes oodata.
@@ -2879,7 +2879,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Vanus: {
STR_900E_MAX_SPEED :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (eelmisel aastal: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Tehnoseisund: {LTBLUE}{COMMA}% {BLACK}Rikkeid eelmisest hooldusest: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kandevõime: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...peab garaaþis olema
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Ei saa veokit müüa...
@@ -2955,7 +2955,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Vanus: {
STR_9813_MAX_SPEED :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (viimasel: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Tehnoseisund: {LTBLUE}{COMMA}% {BLACK}Rikkeid eelmisest hooldusest: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitati: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Ehitati: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kandevõime: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Ei saa peatada/käivitada laeva...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Ei saa laeva paadikuuri saata...
@@ -3023,7 +3023,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Vanus: {
STR_A00E_MAX_SPEED :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (eelmisel aastal: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Tehnoseisund: {LTBLUE}{COMMA}% {BLACK}Rikkeid eelmisest hooldusest: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitusaasta: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Ehitusaasta: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Ei saa lennukit angaari saata...
STR_HEADING_FOR_HANGAR :{ORANGE}Suundub {STATION} Angaari
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 5a1c03410..1a4d076fe 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Omistaja
STR_01A8_LOCAL_AUTHORITY :{BLACK}Kunta: {LTBLUE}{STRING}
STR_01A9_NONE :Ei mitään
STR_01AA_NAME :{BLACK}Nimi
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1670,7 +1670,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Rakennus täytyy purkaa ensin.
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Asukasluku: {ORANGE}{COMMA}{BLACK} Taloja: {ORANGE}{COMMA}
@@ -1703,7 +1703,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Viranoma
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Tuet
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tarjotut tuet:
STR_2027_FROM_TO :{ORANGE}{STRING} välille {STRING}-{STRING}
@@ -1774,7 +1774,7 @@ STR_2802_TREES :{WHITE}Puita
STR_2803_TREE_ALREADY_HERE :{WHITE}...tässä on jo puu.
STR_2804_SITE_UNSUITABLE :{WHITE}...huono paikka.
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Puuta ei voi istuttaa.
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
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
@@ -2067,7 +2067,7 @@ STR_SV_STNAME_LOWER :Ala-{STRING}
STR_SV_STNAME_HELIPORT :{STRING}, helikopterikenttä
STR_SV_STNAME_FOREST :{STRING}, metsä
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2147,7 +2147,7 @@ STR_683B_HOSTILE :Vihamielinen
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Pelaaja {COMMA})
STR_7004_NEW_FACE :{BLACK}Uudet kasvot
STR_7005_COLOR_SCHEME :{BLACK}Väriteema
@@ -2159,7 +2159,7 @@ STR_700A_COMPANY_NAME :Yhtiön nimi
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}Talous, {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Talous, {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Menot/tulot
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Rakentaminen
@@ -2178,7 +2178,7 @@ STR_701D_OTHER :{GOLD}Muuta
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Yhteensä:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Tulokuvaaja
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2227,8 +2227,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Rahtia k
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Yhtiön suoritearvio (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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Kuljetusyhtiö vaikeuksissa!
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)
@@ -2578,7 +2578,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :maglev-veturin
##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}{VEHICLE} (yksityiskohdat)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Juna on tiellä.
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2654,8 +2654,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - ai
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Huolto
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Yksikköä ei voi rakentaa...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Arvo: {LTBLUE}{CURRENCY}
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ä
@@ -2740,8 +2740,8 @@ STR_TRAIN_NO_POWER :{RED}Ei virtaa
STR_TRAIN_START_NO_CATENARY :Radasta puuttuu "catenary"; junaa ei voi käynnistää
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Uusi {STRING} on nyt saatavilla!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uusi {STRING} on nyt saatavilla! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uusi {STRING} on nyt saatavilla! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Ei voi asettaa aikataulua.
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Vain asemalla voi odottaa.
@@ -2765,7 +2765,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Ikä: {L
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}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapasiteetti: {LTBLUE}{CARGO}
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ä...
@@ -2841,7 +2841,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Ikä: {L
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}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapasiteetti: {LTBLUE}{CARGO}
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...
@@ -2909,7 +2909,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Ikä: {L
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}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Suuntana lentokonehalli, {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 9b7da13d6..fb708434f 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -496,7 +496,7 @@ STR_01A7_OWNER :{BLACK}Proprié
STR_01A8_LOCAL_AUTHORITY :{BLACK}Municipalité: {LTBLUE}{STRING}
STR_01A9_NONE :Aucun
STR_01AA_NAME :{BLACK}Nom
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1er
@@ -1682,7 +1682,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1715,7 +1715,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Municipa
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}Qualité de service des compagnies:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1786,7 +1786,7 @@ STR_2802_TREES :{WHITE}Arbres
STR_2803_TREE_ALREADY_HERE :{WHITE}...il y a déjà des arbres
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_2806 :{WHITE}{SIGN}
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
@@ -2162,7 +2162,7 @@ STR_683B_HOSTILE :Hostile
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Joueur {COMMA})
STR_7004_NEW_FACE :{BLACK}Nouveau visage
STR_7005_COLOR_SCHEME :{BLACK}Couleur
@@ -2174,7 +2174,7 @@ STR_700A_COMPANY_NAME :Nom de la soci
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: {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Finances: {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Dépenses/Revenus
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construction
@@ -2193,7 +2193,7 @@ STR_701D_OTHER :{GOLD}Autres
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graphique du Revenu
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2242,8 +2242,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Cargaiso
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Historique de performance (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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{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}{COMPANY} va être en banqueroute si ses performances ne s'améliorent pas!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Président)
@@ -2593,7 +2593,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :{G=f}locomotive
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Dépôt ferroviaire
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Les habitants célèbrent{}l'arrivée du premier train à {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Détails)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Détails)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train présent
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2669,8 +2669,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
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}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valeur: {LTBLUE}{CURRENCY}
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
@@ -2755,8 +2755,8 @@ STR_TRAIN_NO_POWER :{RED}Pas de pui
STR_TRAIN_START_NO_CATENARY :Cette voie n'a pas de caténaire, le train ne peut pas démarrer
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nouv{G eau el elle} {STRING} disponible!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nouv{G eau el elle} {STRING} disponible! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nouv{G eau el elle} {STRING} disponible! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Impossible d'affecter un horaire au véhicule...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Les véhicules ne peuvent attendre qu'aux stations.
@@ -2780,7 +2780,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Âge: {L
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}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacité: {LTBLUE}{CARGO}
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...
@@ -2856,7 +2856,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Âge: {L
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}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacité: {LTBLUE}{CARGO}
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...
@@ -2924,7 +2924,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Âge: {L
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}Pannes depuis le dernier service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Impossible d'envoyer l'aéronef au hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}En route pour le hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}En route pour le hangar de {STATION}, {VELOCITY}
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 02185139c..28210b8de 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -478,7 +478,7 @@ STR_01A7_OWNER :{BLACK}Propieta
STR_01A8_LOCAL_AUTHORITY :{BLACK}Autoridade local: {LTBLUE}{STRING}
STR_01A9_NONE :Ningún
STR_01AA_NAME :{BLACK}Nome
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1º
@@ -1535,7 +1535,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1568,7 +1568,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Aut. Loc
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1639,7 +1639,7 @@ STR_2802_TREES :{WHITE}Árbores
STR_2803_TREE_ALREADY_HERE :{WHITE}...Xa hai unha árbore aí
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_2806 :{WHITE}{SIGN}
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
@@ -2002,7 +2002,7 @@ STR_683B_HOSTILE :Hostil
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Xogador {COMMA})
STR_7004_NEW_FACE :{BLACK}Nova Cara
STR_7005_COLOR_SCHEME :{BLACK}Esquema de Cor
@@ -2014,7 +2014,7 @@ STR_700A_COMPANY_NAME :Nome da Compañ
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}{COMPANY} Finanzas {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finanzas {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Gastos/Ingresos
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construccción
@@ -2033,7 +2033,7 @@ STR_701D_OTHER :{GOLD}Outros
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Ingresos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2081,8 +2081,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unidades
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{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}{COMPANY} vai ser vendida ou declarada en bancarrota se non mellora o seu rendemento pronto!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente)
@@ -2421,7 +2421,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :locomotora de m
##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}{VEHICLE} (Detalles)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Hai un tren no camiño
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2483,8 +2483,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valor: {LTBLUE}{CURRENCY}
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
@@ -2555,7 +2555,7 @@ STR_TRAIN_STOPPING_VEL :{RED}Parando, {
STR_TRAIN_NO_POWER :{RED}Sen enerxía
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}¡Novo {STRING} agora dispoñible!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Haí un vehículo de estrada no camiño
@@ -2571,7 +2571,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
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...
@@ -2641,7 +2641,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
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...
@@ -2709,7 +2709,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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 servicio: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Diríxese ó hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 1a9521d0c..2380f0f73 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -496,7 +496,7 @@ STR_01A7_OWNER :{BLACK}Eigentü
STR_01A8_LOCAL_AUTHORITY :{BLACK}Gehört zur Gemeinde: {LTBLUE}{STRING}
STR_01A9_NONE :Keine
STR_01AA_NAME :{BLACK}Name
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1679,7 +1679,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1712,7 +1712,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Stadtver
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Zeige Einzelheiten der Stadtverwaltung
STR_2022_LOCAL_AUTHORITY :{WHITE}Stadtverwaltung {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Bewertung der Transportfirma:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1783,7 +1783,7 @@ STR_2802_TREES :{WHITE}Bäume
STR_2803_TREE_ALREADY_HERE :{WHITE}...hier sind bereits Bäume
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_2806 :{WHITE}{SIGN}
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
@@ -2076,7 +2076,7 @@ STR_SV_STNAME_LOWER :Unter-{STRING}
STR_SV_STNAME_HELIPORT :{STRING} Heliport
STR_SV_STNAME_FOREST :{STRING} Wald
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2156,7 +2156,7 @@ STR_683B_HOSTILE :Feindlich
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Spieler {COMMA})
STR_7004_NEW_FACE :{BLACK}Neues Gesicht
STR_7005_COLOR_SCHEME :{BLACK}Farbauswahl
@@ -2168,7 +2168,7 @@ STR_700A_COMPANY_NAME :Firmenname
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}{COMPANY} Finanzen {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finanzen {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Ausgaben / Einnahmen
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Baukosten
@@ -2187,7 +2187,7 @@ STR_701D_OTHER :{GOLD}Sonstiges
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Gesamt:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Einkommensdiagramm
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2236,8 +2236,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Beförde
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportfirma in der Krise!
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)
@@ -2587,7 +2587,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :{G=w}Magnetschw
##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}{VEHICLE} (Details)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Zug ist im Weg
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2655,8 +2655,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - En
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}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Wert: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Wert: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Laden / Entladen
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Zug muss im Depot angehalten sein
@@ -2735,8 +2735,8 @@ STR_TRAIN_NO_POWER :{RED}Keine Ener
STR_TRAIN_START_NO_CATENARY :Wegen fehlender Oberleitung kann der Zug nicht starten.
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Neue{G r "" s} {STRING} jetzt erhältlich!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Neue{G r "" s} {STRING} jetzt erhältlich! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Neue{G r "" s} {STRING} jetzt erhältlich! - {ENGINE}
##id 0x9000
@@ -2753,7 +2753,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Alter: {
STR_900E_MAX_SPEED :{BLACK}Höchstgeschwindigk.: {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}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapazität: {LTBLUE}{CARGO}
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...
@@ -2829,7 +2829,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Alter: {
STR_9813_MAX_SPEED :{BLACK}Höchstgeschwindigk.: {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}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapazität: {LTBLUE}{CARGO}
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...
@@ -2897,7 +2897,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Alter: {
STR_A00E_MAX_SPEED :{BLACK}Höchstgeschwindigk.: {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}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Unterwegs zu {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Unterwegs zu {STATION} Hangar, {VELOCITY}
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 5c1f2421b..d05d5668a 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1747,7 +1747,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1780,7 +1780,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Önkorm
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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
@@ -1851,7 +1851,7 @@ STR_2802_TREES :{WHITE}Fák
STR_2803_TREE_ALREADY_HERE :{WHITE}...már van itt
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_2806 :{WHITE}{SIGN}
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
@@ -2264,7 +2264,7 @@ STR_683B_HOSTILE :Ellenséges
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :({COMMA}. játékos)
STR_7004_NEW_FACE :{BLACK}Új arc
STR_7005_COLOR_SCHEME :{BLACK}Szín váltása
@@ -2276,7 +2276,7 @@ STR_700A_COMPANY_NAME :A vállalat nev
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}{COMPANY} pénzügyei {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} pénzügyei {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Kiadás/Bevétel
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Építkezés
@@ -2295,7 +2295,7 @@ STR_701D_OTHER :{GOLD}Egyéb
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Összesen:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Jövedelem grafikon
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2344,8 +2344,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Elszáll
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{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}{COMPANY} csődöt jelent vagy el kell adni, ha teljesítménye nem nő hamarosan!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME} {}(Elnök)
@@ -2771,8 +2771,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Me
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}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Érték: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Érték: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Felpakol / Lepakol
STR_TRAIN_MUST_BE_STOPPED :{WHITE}A remízben kellene állnia ehhez
@@ -2857,8 +2857,8 @@ STR_TRAIN_NO_POWER :{RED}Nincs ára
STR_TRAIN_START_NO_CATENARY :Ennek a sínnek nincs felsővezetéke, a vonat nem tud indulni
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Új {STRING} elérhető!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Új {STRING} elérhető! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Új {STRING} elérhető! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}A jármű nem időzíthető
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}A járművek csak az állomáson várakozhatnak
@@ -2882,7 +2882,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Kor: {LT
STR_900E_MAX_SPEED :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Idei 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}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapacitás: {LTBLUE}{CARGO}
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...
@@ -2958,7 +2958,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Kor: {LT
STR_9813_MAX_SPEED :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Idei 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}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapacitás: {LTBLUE}{CARGO}
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...
@@ -3026,7 +3026,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Kor: {LT
STR_A00E_MAX_SPEED :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Idei 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}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Úton {STATION} hangárjába
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Úton {STATION} hangárjába, {VELOCITY}
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index c812914f6..0adcead7d 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -493,7 +493,7 @@ STR_01A7_OWNER :{BLACK}Eigandi:
STR_01A8_LOCAL_AUTHORITY :{BLACK}Bæjaryfirvöld: {LTBLUE}{STRING}
STR_01A9_NONE :Enginn
STR_01AA_NAME :{BLACK}Nafn
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1593,7 +1593,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1626,7 +1626,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Bæjaryf
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1697,7 +1697,7 @@ STR_2802_TREES :{WHITE}Tré
STR_2803_TREE_ALREADY_HERE :{WHITE}...hér er nú þegar tré
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_2806 :{WHITE}{SIGN}
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
@@ -2060,7 +2060,7 @@ STR_683B_HOSTILE :Fjandsamleg
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Leikmaður {COMMA})
STR_7004_NEW_FACE :{BLACK}Nýtt Andlit
STR_7005_COLOR_SCHEME :{BLACK}Litaskema
@@ -2072,7 +2072,7 @@ STR_700A_COMPANY_NAME :Nafn Fyrirtæki
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}{COMPANY} Fjármál {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Fjármál {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Útgjöld/Tekjur
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Bygging
@@ -2091,7 +2091,7 @@ STR_701D_OTHER :{GOLD}Annað
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Summa:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Tekjulínurit
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2140,8 +2140,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Fluttar
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Flutningsfyrirtæki í vandræðum!
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)
@@ -2489,7 +2489,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :segul lest
##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}{VEHICLE} (Upplýsingar)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Lest fyrir
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2556,8 +2556,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - En
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}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Framleitt: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Virði: {LTBLUE}{CURRENCY}
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
@@ -2645,7 +2645,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Aldur: {
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}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Byggður: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Burðargeta: {LTBLUE}{CARGO}
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ð...
@@ -2717,7 +2717,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Aldur: {
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}{NUM}{BLACK} Verðmæti: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Smíðað: {LTBLUE}{NUM}{BLACK} Verðmæti: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Burðargeta: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Get ekki stöðvað/ræst skip...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Get ekki sent skip í slipp...
@@ -2785,7 +2785,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Aldur: {
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}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Stefnir á {STATION} flugskýli
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Stefnir á {STATION} flugskýli, {VELOCITY}
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 856fa3b3a..c9b5865d4 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -1683,7 +1683,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}L'edificio deve essere demolito prima
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Popolazione: {ORANGE}{COMMA}{BLACK} Case: {ORANGE}{COMMA}
@@ -1716,7 +1716,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Autorit
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Mostra informazioni sull'autorità locale
STR_2022_LOCAL_AUTHORITY :{WHITE}Autorità locale di {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Valutazione delle compagnie di trasporto:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Sussidi
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Sussidi offerti per la realizzazione di servizi:
STR_2027_FROM_TO :{ORANGE}{STRING} da {STRING} a {STRING}
@@ -1787,7 +1787,7 @@ STR_2802_TREES :{WHITE}Alberi
STR_2803_TREE_ALREADY_HERE :{WHITE}...albero già qui
STR_2804_SITE_UNSUITABLE :{WHITE}...sito inadatto
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Impossibile piantare l'albero qui...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...troppi cartelli
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Impossibile piazzare il cartello qui...
STR_280A_SIGN :Cartello
@@ -2163,7 +2163,7 @@ STR_683B_HOSTILE :Ostile
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER : (Giocatore {COMMA})
STR_7004_NEW_FACE :{BLACK}Nuova faccia
STR_7005_COLOR_SCHEME :{BLACK}Colori compagnia
@@ -2175,7 +2175,7 @@ STR_700A_COMPANY_NAME :Nome della comp
STR_700B_PRESIDENT_S_NAME :Nome del presidente
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Impossibile cambiare il nome della compagnia...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Impossibile cambiare il nome del presidente...
-STR_700E_FINANCES :{WHITE}Finanze della {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Finanze della {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Spese/ricavi
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Costruzioni
@@ -2194,7 +2194,7 @@ STR_701D_OTHER :{GOLD}Altro
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totale:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Grafico incassi
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2243,8 +2243,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unità d
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Valutazione prestazioni compagnie (massima valutazione=1000)
STR_7052_COMPANY_VALUES :{WHITE}Valore delle compagnie
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Classifica compagnie
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Compagnia di trasporti in difficolta!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}La {COMPANY} verrà venduta o dichiarerà bancarotta a meno che le prestazioni non migliorino presto!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente)
@@ -2670,8 +2670,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Manutieni
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Impossibile costruire il veicolo ferroviario...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valore: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Caricamento / Scaricamento
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Il treno deve essere fermo in un deposito
@@ -2756,8 +2756,8 @@ STR_TRAIN_NO_POWER :{RED}Alimentazi
STR_TRAIN_START_NO_CATENARY :In questo binario manca la catenaria, quindi il treno non può essere avviato
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nuov{G o a} {STRING} disponibile!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuov{G o a} {STRING} disponibile! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuov{G o a} {STRING} disponibile! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Impossibile dare un orario al veicolo...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}I veicoli possono attendere solo alle stazioni.
@@ -2781,7 +2781,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Età: {L
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 manutenzione: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacità: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...deve essere fermo nel deposito automezzi
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Impossibile vendere l'automezzo...
@@ -2857,7 +2857,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Età: {L
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 manutenzione: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacità: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Impossibile fermare/avviare la nave...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Impossibile mandare la nave al deposito...
@@ -2925,7 +2925,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Età: {L
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 manutenzione: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Impossibile mandare l'aeromobile all'hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Diretto all'Hangar di {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 5ff977802..8db7b8d5f 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}所有
STR_01A8_LOCAL_AUTHORITY :{BLACK}町議会:{LTBLUE}{STRING}
STR_01A9_NONE :なし
STR_01AA_NAME :{BLACK}名称
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1日
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN}
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}まずは建物を破壊しなければなりません
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}人口:{ORANGE}{COMMA}人{BLACK} 建物:{ORANGE}{COMMA}戸
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}町議
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}町議会の情報を表示します
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN}の町議会
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}会社の町内の世評:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}:{ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}:{ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}助成金
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}次の運送経路に助成金を提案:
STR_2027_FROM_TO :{ORANGE}{STRING}を{STRING}から{STRING}へ
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}木
STR_2803_TREE_ALREADY_HERE :{WHITE}...木はsすでにあります
STR_2804_SITE_UNSUITABLE :{WHITE}...不適当な位置です
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}ここに木が植林できません...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...標示が多すぎます
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}ここに標示が設置できません...
STR_280A_SIGN :標示
@@ -2083,7 +2083,7 @@ STR_SV_STNAME_LOWER :下{STRING}
STR_SV_STNAME_HELIPORT :{STRING}ヘリポート
STR_SV_STNAME_FOREST :{STRING}森林
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2163,7 +2163,7 @@ STR_683B_HOSTILE :対立
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(プレヤー {COMMA})
STR_7004_NEW_FACE :{BLACK}新規顔
STR_7005_COLOR_SCHEME :{BLACK}カラースキーム
@@ -2175,7 +2175,7 @@ STR_700A_COMPANY_NAME :会社名
STR_700B_PRESIDENT_S_NAME :社長の名前
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}会社名が変更できません...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}社長の名前が変更できません...
-STR_700E_FINANCES :{WHITE}{COMPANY}の経営状況 {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY}の経営状況 {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}支払い/収益
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}建設
@@ -2194,7 +2194,7 @@ STR_701D_OTHER :{GOLD}その他
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}合計:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}損益グラフ
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2243,8 +2243,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}運送
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}会社のパフォーマンス率(最大=1000)
STR_7052_COMPANY_VALUES :{WHITE}会社の価値
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}交通会社成績表
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}交通会社が経営困難!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}もうすぐ{COMPANY}のパフォーマンスが改良なしで売却および破産のリスク!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(社長)
@@ -2594,7 +2594,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :磁気浮上式
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN}電車庫
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}町民の祝賀{}初列車が{STATION}駅に到着!
-STR_8802_DETAILS :{WHITE}{STRING}(詳細)
+STR_8802_DETAILS :{WHITE}{VEHICLE}(詳細)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}列車があります
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2670,8 +2670,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}修理
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}鉄道車両が購入できません...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購入日付:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} 価値:{LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購入日付:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} 価値:{LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}積み降ろし中
STR_TRAIN_MUST_BE_STOPPED :{WHITE}列車は車庫に止めなければ成らないんです
@@ -2756,8 +2756,8 @@ STR_TRAIN_NO_POWER :{RED}電源は
STR_TRAIN_START_NO_CATENARY :線路は懸垂線がないため、この列車が動けません
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}{STRING}が新登場!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING}が新登場!ー{STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING}が新登場!ー{ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}この車両に時刻表が設定できません...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}車両が駅/バス停のみで停車できます。
@@ -2781,7 +2781,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}使用
STR_900E_MAX_SPEED :{BLACK}最大速度:{LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年の損益:{LTBLUE}{CURRENCY}(昨年:{CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}信頼度:{LTBLUE}{COMMA}% {BLACK}最終修理後の故障回数:{LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購入年:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購入年:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}容量:{LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...車庫内に停止しなければなりません
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}道路車両が販売できません...
@@ -2857,7 +2857,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}使用
STR_9813_MAX_SPEED :{BLACK}最大速度:{LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年の損益:{LTBLUE}{CURRENCY}(昨年:{CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}信頼度:{LTBLUE}{COMMA}% {BLACK}最終修理後の故障回数:{LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購入年:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購入年:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}容量:{LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}船舶が開始/停止できません...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}船舶が造船所へ回送できません...
@@ -2925,7 +2925,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}使用
STR_A00E_MAX_SPEED :{BLACK}最大速度:{LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年の損益:{LTBLUE}{CURRENCY}(昨年:{CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}信頼度:{LTBLUE}{COMMA}% {BLACK}最終修理後の故障回数:{LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購入年:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購入年:{LTBLUE}{NUM}{BLACK} 価値:{LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}飛行機が格納庫へ回送できません...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION}格納庫へ行く
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION}格納庫へ行く、{VELOCITY}
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index fa1887752..07580ffc2 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -496,7 +496,7 @@ STR_01A7_OWNER :{BLACK}소유
STR_01A8_LOCAL_AUTHORITY :{BLACK}지역 당국: {LTBLUE}{STRING}
STR_01A9_NONE :없음
STR_01AA_NAME :{BLACK}이름
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1682,7 +1682,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}건물을 먼저 제거하십시오!
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}인구: {ORANGE}{COMMA}{BLACK} 가구수: {ORANGE}{COMMA}
@@ -1715,7 +1715,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}지역
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}지역당국 정보 보기
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 지역당국
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}회사 운송 성취도:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}보조금
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}제공되는 보조금:
STR_2027_FROM_TO :{ORANGE}{1:STRING}에서 {2:STRING}까지 {0:STRING} 수송
@@ -1786,7 +1786,7 @@ STR_2802_TREES :{WHITE}나무
STR_2803_TREE_ALREADY_HERE :{WHITE}...이미 나무가 심어져 있습니다.
STR_2804_SITE_UNSUITABLE :{WHITE}...알맞지 않은 장소
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}여기에 나무를 심을 수 없습니다...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...팻말 수가 너무 많습니다
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}여기에 팻말을 달 수 없습니다...
STR_280A_SIGN :팻말
@@ -2084,7 +2084,7 @@ STR_SV_STNAME_LOWER :하부 {STRING}
STR_SV_STNAME_HELIPORT :{STRING} 헬리포트
STR_SV_STNAME_FOREST :{STRING} 삼림
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2164,7 +2164,7 @@ STR_683B_HOSTILE :적대적
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(플레이어 {COMMA})
STR_7004_NEW_FACE :{BLACK}새 얼굴
STR_7005_COLOR_SCHEME :{BLACK}색상
@@ -2176,7 +2176,7 @@ STR_700A_COMPANY_NAME :회사 이름
STR_700B_PRESIDENT_S_NAME :매니저 이름
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}회사 이름을 바꿀 수 없습니다...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}매니저 이름을 바꿀 수 없습니다...
-STR_700E_FINANCES :{WHITE}{COMPANY}의 재정 {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY}의 재정 {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}지출/수입
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}건설
@@ -2195,7 +2195,7 @@ STR_701D_OTHER :{GOLD}기타
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}총계:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}수익 그래프
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2244,8 +2244,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}수송
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}회사 성취도 (최고 1000)
STR_7052_COMPANY_VALUES :{WHITE}회사 가치
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}회사 성취도 순위
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}운송회사에 문제가 생김!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY}이/가 퍼포먼스가 오르지 않아 곧 팔리거나 파산될 위기에 처했습니다!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(매니저)
@@ -2595,7 +2595,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :자기부상열
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} 차량기지
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}{STATION}에 처음으로 기차가 도착했습니다!{}사람들이 환호성을 지릅니다!
-STR_8802_DETAILS :{WHITE}{STRING} (상세정보)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (상세정보)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}중간에 기차가 있습니다
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2671,8 +2671,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}점검
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}기차를 생성할 수 없습니다...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} 가격: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} 가격: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}싣는중 / 내리는중
STR_TRAIN_MUST_BE_STOPPED :{WHITE}차량기지 안에서 정지해있어야 합니다!
@@ -2757,8 +2757,8 @@ STR_TRAIN_NO_POWER :{RED}기관차
STR_TRAIN_START_NO_CATENARY :연결고리가 모자라 운행을 시작할 수 없습니다.
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}신형 {STRING} 자동차가 출시되었습니다!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}신형 {STRING} 자동차가 출시되었습니다! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}신형 {STRING} 자동차가 출시되었습니다! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}차량의 시간표를 정할 수 없습니다...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}정거장에서만 기다릴 수 있습니다.
@@ -2782,7 +2782,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}수명:
STR_900E_MAX_SPEED :{BLACK}최고속력: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}올해 수익: {LTBLUE}{CURRENCY} (작년: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}신뢰도: {LTBLUE}{COMMA}% {BLACK}최근 점검 이후의 고장: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}수송량: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...차고 안에서 정지해있어야 합니다!
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}자동차를 팔 수 없습니다...
@@ -2858,7 +2858,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}수명:
STR_9813_MAX_SPEED :{BLACK}최고속력: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}올해 수익: {LTBLUE}{CURRENCY} (작년: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}신뢰도: {LTBLUE}{COMMA}% {BLACK}최근 점검 이후의 고장: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}수송량: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}선박을 운행/중지시킬 수 없습니다...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}선박을 정박소로 보낼 수 없습니다...
@@ -2926,7 +2926,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}수명:
STR_A00E_MAX_SPEED :{BLACK}최고속력: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}올해 수익: {LTBLUE}{CURRENCY} (작년: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}신뢰도: {LTBLUE}{COMMA}% {BLACK}최근 점검 이후의 고장: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}항공기를 격납고로 보낼 수 없습니다...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION}공항 격납고로 가는 중
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index da1f1df9f..e5d6d34f8 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -526,7 +526,7 @@ STR_01A7_OWNER :{BLACK}Savinink
STR_01A8_LOCAL_AUTHORITY :{BLACK}Vietos valdžia: {LTBLUE}{STRING}
STR_01A9_NONE :Nėra
STR_01AA_NAME :{BLACK}Vardas
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1623,7 +1623,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Pirmiau reikia nugriauti pastatą
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Populiacija: {ORANGE}{COMMA}{BLACK} Namų skaičius: {ORANGE}{COMMA}
@@ -1656,7 +1656,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Vietinė
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Rodyti informaciją apie valdzią
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} vietinė valdžia
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transporto kompanijų reitingai:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidijos
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Dar nepanaudotos subsidijos:
STR_2027_FROM_TO :{ORANGE}{STRING} iš {STRING} į {STRING}
@@ -1727,7 +1727,7 @@ STR_2802_TREES :{WHITE}Medžiai
STR_2803_TREE_ALREADY_HERE :{WHITE}...medis jau yra
STR_2804_SITE_UNSUITABLE :{WHITE}...netinkama vieta
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Neįmanoma pasodinti medžio...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...per daug ženklų
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Čia ženklo statyti negalima...
STR_280A_SIGN :Ženklas
@@ -2090,7 +2090,7 @@ STR_683B_HOSTILE :Priešiškas
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Zaidejas {COMMA})
STR_7004_NEW_FACE :{BLACK}Naujas veidas
STR_7005_COLOR_SCHEME :{BLACK}Spalva
@@ -2102,7 +2102,7 @@ STR_700A_COMPANY_NAME :Kompanijos pava
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}{COMPANY} Finansai {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finansai {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Sanaudos/Pajamos
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstrukcijos
@@ -2121,7 +2121,7 @@ STR_701D_OTHER :{GOLD}Kita
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Viso:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Pajamu diagrama
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2170,8 +2170,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Prekiu v
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transporto kompanija susidure su sunkumais!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} kompanija bus parduota arba bankrutuos nebent reikalai pasitaisys!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Valdytojas)
@@ -2519,7 +2519,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :magnetinis loko
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Traukinių depas
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas traukinys atvažiavo į {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Detales)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Detales)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Traukinys kelyje
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2586,8 +2586,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Uz
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}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Pastatyta: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Verte: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Pasikrauna / Issikrauna
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Traukinys turi buti sustabdytas depe
@@ -2675,7 +2675,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Amzius:
STR_900E_MAX_SPEED :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Pelnas šiais metais: {LTBLUE}{CURRENCY} (pernai: {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}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Pastatytas: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Talpa: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...automobilis turi buti sustabdytas garaze
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Automobilio parduoti negalima...
@@ -2747,7 +2747,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Amzius:
STR_9813_MAX_SPEED :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Pelnas šiais metais: {LTBLUE}{CURRENCY} (pernai: {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}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Pastatytas: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Talpa: {LTBLUE}{CARGO}
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...
@@ -2815,7 +2815,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Amzius:
STR_A00E_MAX_SPEED :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Pelnas šiais metais: {LTBLUE}{CURRENCY} (pernai: {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}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Kursas: {STATION} angaras
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Kursas: {STATION} angarasangar, {VELOCITY}
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 7c7af73d4..5b68265d9 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Eier: {L
STR_01A8_LOCAL_AUTHORITY :{BLACK}Lokal myndighet: {LTBLUE}{STRING}
STR_01A9_NONE :Ingen
STR_01AA_NAME :{BLACK}Navn
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1648,7 +1648,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1681,7 +1681,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Bystyre
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Vis informasjon om bystyret
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN}s bystyre
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vurdering av transportfirma:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1752,7 +1752,7 @@ STR_2802_TREES :{WHITE}Trær
STR_2803_TREE_ALREADY_HERE :{WHITE}...det er allerede et tre her
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_2806 :{WHITE}{SIGN}
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
@@ -2116,7 +2116,7 @@ STR_683B_HOSTILE :Fientlig
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Spiller {COMMA})
STR_7004_NEW_FACE :{BLACK}Nytt ansikt
STR_7005_COLOR_SCHEME :{BLACK}Firmafarge
@@ -2128,7 +2128,7 @@ STR_700A_COMPANY_NAME :Firmanavn
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}{COMPANY}s regnskap{BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY}s regnskap{BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Kostnader/inntekter
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstruksjon
@@ -2147,7 +2147,7 @@ STR_701D_OTHER :{GOLD}Annet
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totalt:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Inntektsgraf
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2196,8 +2196,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Antall v
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportfirma har problemer!
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)
@@ -2545,7 +2545,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :maglev-lokomoti
##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}{VEHICLE} (Detaljer)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tog i veien
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2612,8 +2612,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Sl
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Vedlikehold
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan ikke bygge jernbanekjøretøy...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Verdi: {LTBLUE}{CURRENCY}
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
@@ -2688,8 +2688,8 @@ STR_TRAIN_NO_POWER :{RED}Ingen str
STR_TRAIN_START_NO_CATENARY :Dette sporet mangler et kjede, så toget kan ikke starte
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Ny {STRING} nå tilgjengelig!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING} Nå tilgjengelig! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING} Nå tilgjengelig! - {ENGINE}
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Kjøretøy i veien
@@ -2705,7 +2705,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Alder: {
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 forrige vedlikehold: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}
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...
@@ -2777,7 +2777,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Alder: {
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 forrige vedlikehold: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}
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...
@@ -2845,7 +2845,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_A00E_MAX_SPEED :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY} (forrige år: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelighet: {LTBLUE}{COMMA} % {BLACK}Havarier siden forrige vedlikehold: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Er på vei til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Er på vei til {STATION} hangar, {VELOCITY}
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index e8a3d32cb..b42bc0d90 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -496,7 +496,7 @@ STR_01A7_OWNER :{BLACK}Eigar: {
STR_01A8_LOCAL_AUTHORITY :{BLACK}Lokale styresmaktar: {LTBLUE}{STRING}
STR_01A9_NONE :Ingen
STR_01AA_NAME :{BLACK}Namn
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1682,7 +1682,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Bygningen må rivst først
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Innbyggjartal: {ORANGE}{COMMA}{BLACK} Antal hus: {ORANGE}{COMMA}
@@ -1715,7 +1715,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Bystyre
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Vis informasjon om bystyret
STR_2022_LOCAL_AUTHORITY :{WHITE}Bystyret i {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vurdering av transportfirma:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidiar
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilbydde subsidiar:
STR_2027_FROM_TO :{ORANGE}{STRING} frå {STRING} til {STRING}
@@ -1786,7 +1786,7 @@ STR_2802_TREES :{WHITE}Tre
STR_2803_TREE_ALREADY_HERE :{WHITE}...det er allereie eit tre her
STR_2804_SITE_UNSUITABLE :{WHITE}...uhøveleg område
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Kan ikkje plante tre her...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...for mange skilt
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Kan ikkje plassere skilt her...
STR_280A_SIGN :Skilt
@@ -2084,7 +2084,7 @@ STR_SV_STNAME_LOWER :Nedre {STRING}
STR_SV_STNAME_HELIPORT :{STRING} helikopterstasjon
STR_SV_STNAME_FOREST :{STRING}skogen
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2164,7 +2164,7 @@ STR_683B_HOSTILE :Fiendsleg
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Spelar {COMMA})
STR_7004_NEW_FACE :{BLACK}Nytt andlet
STR_7005_COLOR_SCHEME :{BLACK}Firmafarge
@@ -2176,7 +2176,7 @@ STR_700A_COMPANY_NAME :Firmanamn
STR_700B_PRESIDENT_S_NAME :Namnet til sjefen
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Kan ikkje endre firmanamn...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Kan ikkje byte namn på sjefen...
-STR_700E_FINANCES :{WHITE}Rekneskapen til {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Rekneskapen til {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Kostnader/inntekter
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstruksjon
@@ -2195,7 +2195,7 @@ STR_701D_OTHER :{GOLD}Anna
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totalt:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf over inntekter
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2244,8 +2244,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Antal le
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Prestasjonsvurdering 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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportfirma har problemer!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} vil verte seld eller nedlagt, dersom ikkje økonomien til firmaet tek seg opp!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Sjef)
@@ -2595,7 +2595,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :maglev-lokomoti
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} togstall
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første tog kjem til {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Detaljar)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaljar)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tog i vegen
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2671,8 +2671,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Sl
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Vedlikehald
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan ikkje byggje jernbanekøyretøy...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Lastar på/av
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Toget må vere stoppa i togstallen
@@ -2757,8 +2757,8 @@ STR_TRAIN_NO_POWER :{RED}Ingen stra
STR_TRAIN_START_NO_CATENARY :Dette sporet manglar eit kjede, så toget kan ikkje starte
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Ny {STRING}type er tilgjengeleg!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING}type er tilgjengeleg! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING}type er tilgjengeleg! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan ikkje lage rutetabell for køyretøyet
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Køyretøy kan berre venta på stasjonar
@@ -2782,7 +2782,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_900E_MAX_SPEED :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY} (førre år: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelegskap: {LTBLUE}{COMMA} % {BLACK}Havari sidan førre vedlikehald: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...må verte stoppa i ein garasje
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Kan ikkje selje køyretøy...
@@ -2858,7 +2858,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_9813_MAX_SPEED :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY} (førre år: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelegskap: {LTBLUE}{COMMA} % {BLACK}Havari sidan førre vedlikehald: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Kan ikkje starte/stoppe skip...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Kan ikkje sende skip til depotet...
@@ -2926,7 +2926,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Alder: {
STR_A00E_MAX_SPEED :{BLACK}Maks. fart: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY} (førre år: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelegskap: {LTBLUE}{COMMA} % {BLACK}Havari sidan førre vedlikehald: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Kan ikkje sende fly til hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Er på veg til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Er på veg til {STATION} hangar, {VELOCITY}
diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt
index 056210579..45aeb6f9e 100644
--- a/src/lang/piglatin.txt
+++ b/src/lang/piglatin.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Ownerway
STR_01A8_LOCAL_AUTHORITY :{BLACK}Ocallay authorityway: {LTBLUE}{STRING}
STR_01A9_NONE :Onenay
STR_01AA_NAME :{BLACK}Amenay
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1stay
@@ -1680,7 +1680,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Uildingbay ustmay ebay emolishedday irstfay
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Opulationpay: {ORANGE}{COMMA}{BLACK} Ouseshay: {ORANGE}{COMMA}
@@ -1713,7 +1713,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Ocallay
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Owshay informationway onway ocallay authorityway
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} ocallay authorityway
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ansporttray ompanycay atingsray:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Ubsidiessay
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ubsidiessay onway offerway orfay ervicessay akingtay:
STR_2027_FROM_TO :{ORANGE}{STRING} omfray {STRING} otay {STRING}
@@ -1784,7 +1784,7 @@ STR_2802_TREES :{WHITE}Eestray
STR_2803_TREE_ALREADY_HERE :{WHITE}...eetray alreadyway erehay
STR_2804_SITE_UNSUITABLE :{WHITE}...itesay unsuitableway
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}An'tcay antplay eetray erehay...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...ootay anymay ignssay
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}An'tcay aceplay ignsay erehay...
STR_280A_SIGN :Ignsay
@@ -2077,7 +2077,7 @@ STR_SV_STNAME_LOWER :Owerlay {STRING
STR_SV_STNAME_HELIPORT :{STRING} Eliporthay
STR_SV_STNAME_FOREST :{STRING} Orestfay
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2157,7 +2157,7 @@ STR_683B_HOSTILE :Ostilehay
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Ayerplay {COMMA})
STR_7004_NEW_FACE :{BLACK}Ewnay Acefay
STR_7005_COLOR_SCHEME :{BLACK}Olourcay Emeschay
@@ -2169,7 +2169,7 @@ STR_700A_COMPANY_NAME :Ompanycay Amena
STR_700B_PRESIDENT_S_NAME :Anager'smay Amenay
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}An'tcay angechay ompanycay amenay...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}An'tcay angechay anager'smay amenay...
-STR_700E_FINANCES :{WHITE}{COMPANY} Inancesfay {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Inancesfay {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Expenditureway/Incomeway
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Onstructioncay
@@ -2188,7 +2188,7 @@ STR_701D_OTHER :{GOLD}Otherway
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Otaltay:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Incomeway Aphgray
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2237,8 +2237,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unitsway
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Ompanycay erformancepay atingsray (aximummay atingray=1000)
STR_7052_COMPANY_VALUES :{WHITE}Ompanycay aluesvay
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Ompanycay Eaguelay Abletay
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Ansporttray ompanycay inway oubletray!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} illway ebay oldsay offway orway eclaredday ankruptbay unlessway erformancepay increasesway oonsay!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Anagermay)
@@ -2588,7 +2588,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :aglevmay ocomot
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Aintray Epotday
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay aintray arrivesway atway {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Etailsday)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Etailsday)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Aintray inway ethay ayway
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2662,8 +2662,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - En
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Ervicesay
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}An'tcay uildbay ailwayray ehiclevay...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Oadinglay / Unloadingway
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Aintray ustmay ebay oppedstay insideway away epotday
@@ -2745,8 +2745,8 @@ STR_TRAIN_NO_POWER :{RED}Onay owerp
STR_TRAIN_START_NO_CATENARY :Isthay acktray ackslay atenarycay, osay ethay aintray an'tcay artstay
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Ewnay {STRING} ownay availableway!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ewnay {STRING} ownay availableway! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ewnay {STRING} ownay availableway! - {ENGINE}
##id 0x9000
@@ -2763,7 +2763,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Ageway:
STR_900E_MAX_SPEED :{BLACK}Axmay. eedspay: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ofitpray isthay earyay: {LTBLUE}{CURRENCY} (astlay earyay: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Eliabilityray: {LTBLUE}{COMMA}% {BLACK}Eakdownsbray incesay astlay ervicesay: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Apacitycay: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...ustmay ebay oppedstay insideway away oadray ehiclevay epotday
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}An'tcay ellsay oadray ehiclevay...
@@ -2839,7 +2839,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Ageway:
STR_9813_MAX_SPEED :{BLACK}Axmay. eedspay: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ofitpray isthay earyay: {LTBLUE}{CURRENCY} (astlay earyay: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Eliabilityray: {LTBLUE}{COMMA}% {BLACK}Eakdownsbray incesay astlay ervicesay: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Apacitycay: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}An'tcay opstay/artstay ipshay...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}An'tcay endsay ipshay otay epotday...
@@ -2907,7 +2907,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Ageway:
STR_A00E_MAX_SPEED :{BLACK}Axmay. eedspay: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ofitpray isthay earyay: {LTBLUE}{CURRENCY} (astlay earyay: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Eliabilityray: {LTBLUE}{COMMA}% {BLACK}Eakdownsbray incesay astlay ervicesay: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}An'tcay endsay aircraftway otay angarhay...
STR_HEADING_FOR_HANGAR :{ORANGE}Eadinghay orfay {STATION} Angarhay
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Eadinghay orfay {STATION} Angarhay, {VELOCITY}
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index a9232a8db..adda349f7 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -546,7 +546,7 @@ STR_01A7_OWNER :{BLACK}Właści
STR_01A8_LOCAL_AUTHORITY :{BLACK}Lokalne władze: {LTBLUE}{STRING}
STR_01A9_NONE :Brak
STR_01AA_NAME :{BLACK}Nazwa
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1szy
@@ -1709,7 +1709,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Budynek musi być najpierw zburzony
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Populacja: {ORANGE}{COMMA}{BLACK} Domów: {ORANGE}{COMMA}
@@ -1742,7 +1742,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Lokalne
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Pokaż informacje o lokalnych władzach
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} lokalne władze
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ocena transportu firmy:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsydia
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Oferta subsydiów dla usługi przewozu:
STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING}
@@ -1813,7 +1813,7 @@ STR_2802_TREES :{WHITE}Drzewa
STR_2803_TREE_ALREADY_HERE :{WHITE}...drzewo już tu jest
STR_2804_SITE_UNSUITABLE :{WHITE}...niewłaściwe miejsce
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Nie można posadzić drzewa...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...zbyt wiele napisów
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Nie można umieścić napisu...
STR_280A_SIGN :Napis
@@ -2212,7 +2212,7 @@ STR_683B_HOSTILE :Wrogie
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Gracz {COMMA})
STR_7004_NEW_FACE :{BLACK}Nowa Twarz
STR_7005_COLOR_SCHEME :{BLACK}Schemat Koloru
@@ -2224,7 +2224,7 @@ STR_700A_COMPANY_NAME :Nazwa firmy
STR_700B_PRESIDENT_S_NAME :Nazwisko prezesa
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Nie można zmienić nazwy firmy...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Nie można zmienić nazwiska prezesa...
-STR_700E_FINANCES :{WHITE}{COMPANY} Finanse {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finanse {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Wydatki/Przychody
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstrukcje
@@ -2243,7 +2243,7 @@ STR_701D_OTHER :{GOLD}Inne
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Łącznie:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Wykres przychodów
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2292,8 +2292,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Dostarcz
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Ocena działalności firmy (max. ocena=1000)
STR_7052_COMPANY_VALUES :{WHITE}Wartości firm
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Tabela Ligi Firm
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Firma ma problemy!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} będzie odsprzedane lub ogłoszone upadłym jeżeli zysk firmy nie wzrośnie!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Prezes)
@@ -2647,7 +2647,7 @@ STR_8107_MAGLEV_LOCOMOTIVE.b :{G=f}lokomotyw
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}Zajezdnia w {TOWN}
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy pociąg przybył do {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Szczegóły)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Szczegóły)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Pociąg na drodze
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2714,8 +2714,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Ko
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Serwis
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nie można wybudować lokomotywy...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Budowa: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Wartość: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Budowa: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Wartość: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Załadunek / Wyładunek
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Pociąg musi być zatrzymany w zajezdni
@@ -2790,8 +2790,8 @@ STR_TRAIN_NO_POWER :{RED}Brak zasil
STR_TRAIN_START_NO_CATENARY :Ta trasa nie jest zelektryfikowana, wiec pociąg nie wystartuje
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Dostępn{G y a e} now{G y a e} {STRING}!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Dostępn{G y a e} now{G y a e} {STRING} - {STRING}!
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Dostępn{G y a e} now{G y a e} {STRING} - {ENGINE}!
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Samochód na drodze
@@ -2807,7 +2807,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Wiek: {L
STR_900E_MAX_SPEED :{BLACK}Max. prędkość: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY} (ostatni rok: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Niezawodność: {LTBLUE}{COMMA}% {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Zbudowany: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zbudowany: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Pojemność: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...musi być zatrzymany w zajezdni samochodowej
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Nie można sprzedać samochodu...
@@ -2879,7 +2879,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Wiek: {L
STR_9813_MAX_SPEED :{BLACK}Max. prędkość: {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}Niezawodność: {LTBLUE}{COMMA}% {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Wybudowany: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Wybudowany: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Pojemność: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Nie można zatrzymać/ruszyć statku...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Nie można wysłać statku do stoczni...
@@ -2947,7 +2947,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Wiek: {L
STR_A00E_MAX_SPEED :{BLACK}Max. prędkość: {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}Niezawodność: {LTBLUE}{COMMA}% {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Zbudowany: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zbudowany: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Nie można wysłać samolotu do hangaru...
STR_HEADING_FOR_HANGAR :{ORANGE}Zmierza do hangaru w {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Zmierza do hangaru w {STATION}, {VELOCITY}
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 66758bd0b..9844c4f20 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Propriet
STR_01A8_LOCAL_AUTHORITY :{BLACK}Autoridade local: {LTBLUE}{STRING}
STR_01A9_NONE :Nenhum
STR_01AA_NAME :{BLACK}Nome
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1651,7 +1651,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1684,7 +1684,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Autorida
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1755,7 +1755,7 @@ STR_2802_TREES :{WHITE}Árvores
STR_2803_TREE_ALREADY_HERE :{WHITE}...árvore já plantada aqui
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_2806 :{WHITE}{SIGN}
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
@@ -2041,7 +2041,7 @@ STR_SV_STNAME_LOWER :{STRING} de bai
STR_SV_STNAME_HELIPORT :Heliporto de {STRING}
STR_SV_STNAME_FOREST :Floresta de {STRING}
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2121,7 +2121,7 @@ STR_683B_HOSTILE :Hostil
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Jogador {COMMA})
STR_7004_NEW_FACE :{BLACK}Nova Cara
STR_7005_COLOR_SCHEME :{BLACK}Cores
@@ -2133,7 +2133,7 @@ STR_700A_COMPANY_NAME :Nome da Empresa
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}{COMPANY} Finanças {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finanças {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Despesas/Lucros
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construção
@@ -2152,7 +2152,7 @@ STR_701D_OTHER :{GOLD}Outros
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Rendimentos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2201,8 +2201,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unidades
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Empresa de transportes em dificuldades!
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)
@@ -2550,7 +2550,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :locomotiva magl
##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}{VEHICLE} (Detalhes)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Comboio no caminho
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2618,8 +2618,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valor: {LTBLUE}{CURRENCY}
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
@@ -2694,8 +2694,8 @@ STR_TRAIN_NO_POWER :{RED}Sem energi
STR_TRAIN_START_NO_CATENARY :Esta linha não tem catenária, o comboio não pode arrancar
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Novo {STRING} agora disponível!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo {STRING} agora disponível! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo {STRING} agora disponível! - {ENGINE}
##id 0x9000
@@ -2712,7 +2712,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
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...
@@ -2785,7 +2785,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
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...
@@ -2853,7 +2853,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Idade: {
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Dirige-se ao hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Dirige-se ao hangar de {STATION}, {VELOCITY}
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index a95533c3f..a440569c3 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Mai întâi trebuie demolată clădirea
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Populaţia: {ORANGE}{COMMA}{BLACK} Locuinţe: {ORANGE}{COMMA}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Autorita
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Afişează informaţii referitoare la autoritatea locală
STR_2022_LOCAL_AUTHORITY :{WHITE}Autoritatea locală din {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Evaluarea companiilor de transport:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvenţii (F6)
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvenţii disponibile:
STR_2027_FROM_TO :{ORANGE}- {STRING} de la {STRING} la {STRING}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}Arbori
STR_2803_TREE_ALREADY_HERE :{WHITE}...sunt deja plantaţi arbori
STR_2804_SITE_UNSUITABLE :{WHITE}...locaţie nepotrivită
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Nu pot planta arbori aici...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
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
@@ -2083,7 +2083,7 @@ STR_SV_STNAME_LOWER :{STRING} de Jos
STR_SV_STNAME_HELIPORT :Heliportul {STRING}
STR_SV_STNAME_FOREST :Pãdurea {STRING}
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2163,7 +2163,7 @@ STR_683B_HOSTILE :ostilă
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Jucătorul {COMMA})
STR_7004_NEW_FACE :{BLACK}Schimbă poza
STR_7005_COLOR_SCHEME :{BLACK}Culoare
@@ -2175,7 +2175,7 @@ STR_700A_COMPANY_NAME :Noul nume al co
STR_700B_PRESIDENT_S_NAME :Noul nume al preşedintelui
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Nu pot schimba numele companiei...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Nu pot schimba numele preşedintelui...
-STR_700E_FINANCES :{WHITE}Situaţia financiară a companiei {COMPANY} {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}Situaţia financiară a companiei {COMPANY} {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Cheltuieli/Venituri
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construcţii
@@ -2194,7 +2194,7 @@ STR_701D_OTHER :{GOLD}Altele
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graficul veniturilor
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2243,8 +2243,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unităţ
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Evaluarea performanţelor companiilor (maxim=1000)
STR_7052_COMPANY_VALUES :{WHITE}Valorile companiilor
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Clasamentul companiilor
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Companie de transport cu probleme!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} va fi vândută dacă situaţia financiară nu se va îmbunătăţi curând!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Preşedinte)
@@ -2670,8 +2670,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Sf
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}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Cumpărat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valoare: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Încărcare / Descărcare
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Trenul trebuie oprit intr-un depou
@@ -2756,8 +2756,8 @@ STR_TRAIN_NO_POWER :{RED}Fara curen
STR_TRAIN_START_NO_CATENARY :Aceasta sina nu este electrificata, deci trenul nu poate porni
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Un nou {STRING} este acum disponibil!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Un nou {STRING} este acum disponibil! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Un nou {STRING} este acum disponibil! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Nu pot programa vehiculul...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Vehiculele pot astepta numai in statii.
@@ -2781,7 +2781,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Vârsta:
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}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Cumpãrat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacitate: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...trebuie oprit intr-o autobazã
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Nu pot vinde autovehiculul...
@@ -2857,7 +2857,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Vârsta:
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}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacitate: {LTBLUE}{CARGO}
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...
@@ -2925,7 +2925,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Vârstã
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}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Merge la Hangarul {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Merge la Hangarul {STATION}, {VELOCITY}
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 166dbe646..bbe4fab37 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1683,7 +1683,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Сначала надо уничтожить здания
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Население: {ORANGE}{COMMA}{BLACK} Зданий: {ORANGE}{COMMA}
@@ -1716,7 +1716,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Мест
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Информация о местных властях
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} местные власти
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Рейтинг транспортной компании
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Субсидии
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Свободные субсидии
STR_2027_FROM_TO :{ORANGE}{STRING.p} по маршруту из {STRING} в {STRING}
@@ -1787,7 +1787,7 @@ STR_2802_TREES :{WHITE}Дере
STR_2803_TREE_ALREADY_HERE :{WHITE}...уже есть дерево
STR_2804_SITE_UNSUITABLE :{WHITE}...неподходящее место
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Невозможно высадить деревья...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...слишком много знаков
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Невозможно установить знак...
STR_280A_SIGN :Знак
@@ -2174,7 +2174,7 @@ STR_683B_HOSTILE :Враждеб
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Игрок {COMMA})
STR_7004_NEW_FACE :{BLACK}Лицо
STR_7005_COLOR_SCHEME :{BLACK}Цвет
@@ -2186,7 +2186,7 @@ STR_700A_COMPANY_NAME :Компани
STR_700B_PRESIDENT_S_NAME :Имя директора
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Невозможно изменить название компании...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Невозможно изменить имя директора...
-STR_700E_FINANCES :{WHITE}{COMPANY} Денежные средства {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Денежные средства {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Расход/доход
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Строительство
@@ -2205,7 +2205,7 @@ STR_701D_OTHER :{GOLD}Друг
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}ИТОГО:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}График доходов
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2254,8 +2254,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Дост
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Рейтинг деятельности компании (макс=1000)
STR_7052_COMPANY_VALUES :{WHITE}Стоимость активов компании
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Сравнительная таблица компаний
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Транспортная компания в опасном положении!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT} {COMPANY} будет продана или объявлена банкротом, если ситуация не изменится!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Директор)
@@ -2681,8 +2681,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - К
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Обслуж.
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Невозможно построить ж/д транспорт...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Построен: {LTBLUE}{NUM}{BLACK} Стоимость: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Стоимость: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Построен: {LTBLUE}{NUM}{BLACK} Стоимость: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Стоимость: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Разгрузка/Погрузка
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Поезд должен быть остановлен в депо
@@ -2767,8 +2767,8 @@ STR_TRAIN_NO_POWER :{RED}Нет т
STR_TRAIN_START_NO_CATENARY :Кто-то украл все провода, поезд не может ехать...
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Появился новый {STRING}!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Появился новый {STRING}! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Появился новый {STRING}! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Не могу составить расписание для этого транспорта...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Транспорт может только ждать на станции.
@@ -2792,7 +2792,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Возр
STR_900E_MAX_SPEED :{BLACK}Макс. скорость: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибыль в этом году: {LTBLUE}{CURRENCY} (прошлый год: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Надежность: {LTBLUE}{COMMA}% {BLACK}Поломок с последнего ремонта: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Построено: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Построено: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Емкость: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...должен быть остановлен в гараже
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Невозможно продать автомобиль...
@@ -2868,7 +2868,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Возр
STR_9813_MAX_SPEED :{BLACK}Макс. скорость: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибыль в этом году: {LTBLUE}{CURRENCY} (прошлый год: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Надежность: {LTBLUE}{COMMA}% {BLACK}Поломок с последнего обслуж.: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Построено: {LTBLUE}{NUM}{BLACK} Стоимость: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Построено: {LTBLUE}{NUM}{BLACK} Стоимость: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Емкость: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Не могу остановить/запустить корабль...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Не могу отправить корабль в док...
@@ -2936,7 +2936,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Возр
STR_A00E_MAX_SPEED :{BLACK}Макс. скорость: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибыль в этом году: {LTBLUE}{CURRENCY} (прошлый год: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Надежность: {LTBLUE}{COMMA}% {BLACK}Поломок с последнего ремонта: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Построено: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Построено: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Невозможно отправить его в ангар...
STR_HEADING_FOR_HANGAR :{ORANGE}Летит в Ангар {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Следует в Ангар {STATION}, {VELOCITY}
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 198498c64..496ef4a65 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -493,7 +493,7 @@ STR_01A7_OWNER :{BLACK}属主
STR_01A8_LOCAL_AUTHORITY :{BLACK}地方政府:{LTBLUE}{STRING}
STR_01A9_NONE :没有
STR_01AA_NAME :{BLACK}名称
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1日
@@ -1612,7 +1612,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}必须先摧毁建筑
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}人口:{ORANGE}{COMMA}{BLACK} 房屋:{ORANGE}{COMMA}
@@ -1645,7 +1645,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}地方
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}显示地方政府的信息
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 地方政府
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}对运输公司评价:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}财政补贴项目
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}尚未中标的项目:
STR_2027_FROM_TO :{ORANGE}将 {STRING} 从 {STRING} 运送到 {STRING}
@@ -1716,7 +1716,7 @@ STR_2802_TREES :{WHITE}树木
STR_2803_TREE_ALREADY_HERE :{WHITE}……此处已经有树木了
STR_2804_SITE_UNSUITABLE :{WHITE}……地点不合适
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}不能在这里植树……
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}……标志太多了
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}不能在这里放置标志……
STR_280A_SIGN :标志
@@ -2079,7 +2079,7 @@ STR_683B_HOSTILE :对立
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Player {COMMA})
STR_7004_NEW_FACE :{BLACK}新的肖像
STR_7005_COLOR_SCHEME :{BLACK}配色方案
@@ -2091,7 +2091,7 @@ STR_700A_COMPANY_NAME :公司名称
STR_700B_PRESIDENT_S_NAME :总裁姓名
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}不能为公司更名……
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}不能更改总裁的名字……
-STR_700E_FINANCES :{WHITE}{COMPANY} 财务报表 {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} 财务报表 {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}收入/支出
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}建设费用
@@ -2110,7 +2110,7 @@ STR_701D_OTHER :{GOLD}其他费
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}总计:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}收入图表
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2159,8 +2159,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}运输
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}公司表现指数 (最大指数为1000)
STR_7052_COMPANY_VALUES :{WHITE}公司市值
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}公司评价表
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}运输公司陷入困境!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} 如果不能在短期摆脱困境,则将被收购或破产!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(总裁)
@@ -2508,7 +2508,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :磁悬浮机头
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} 列车车库
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一列火车抵达 {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (详细信息)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (详细信息)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}指定位置有列车
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2575,8 +2575,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}-- 调
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}保养
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}不能购买列车……
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 建造时间:{LTBLUE}{NUM}{BLACK} 价值:{LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} 价值:{LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 建造时间:{LTBLUE}{NUM}{BLACK} 价值:{LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} 价值:{LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}装载/卸货
STR_TRAIN_MUST_BE_STOPPED :{WHITE}列车必须停在一个车库中
@@ -2651,8 +2651,8 @@ STR_TRAIN_NO_POWER :{RED}没有电
STR_TRAIN_START_NO_CATENARY :这不是电气化铁路,电力机车不能启动
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}新 {STRING} 上市了!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}新 {STRING} 上市了! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}新 {STRING} 上市了! - {ENGINE}
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}指定的位置有汽车
@@ -2668,7 +2668,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}年龄:
STR_900E_MAX_SPEED :{BLACK}最大时速: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年的利润: {LTBLUE}{CURRENCY} (last year: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}可靠性: {LTBLUE}{COMMA}% {BLACK}上次保养后抛锚的次数: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 建造年份: {LTBLUE}{NUM}{BLACK} 价值: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 建造年份: {LTBLUE}{NUM}{BLACK} 价值: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}装载能力:{LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...必须完全停在一个车库中
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}不能出售汽车...
@@ -2740,7 +2740,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}年龄
STR_9813_MAX_SPEED :{BLACK}最大速度:{LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年利润:{LTBLUE}{CURRENCY} (去年:{CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}可靠性:{LTBLUE}{COMMA}% {BLACK}上次保养后的故障次数:{LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 建造时间:{LTBLUE}{NUM}{BLACK} 价值:{LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 建造时间:{LTBLUE}{NUM}{BLACK} 价值:{LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}运载能力: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}不能停止/启动船只……
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}不能命令船只前往船坞……
@@ -2808,7 +2808,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}年龄
STR_A00E_MAX_SPEED :{BLACK}最大速度:{LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年的利润:{LTBLUE}{CURRENCY} (去年:{CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}可靠性:{LTBLUE}{COMMA}% {BLACK}上次保养后的故障次数:{LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 制造年份:{LTBLUE}{NUM}{BLACK} 价值:{LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 制造年份:{LTBLUE}{NUM}{BLACK} 价值:{LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}不能命令飞机返回机库……
STR_HEADING_FOR_HANGAR :{ORANGE}正在前往 {STATION} 的机库
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}正在前往 {STATION} 的机库,{VELOCITY}
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 6665760c7..1d10eae0a 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -559,7 +559,7 @@ STR_01A7_OWNER :{BLACK}Vlastní
STR_01A8_LOCAL_AUTHORITY :{BLACK}Miestna správa: {LTBLUE}{STRING}
STR_01A9_NONE :Neznáme
STR_01AA_NAME :{BLACK}Meno
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1730,7 +1730,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1763,7 +1763,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Miestna
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Zobrazit informacie o miestnej sprave
STR_2022_LOCAL_AUTHORITY :{WHITE}Miestna sprava {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Hodnotenie dopravnych spolocnosti:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1834,7 +1834,7 @@ STR_2802_TREES :{WHITE}Stromy
STR_2803_TREE_ALREADY_HERE :{WHITE}... strom tu uz je
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_2806 :{WHITE}{SIGN}
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
@@ -2120,7 +2120,7 @@ STR_SV_STNAME_LOWER :Dolny {STRING}
STR_SV_STNAME_HELIPORT :{STRING} Heliport
STR_SV_STNAME_FOREST :{STRING} Les
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2200,7 +2200,7 @@ STR_683B_HOSTILE :Odmietavy
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Hrac {COMMA})
STR_7004_NEW_FACE :{BLACK}Nová tvár
STR_7005_COLOR_SCHEME :{BLACK}Farebna schema
@@ -2212,7 +2212,7 @@ STR_700A_COMPANY_NAME :Nazov spolocnos
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}{COMPANY} Financie {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Financie {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Vydavky/Prijmy
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Vystavba
@@ -2231,7 +2231,7 @@ STR_701D_OTHER :{GOLD}Ostatne
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Spolu:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf príjmov
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2280,8 +2280,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Dopraven
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Dopravna spolocnost ma problemy!
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)
@@ -2629,7 +2629,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :magneticka loko
##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}{VEHICLE} (Detaily)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vlak v ceste
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2696,8 +2696,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Ko
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Oprava
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nemozno kupit vlak...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Naklada/Vyklada
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Vlak musi byt zastaveny v depe
@@ -2772,8 +2772,8 @@ STR_TRAIN_NO_POWER :{RED}Nie je pru
STR_TRAIN_START_NO_CATENARY :Vlak nemoze nastartovat, pretoze trat nie je pripojena
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nové {STRING} dostupné!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nové {STRING} dostupné! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nové {STRING} dostupné! - {ENGINE}
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automobil v ceste
@@ -2789,7 +2789,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Vek: {LT
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}Pocet poruch od posledneho servisu: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}... musi byt zastaveny v garazi
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Nemozno predat automobil ...
@@ -2861,7 +2861,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Vek: {LT
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}Pocet poruch od posledneho servisu: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO}
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 ...
@@ -2929,7 +2929,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Vek: {LT
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}Pocet poruch od posledneho servisu: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Smeruje do {STATION} hangaru
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Smeruje do {STATION} hangaru, {VELOCITY}
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 627e58240..7cd7042c7 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -537,7 +537,7 @@ STR_01A7_OWNER :{BLACK}Lastnik:
STR_01A8_LOCAL_AUTHORITY :{BLACK}Lokalna oblast: {LTBLUE}{STRING}
STR_01A9_NONE :Brez
STR_01AA_NAME :{BLACK}Ime
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1.
@@ -1723,7 +1723,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Najprej mora biti stavba porušena
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Prebivalstvo: {ORANGE}{COMMA}{BLACK} Število stavb: {ORANGE}{COMMA}
@@ -1756,7 +1756,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Mestni s
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Pokaži informacije o mestni oblasti
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} mestni svet
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ocene prevoznega podjetja:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencije
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponudba subvencije za storitev:
STR_2027_FROM_TO :{ORANGE}Prevoz {STRING.r} iz {STRING} v {STRING}
@@ -1828,7 +1828,7 @@ STR_2802_TREES :{WHITE}Drevesa
STR_2803_TREE_ALREADY_HERE :{WHITE} ... drevo je že posajeno
STR_2804_SITE_UNSUITABLE :{WHITE} ... neprimerna lokacija
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Ne moreš posaditi drevesa tukaj ...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE} ... preveč znakov
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Ne moreš postaviti znaka tukaj
STR_280A_SIGN :Znak
@@ -2163,7 +2163,7 @@ STR_SV_STNAME_LOWER :Dolnja {STRING}
STR_SV_STNAME_HELIPORT :{STRING} Pristajališče
STR_SV_STNAME_FOREST :{STRING} Gozd
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2243,7 +2243,7 @@ STR_683B_HOSTILE :Sovražno
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Igralec {COMMA})
STR_7004_NEW_FACE :{BLACK}Nov obraz
STR_7005_COLOR_SCHEME :{BLACK}Barvna shema
@@ -2255,7 +2255,7 @@ STR_700A_COMPANY_NAME :Ime podjetja
STR_700B_PRESIDENT_S_NAME :Ime lastnika
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Ni mogoče spremeniti imena podjetja ...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Ni mogoče spremeniti imena lastnika ...
-STR_700E_FINANCES :{WHITE}{COMPANY} Finance {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finance {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Stroški/dohodek
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Gradnja
@@ -2274,7 +2274,7 @@ STR_701D_OTHER :{GOLD}Drugo
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Skupaj:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf prihodkov
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2323,8 +2323,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Enot dos
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Ocene uspeha podjetja (max=1000)
STR_7052_COMPANY_VALUES :{WHITE}Vrednosti podjetij
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Seznam najboljših podjetij
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Podjetje v težavah!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :Podjetje {BLACK}{BIGFONT}{COMPANY} bo prodano ali prisiljeno v stečajni postopek, če se stanje kaj kmalu ne izboljša!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Lastnik)
@@ -2674,7 +2674,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :magnetna lokomo
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Železniška garaža
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prvi vlak je slovesno pripeljal{}na postajo {STATION}!
-STR_8802_DETAILS :{WHITE}{STRING} (Podrobnosti)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Podrobnosti)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vlak v napoto
STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
@@ -2750,8 +2750,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Ko
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Servis
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Ni mogoče kupiti vozila ...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Natovarjanje / Raztovarjanje
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Vlak mora biti ustavljen v garaži
@@ -2836,8 +2836,8 @@ STR_TRAIN_NO_POWER :{RED}Ni napetos
STR_TRAIN_START_NO_CATENARY :Ta proga nima napetostnih vodov, zato vlak ne more z mesta
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Novo! {STRING} sedaj na razpolago!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo! {STRING} sedaj na razpolago! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo! {STRING} sedaj na razpolago! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Nemogoče določiti časa vozilu...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Vozila lahko čakajo le na postajah.
@@ -2861,7 +2861,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Starost:
STR_900E_MAX_SPEED :{BLACK}Max. hitrost: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Letošnji dobiček: {LTBLUE}{CURRENCY} (lanski: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Zanesljivost: {LTBLUE}{COMMA}% {BLACK}Št. okvar od zadnjega servisa: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Zgrajen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zgrajen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Zmogljivost: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE} ... mora biti ustavljen v garaži
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Ni mogoče prodati cestnega vozila...
@@ -2937,7 +2937,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Starost:
STR_9813_MAX_SPEED :{BLACK}Max. hitrost: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Dobiček letos: {LTBLUE}{CURRENCY} (lani: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Zanesljivost: {LTBLUE}{COMMA}% {BLACK}Št. okvar po zadnjem servisu: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Zgrajen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zgrajen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Zmogljivost: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Ni mogoče ustaviti/zagnati ladje...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Ni mogoče poslati ladje v garažo...
@@ -3005,7 +3005,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Starost:
STR_A00E_MAX_SPEED :{BLACK}Max. hitrost: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Dobiček letos: {LTBLUE}{CURRENCY} (lani: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Zanesljivost: {LTBLUE}{COMMA}% {BLACK}Št. okvar po zadnjem servisu: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Ni mogoče poslati letala v hangar ...
STR_HEADING_FOR_HANGAR :{ORANGE}Na poti v {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Na poti v {STATION} hangar, {VELOCITY}
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 275fec10e..31d237383 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -496,7 +496,7 @@ STR_01A7_OWNER :{BLACK}Propieta
STR_01A8_LOCAL_AUTHORITY :{BLACK}Autoridad local: {LTBLUE}{STRING}
STR_01A9_NONE :Ninguna
STR_01AA_NAME :{BLACK}Nombre
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1634,7 +1634,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1667,7 +1667,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Autorida
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}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1738,7 +1738,7 @@ STR_2802_TREES :{WHITE}Árboles
STR_2803_TREE_ALREADY_HERE :{WHITE}...ya hay árboles aquí
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_2806 :{WHITE}{SIGN}
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 :Señal
@@ -2108,7 +2108,7 @@ STR_683B_HOSTILE :Hostil
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Jugador {COMMA})
STR_7004_NEW_FACE :{BLACK}Nueva Cara
STR_7005_COLOR_SCHEME :{BLACK}Esquema Color
@@ -2120,7 +2120,7 @@ STR_700A_COMPANY_NAME :Nombre Empresa
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}{COMPANY} Finanzas {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Finanzas {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Gastos/Ingresos
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Construcción
@@ -2139,7 +2139,7 @@ STR_701D_OTHER :{GOLD}Otros
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Ingresos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2188,8 +2188,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Unidades
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}¡Empresa en problemas!
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)
@@ -2537,7 +2537,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :locomotora magl
##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}{VEHICLE} (Detalles)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tren en camino
STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
@@ -2606,8 +2606,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Fi
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construido: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Valor: {LTBLUE}{CURRENCY}
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
@@ -2683,8 +2683,8 @@ STR_TRAIN_NO_POWER :{RED}Sin potenc
STR_TRAIN_START_NO_CATENARY :Esta vía carece la catenaria, así que el tren no puede comenzar
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nuevo{STRING} ahora disponible!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuevo {STRING} ahora disponible! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuevo {STRING} ahora disponible! - {ENGINE}
##id 0x9000
@@ -2701,7 +2701,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Edad: {L
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Const.: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Capacidad: {LTBLUE}{CARGO}
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...
@@ -2773,7 +2773,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Edad: {L
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Const.: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Capacidad: {LTBLUE}{CARGO}
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...
@@ -2841,7 +2841,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Edad: {L
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}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}Ir al hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Ir al hangar de {STATION}, {VELOCITY}
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index c26824445..d949d2bdd 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Ägare:
STR_01A8_LOCAL_AUTHORITY :{BLACK}Lokala myndigheter: {LTBLUE}{STRING}
STR_01A9_NONE :Ingen
STR_01AA_NAME :{BLACK}Namn
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
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}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Lokala m
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Visa information om de lokala myndigheterna
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} lokala myndigheter
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportföretags värderingar:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {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}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}Träd
STR_2803_TREE_ALREADY_HERE :{WHITE}...träd redan här
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_2806 :{WHITE}{SIGN}
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
@@ -2078,7 +2078,7 @@ STR_SV_STNAME_LOWER :Nedre {STRING}
STR_SV_STNAME_HELIPORT :{STRING} Helikopterplats
STR_SV_STNAME_FOREST :{STRING} Skog
-STR_SV_GROUP_NAME :{GROUP}
+
############ end of savegame specific region!
@@ -2158,7 +2158,7 @@ STR_683B_HOSTILE :Fientlig
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Spelare {COMMA})
STR_7004_NEW_FACE :{BLACK}Nytt ansikte
STR_7005_COLOR_SCHEME :{BLACK}Färgval
@@ -2170,7 +2170,7 @@ STR_700A_COMPANY_NAME :Företagsnamn
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}{COMPANY} Budget {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Budget {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Utgifter/inkomster
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Konstruktioner
@@ -2189,7 +2189,7 @@ STR_701D_OTHER :{GOLD}Övrigt
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totalt:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf över inkomster
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2238,8 +2238,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Enheter
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}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportföretag har problem!
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}{}(VD)
@@ -2589,7 +2589,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :maglev-lokomoti
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} tågdepå
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}{VEHICLE} (Details)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tåg i vägen
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2665,8 +2665,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Sl
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}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Värde: {LTBLUE}{CURRENCY}
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
@@ -2751,8 +2751,8 @@ STR_TRAIN_NO_POWER :{RED}Ingen Kraf
STR_TRAIN_START_NO_CATENARY :Detta spår saknar kedjekurva, så tåget kan inte starta
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nya {STRING} är nu tillgänglig!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nya {STRING} är nu tillgänglig - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nya {STRING} är nu tillgänglig - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan inte lägga till fordonet i en tidtabell...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Fordon kan enbart vänta vid stationer.
@@ -2776,7 +2776,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Ålder:
STR_900E_MAX_SPEED :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY} (förra året: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}% {BLACK}Motorstopp sedan senaste service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapacitet: {LTBLUE}{CARGO}
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...
@@ -2852,7 +2852,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Ålder:
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 senaste service: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapacitet: {LTBLUE}{CARGO}
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å...
@@ -2920,7 +2920,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Ålder:
STR_A00E_MAX_SPEED :{BLACK}Tophastighet: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY} (förra året: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}% {BLACK}Motorstopp sedan senaste service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{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 :{ORANGE}På väg mot {STATION}s hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}På väg mot {STATION}s hangar, {VELOCITY}
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 97601d6e2..8e8417554 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -1681,7 +1681,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}必須先摧毀建築
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}人口:{ORANGE}{COMMA}{BLACK} 房屋:{ORANGE}{COMMA}
@@ -1714,7 +1714,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}地方
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}顯示地方政府資訊
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 地方政府
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}運輸公司評比:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}:{ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}:{ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}補助
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}提供補助的運輸服務:
STR_2027_FROM_TO :{ORANGE}將 {STRING} 從 {STRING} 運到 {STRING}
@@ -1785,7 +1785,7 @@ STR_2802_TREES :{WHITE}樹木
STR_2803_TREE_ALREADY_HERE :{WHITE}...這邊已經有樹了
STR_2804_SITE_UNSUITABLE :{WHITE}...地點不適合
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}不能在這邊種樹...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...太多標誌了
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}不能在這邊放標誌...
STR_280A_SIGN :標誌
@@ -2161,7 +2161,7 @@ STR_683B_HOSTILE :抱敵意
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(玩家 {COMMA})
STR_7004_NEW_FACE :{BLACK}新臉孔
STR_7005_COLOR_SCHEME :{BLACK}配色
@@ -2173,7 +2173,7 @@ STR_700A_COMPANY_NAME :公司名稱
STR_700B_PRESIDENT_S_NAME :經理姓名
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}無法修改公司名稱...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}無法修改經理名稱...
-STR_700E_FINANCES :{WHITE}{COMPANY} 財務狀況 {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} 財務狀況 {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}收入/支出
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}建造
@@ -2192,7 +2192,7 @@ STR_701D_OTHER :{GOLD}其它
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}總計:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}收入圖
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2241,8 +2241,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}運送
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}公司效率指標 (最高 1000)
STR_7052_COMPANY_VALUES :{WHITE}公司價值
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}公司排行榜
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}運輸公司有麻煩了!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} 將被拍賣或宣告破產,除非效率盡快提昇!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(經理)
@@ -2668,8 +2668,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}維護
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}無法購買鐵道車輛...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} 價值:{LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} 價值:{LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}正在裝卸客貨
STR_TRAIN_MUST_BE_STOPPED :{WHITE}列車必須停在機廠内
@@ -2754,8 +2754,8 @@ STR_TRAIN_NO_POWER :{RED}沒有電
STR_TRAIN_START_NO_CATENARY :這個軌道沒有電氣化,所以列車無法起動
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}{STRING} 問世了!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} 問世了! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} 問世了! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}無法為運具加入時刻表...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}運具只能等待於站點。
@@ -2779,7 +2779,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}使用
STR_900E_MAX_SPEED :{BLACK}極速:{LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年損益:{LTBLUE}{CURRENCY} (去年:{CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}可靠度:{LTBLUE}{COMMA}% {BLACK}上次維護後故障次數:{LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購買於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}容量:{LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...必須停在汽車庫内
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}無法出售汽車...
@@ -2855,7 +2855,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}使用
STR_9813_MAX_SPEED :{BLACK}極速:{LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年損益:{LTBLUE}{CURRENCY} (去年:{CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}可靠度:{LTBLUE}{COMMA}% {BLACK}上次維護後故障次數:{LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購買於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}容量:{LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}無法停止/起動船舶...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}無法將船舶送到船塢...
@@ -2923,7 +2923,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}使用
STR_A00E_MAX_SPEED :{BLACK}極速:{LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年損益:{LTBLUE}{CURRENCY} (去年:{CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}可靠度:{LTBLUE}{COMMA}% {BLACK}上次維護後故障次數:{LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購買於:{LTBLUE}{NUM}{BLACK} 價值:{LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}無法將飛機送回機棚...
STR_HEADING_FOR_HANGAR :{ORANGE}正前往 {STATION} 機棚
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}正前往 {STATION} 機棚, {VELOCITY}
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 940e21fbf..60ea94589 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -495,7 +495,7 @@ STR_01A7_OWNER :{BLACK}Sahibi:
STR_01A8_LOCAL_AUTHORITY :{BLACK}Belediyesi: {LTBLUE}{STRING}
STR_01A9_NONE :Hiçbiri
STR_01AA_NAME :{BLACK}İsim
-STR_01AB :{BLACK}{TINYFONT}{STRING}
+STR_01AB :{BLACK}{TINYFONT}{VEHICLE}
############ range for days starts
STR_01AC_1ST :1
@@ -1658,7 +1658,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Önce bina yıkılmalı
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Nüfus: {ORANGE}{COMMA}{BLACK} Ev: {ORANGE}{COMMA}
@@ -1691,7 +1691,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Belediye
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Belediye hakkında bilgi göster
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} belediyesi
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Taşıma şirketi reytingleri:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}İhaleler
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Beklenen ihaleler:
STR_2027_FROM_TO :{ORANGE}{STRING} {STRING} -> {STRING}
@@ -1762,7 +1762,7 @@ STR_2802_TREES :{WHITE}Ağaçla
STR_2803_TREE_ALREADY_HERE :{WHITE}...burada zaten ağaç var
STR_2804_SITE_UNSUITABLE :{WHITE}...yer uygun değil
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Buraya ağaç dikilemez...
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...çok fazla tabela
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Buraya tabela konulamiyor...
STR_280A_SIGN :Tabela
@@ -2137,7 +2137,7 @@ STR_683B_HOSTILE :Katı
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :({COMMA}. Oyuncu)
STR_7004_NEW_FACE :{BLACK}Yeni Surat
STR_7005_COLOR_SCHEME :{BLACK}Renkler
@@ -2149,7 +2149,7 @@ STR_700A_COMPANY_NAME :Şirketin ismi
STR_700B_PRESIDENT_S_NAME :Yöneticinin ismi
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Şirket ismi değiştirilemez...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Yönetici ismi degitirilemez...
-STR_700E_FINANCES :{WHITE}{COMPANY} Hesaplar {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} Hesaplar {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Gider/Gelir
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}İnşaat
@@ -2168,7 +2168,7 @@ STR_701D_OTHER :{GOLD}Diğer
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Toplam:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gelir Grafiği
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2217,8 +2217,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Taşına
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Performans (en fazla=1000)
STR_7052_COMPANY_VALUES :{WHITE}Şirket Değerleri
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Şirketler Ligi
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Şirket tehlikede!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY}, performansı artmazsa satılacak ya da yok olacak!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Yönetici)
@@ -2568,7 +2568,7 @@ STR_8107_MAGLEV_LOCOMOTIVE :maglev lokomoti
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Tren Garaji
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kutlama Yapıldı . . .{} {STATION} istasyonuna ilk kez tren geldi!
-STR_8802_DETAILS :{WHITE}{STRING} (Detaylar)
+STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaylar)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Yolda tren var
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2644,8 +2644,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - Ta
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Bakım
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Tren satın alınamaz...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Tarih: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Değeri: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Tarih: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Değeri: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Yükleme / Boşaltma
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Tren garda durdurulmalı
@@ -2725,8 +2725,8 @@ STR_TRAIN_NO_POWER :{RED}Elektrik y
STR_TRAIN_START_NO_CATENARY :Bu rayda elektrik olmadiği için bu tren çalışamaz
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}{STRING} artık kullanılabilir!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} artık kullanılabilir! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} artık kullanılabilir! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Aracın zaman çizelgesi oluşturulamıyor...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Araçlar sadece istasyonlarda bekleyebilir.
@@ -2749,7 +2749,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Yaş: {L
STR_900E_MAX_SPEED :{BLACK}Mak. hız: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Bu seneki kâr: {LTBLUE}{CURRENCY} (geçen sene: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}güvenilirlik: {LTBLUE}%{COMMA} {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Yapım yılı: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Yapım yılı: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapasite: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...bir araba garajında duruyor olmalı
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Araba satılamıyor...
@@ -2825,7 +2825,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Yaş: {L
STR_9813_MAX_SPEED :{BLACK}Mak. Hız: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Bu seneki kâr: {LTBLUE}{CURRENCY} (geçen sene: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Güven: {LTBLUE}%{COMMA} {BLACK}Son yolculuktaki bozulmalar: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Yapım yılı: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Yapım yılı: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Kapasite: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Gemi durdurulamaz/başlatılamaz...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Gemi tersaneye gönderilemez...
@@ -2893,7 +2893,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Yaş: {L
STR_A00E_MAX_SPEED :{BLACK}Mak. hız: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Bu seneki kâr: {LTBLUE}{CURRENCY} (geçen sene: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Güvenilirlik: {LTBLUE}%{COMMA} {BLACK}Son servisten beri bozulmalar: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Yapım: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Yapım: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Hangara gönderilemiyor...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION} Hangarına gidiyor
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION} Hangarına gidiyor, {VELOCITY}
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index a2c8edf6e..4dc4757e2 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1807,7 +1807,7 @@ STR_TOWN_LABEL_POP :{WHITE}{TOWN} (
STR_TOWN_LABEL :{WHITE}{TOWN}
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
-STR_2002 :{TINYFONT}{BLACK}{STRING}
+STR_2002 :{TINYFONT}{BLACK}{SIGN}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Спочатку зруйнуйте споруду
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Населення: {ORANGE}{COMMA}{BLACK} Будинки: {ORANGE}{COMMA}
@@ -1840,7 +1840,7 @@ STR_2020_LOCAL_AUTHORITY :{BLACK}Місц
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Інформація про місцеву владу
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} місцева влада
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Рейтинги компаній:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Субсидії
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Пропонуються субсидії:-
STR_2027_FROM_TO :{ORANGE}Перевезення {STRING.r} з {STRING} до {STRING}
@@ -1911,7 +1911,7 @@ STR_2802_TREES :{WHITE}Дере
STR_2803_TREE_ALREADY_HERE :{WHITE}...Тут вже росте дерево
STR_2804_SITE_UNSUITABLE :{WHITE}...невідповідне місце
STR_2805_CAN_T_PLANT_TREE_HERE :{WHITE}Неможливо посадити тут дерево
-STR_2806 :{WHITE}{STRING}
+STR_2806 :{WHITE}{SIGN}
STR_2808_TOO_MANY_SIGNS :{WHITE}...дуже багато позначень
STR_2809_CAN_T_PLACE_SIGN_HERE :{WHITE}Неможливо позначити місце
STR_280A_SIGN :Позначення
@@ -2324,7 +2324,7 @@ STR_683B_HOSTILE :Вороже
##id 0x7000
STR_7000 :
-STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
STR_7002_PLAYER :(Гравець {COMMA})
STR_7004_NEW_FACE :{BLACK}Нове лице
STR_7005_COLOR_SCHEME :{BLACK}Колір
@@ -2336,7 +2336,7 @@ STR_700A_COMPANY_NAME :Назва ко
STR_700B_PRESIDENT_S_NAME :Ім'я керівника
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Неможливо змінити назву компанії...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Неможливо змінити ім'я керівника...
-STR_700E_FINANCES :{WHITE}{COMPANY} - фінанси {BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} - фінанси {BLACK}{COMPANYNUM}
STR_700F_EXPENDITURE_INCOME :{WHITE}Витрати/доходи
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Будівництво
@@ -2355,7 +2355,7 @@ STR_701D_OTHER :{GOLD}Інше
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Всього:
-STR_7021 :{COMPANY}{PLAYERNAME}
+STR_7021 :{COMPANY}{COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Графік доходів
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2404,8 +2404,8 @@ STR_7050_UNITS_OF_CARGO_DELIVERED :{WHITE}Дост
STR_7051_COMPANY_PERFORMANCE_RATINGS :{WHITE}Рейтинг продуктивності компанії(найбільший рейтинг=1000)
STR_7052_COMPANY_VALUES :{WHITE}Вартість компанії
STR_7053_COMPANY_LEAGUE_TABLE :{WHITE}Таблиця компаній
-STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
-STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
+STR_7054 :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
+STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Компанія у скруті!
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} буде продано або оголошено банкрутом, якщо найблищим часом не зросте її продуктивність!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Керівник)
@@ -2831,8 +2831,8 @@ STR_882A_END_OF_ORDERS :{SETX 10}- - К
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Техогляд
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Неможливо збудувати поїзд...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Ціна: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{ENGINE}{BLACK} Ціна: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Завантажуюся/Розвантажуюся
STR_TRAIN_MUST_BE_STOPPED :{WHITE}Поїзд повинен стояти в депо
@@ -2917,8 +2917,8 @@ STR_TRAIN_NO_POWER :{RED}Нееле
STR_TRAIN_START_NO_CATENARY :Нема електрики, поїзд стоїть
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Став доступним новий {STRING}!
-STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Став доступним новий {STRING}! - {STRING}
+STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Став доступним новий {STRING}! - {ENGINE}
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Не можна встановити розклад для транспорту...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Транспорт може чекати тільки на станціях.
@@ -2942,7 +2942,7 @@ STR_900D_AGE_RUNNING_COST_YR :{BLACK}Вік:
STR_900E_MAX_SPEED :{BLACK}Макс. швидкість: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибуток цього року: {LTBLUE}{CURRENCY} (минулого року: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Надійність: {LTBLUE}{COMMA}% {BLACK}Поломок після останнього техогляду: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
+STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Місткість: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...авто повинно стояти в депо
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Неможливо продати авто...
@@ -3018,7 +3018,7 @@ STR_9812_AGE_RUNNING_COST_YR :{BLACK}Вік:
STR_9813_MAX_SPEED :{BLACK}Макс. швидкість: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибуток цього року: {LTBLUE}{CURRENCY} (минулого року: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Надійність: {LTBLUE}{COMMA}% {BLACK}Поломок після останнього техогляду: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
+STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Місткість: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Неможливо зупинити корабель...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Неможливо направити корабель в депо...
@@ -3086,7 +3086,7 @@ STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Вік:
STR_A00E_MAX_SPEED :{BLACK}Макс. швидкість: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Прибуток цього року: {LTBLUE}{CURRENCY} (минулого року: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Надійність: {LTBLUE}{COMMA}% {BLACK}Поломок після останнього техогляду: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
+STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Неможливо направити літак до ангару...
STR_HEADING_FOR_HANGAR :{ORANGE}Летить до {STATION} ангару
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Летить до {STATION} ангару, {VELOCITY}