Merge branch 'master' into jgrpp

# Conflicts:
#	src/saveload/saveload.h
pull/661/head
Jonathan G Rennison 3 months ago
commit 567e235883

@ -401,6 +401,19 @@ constexpr inline T DivTowardsPositiveInf(T a, T b)
return (a / b) + (a % b > 0 ? 1 : 0);
}
/**
* Computes ten to the given power.
* @param power The power of ten to get.
* @return The power of ten.
*/
constexpr uint64_t PowerOfTen(int power)
{
assert(power >= 0 && power <= 20 /* digits in uint64_t */);
uint64_t result = 1;
for (int i = 0; i < power; i++) result *= 10;
return result;
}
uint32_t IntSqrt(uint32_t num);
uint32_t IntSqrt64(uint64_t num);
uint32_t IntCbrt(uint64_t num);

@ -5141,7 +5141,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -4936,11 +4936,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -4881,7 +4881,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5612,7 +5612,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -521,7 +521,7 @@ STR_TOOLBAR_SOUND_MUSIC :Som/música
# Message menu
STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensagem/notícia
STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de Mensagens
STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de mensagens
STR_NEWS_MENU_DELETE_ALL_MESSAGES :Apagar todas as mensagens
# About menu
@ -853,11 +853,11 @@ STR_NEWS_DISASTER_FLOOD_VEHICLE :{BIG_FONT}{BLAC
STR_NEWS_COMPANY_IN_TROUBLE_TITLE :{BIG_FONT}{BLACK}Empresa de transporte em apuros!
STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} será vendida ou declarada falida a menos que aumente o desempenho em breve!
STR_NEWS_COMPANY_MERGER_TITLE :{BIG_FONT}{BLACK}Fusão de empresas de transportes!
STR_NEWS_COMPANY_MERGER_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} foi vendida a {STRING} por {CURRENCY_LONG}!
STR_NEWS_COMPANY_MERGER_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} foi vendida para {STRING} por {CURRENCY_LONG}!
STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLACK}Falida!
STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} foi fechada pelos credores e todos os seus bens foram vendidos!
STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Nova empresa de transportes lançada!
STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} inicia construção próximo a {TOWN}!
STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Nova empresa de transportes foi lançada!
STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} inicia construção próxima de {TOWN}!
STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} foi comprada por {STRING} por um valor não revelado!
STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Gerente)
@ -876,9 +876,9 @@ STR_NEWS_BEGIN_OF_RECESSION :{BIG_FONT}{BLAC
STR_NEWS_END_OF_RECESSION :{BIG_FONT}{BLACK}Fim da recessão!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL :{BIG_FONT}{BLACK}{INDUSTRY} aumenta a produção!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL :{BIG_FONT}{BLACK}Nova camada de carvão encontrada em {INDUSTRY}!{}A produção deverá duplicar!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL :{BIG_FONT}{BLACK}Novas reservas de petróleo encontradas em {INDUSTRY}!{}A produção deverá duplicar!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Métodos melhorados de agricultura em {INDUSTRY} deverão duplicar a produção!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL :{BIG_FONT}{BLACK}Nova camada de carvão encontrada na {INDUSTRY}!{}A produção deverá duplicar!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL :{BIG_FONT}{BLACK}Novas reservas de petróleo encontradas {G nos na} {INDUSTRY}!{}A produção deverá duplicar!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Métodos melhorados de agricultura na {INDUSTRY} deverão duplicar a produção!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}A produção de {STRING} em {INDUSTRY} aumentou em {COMMA}%!
STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL :{BIG_FONT}{BLACK}A produção de {INDUSTRY} caiu em 50%
STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM :{BIG_FONT}{BLACK}Infestação de insetos causa destruição em {INDUSTRY}!{}A produção caiu em 50%
@ -919,8 +919,8 @@ STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abrir a
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} não aceita mais: {CARGO_LIST}
STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} agora aceita: {CARGO_LIST}
STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} não será subsidiado
STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsídio retirado:{}{}Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado
STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} agora não será subsidiado
STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsídio retirado:{}{}Transportar {STRING} de {STRING} para {STRING} não é mais subsidiado
STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Subsídio de serviço oferecido:{}{}Primeiro {STRING} de {STRING} para {STRING} irá receber {UNITS_YEARS_OR_MINUTES} de subsídio da autoridade local!
###length 4
STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} de {STRING} para {STRING} será pago a 150% pelos próximos {UNITS_YEARS_OR_MINUTES}!
@ -1917,8 +1917,8 @@ STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Original
STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Suave
STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Congelada
STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Porcentagem do lucro paga em cada etapa em sistemas de baldeação: {STRING}
STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Porcentagem da receita dada às etapas intermediárias em sistemas de baldeação, dando mais controle sobre a receita
STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Porcentagem do lucro da etapa a pagar em sistemas de transbordo: {STRING}
STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Porcentagem da receita dada a trajetos intermediários em sistemas de transbordo, dando mais controle sobre a receita
STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :Ao arrastar, colocar sinais a cada: {STRING}
STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Define a distância na qual os sinais serão construídos em uma via até o próximo obstáculo (sinal, junção), ao clicar e arrastar sinais
@ -2949,7 +2949,7 @@ STR_AIRPORT_HELISTATION :Heliponto
STR_AIRPORT_CLASS_SMALL :Aeroportos pequenos
STR_AIRPORT_CLASS_LARGE :Aeroportos grandes
STR_AIRPORT_CLASS_HUB :Aeroportos modulares
STR_AIRPORT_CLASS_HUB :Aeroportos de conexão
STR_AIRPORT_CLASS_HELIPORTS :Heliportos
STR_STATION_BUILD_NOISE :{BLACK}Ruído gerado: {GOLD}{COMMA}
@ -5001,7 +5001,7 @@ STR_ERROR_CAN_T_EXPAND_TOWN :{WHITE}Não é
STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB :{WHITE}... muito perto da borda do mapa
STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}... muito perto de outra localidade
STR_ERROR_TOO_MANY_TOWNS :{WHITE}... existem muitas localidades
STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... não mais espaço no mapa
STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... não existe mais espaço no mapa
STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Trabalhos na estrada sendo realizados
STR_ERROR_TOWN_CAN_T_DELETE :{WHITE}Não é possível remover esta localidade...{}Uma estação ou depósito refere-se à localidade ou não é possível remover um quadrado pertencente à mesma
STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... não há local adequado para uma estátua no centro desta localidade
@ -5029,7 +5029,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... só
STR_ERROR_PROSPECTING_WAS_UNLUCKY :{WHITE}O financiamento falhou em prospectar devido ao azar; tente novamente
STR_ERROR_NO_SUITABLE_PLACES_FOR_PROSPECTING :{WHITE}Não havia locais adequados para prospectar por esta indústria
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}Não havia locais adequados para indústrias de '{STRING}'
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Mude os parâmetros de geração do mapa para obter um mapa melhor
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Alterar os parâmetros de geração do mapa para obter um mapa melhor
# Station construction related errors
STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Não é possível construir estação ferroviária neste local...
@ -5128,7 +5128,7 @@ STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}O novo v
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Combinação de linhas impossível
STR_ERROR_MUST_REMOVE_SIGNALS_FIRST :{WHITE}Precisa remover os sinais primeiro
STR_ERROR_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Tipo de ferrovia inadequado
STR_ERROR_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Ferrovia não adequada
STR_ERROR_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Precisa remover a ferrovia primeiro
STR_ERROR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Estrada de sentido único ou bloqueada
STR_ERROR_CROSSING_DISALLOWED_RAIL :{WHITE}Cruzamentos de nível não são permitidos neste tipo de linha
@ -5154,8 +5154,8 @@ STR_ERROR_THERE_IS_NO_ROAD :{WHITE}... não
STR_ERROR_THERE_IS_NO_TRAMWAY :{WHITE}... não há linha de bonde
STR_ERROR_CAN_T_CONVERT_ROAD :{WHITE}Não é possível converter o tipo de estrada deste local...
STR_ERROR_CAN_T_CONVERT_TRAMWAY :{WHITE}Não é possível converter o tipo de linha de bonde deste local...
STR_ERROR_NO_SUITABLE_ROAD :{WHITE}Sem estrada adequada
STR_ERROR_NO_SUITABLE_TRAMWAY :{WHITE}Nenhuma linha de bonde adequada
STR_ERROR_NO_SUITABLE_ROAD :{WHITE}Estrada não adequada
STR_ERROR_NO_SUITABLE_TRAMWAY :{WHITE}Linha de bonde não adequada
# Waterway construction errors
STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Não é possível construir canais neste local...
@ -5163,7 +5163,7 @@ STR_ERROR_CAN_T_BUILD_LOCKS :{WHITE}Não é
STR_ERROR_CAN_T_PLACE_RIVERS :{WHITE}Não é possível colocar rios neste local...
STR_ERROR_MUST_BE_BUILT_ON_WATER :{WHITE}... deve ser construído na água
STR_ERROR_CAN_T_BUILD_ON_WATER :{WHITE}... não é possível construir na água
STR_ERROR_CAN_T_BUILD_ON_SEA :{WHITE}... não é possível construir no mar aberto
STR_ERROR_CAN_T_BUILD_ON_SEA :{WHITE}... não é possível construir em mar aberto
STR_ERROR_CAN_T_BUILD_ON_CANAL :{WHITE}... não é possível construir em um canal
STR_ERROR_CAN_T_BUILD_ON_RIVER :{WHITE}... não é possível construir em um rio
STR_ERROR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}Precisa demolir o canal primeiro
@ -5278,8 +5278,8 @@ STR_ERROR_VEHICLE_IS_DESTROYED :{WHITE}... o ve
STR_ERROR_CAN_T_CLONE_VEHICLE_LIST :{WHITE}... nem todos os veículos são idênticos
STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL :{WHITE}Nenhum veículo estará disponível
STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION :{WHITE}Mudar a sua configuração de NewGRF
STR_ERROR_NO_VEHICLES_AVAILABLE_YET :{WHITE}Não veículos disponíveis ainda
STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION :{WHITE}Mudar a configuração de NewGRF
STR_ERROR_NO_VEHICLES_AVAILABLE_YET :{WHITE}Não existem veículos disponíveis ainda
STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION :{WHITE}Começar um novo jogo depois de {DATE_SHORT} ou utilizar um NewGRF que forneça os veículos iniciais
# Specific vehicle errors
@ -5313,18 +5313,18 @@ STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION :{WHITE}... muit
STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE :{WHITE}... aeronave não tem alcance suficiente
# Extra messages which go on the third line of errors, explaining why orders failed
STR_ERROR_NO_RAIL_STATION :{WHITE}Não estação ferroviária
STR_ERROR_NO_BUS_STATION :{WHITE}Não estação de ônibus
STR_ERROR_NO_TRUCK_STATION :{WHITE}Não estação de caminhões
STR_ERROR_NO_DOCK :{WHITE}Não doca
STR_ERROR_NO_AIRPORT :{WHITE}Não aeroporto/heliporto
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}Não há paradas com um tipo de estrada compatível
STR_ERROR_NO_STOP_COMPATIBLE_TRAM_TYPE :{WHITE}Não há paradas com um tipo de bonde compatível
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Não paradas adequadas para veículos rodoviários articulados.{}Os veículos rodoviários articulados precisam parar em estações de passagem ("drive-through") e não em estações padrão
STR_ERROR_NO_RAIL_STATION :{WHITE}Não existe uma estação ferroviária
STR_ERROR_NO_BUS_STATION :{WHITE}Não existe uma estação de ônibus
STR_ERROR_NO_TRUCK_STATION :{WHITE}Não existe uma estação de caminhões
STR_ERROR_NO_DOCK :{WHITE}Não existe uma doca
STR_ERROR_NO_AIRPORT :{WHITE}Não existe um aeroporto/heliporto
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}Não existem paradas com tipo de estrada compatível
STR_ERROR_NO_STOP_COMPATIBLE_TRAM_TYPE :{WHITE}Não existem paradas com tipo de bonde compatível
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Não existem paradas adequadas para veículos rodoviários articulados.{}Os veículos rodoviários articulados precisam parar em estações de passagem ("drive-through") e não em estações padrão
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Este avião não pode pousar neste heliporto
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Este helicóptero não pode pousar neste aeroporto
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Não ponto de controle ferroviário
STR_ERROR_NO_BUOY :{WHITE}Não boia
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Não existe um ponto de controle ferroviário
STR_ERROR_NO_BUOY :{WHITE}Não existe uma boia
# Timetable related errors
STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Não é possível programar veículo...
@ -5337,7 +5337,7 @@ STR_ERROR_TIMETABLE_NOT_STARTED :{WHITE}... o ho
STR_ERROR_TOO_MANY_SIGNS :{WHITE}... existem muitas placas
STR_ERROR_CAN_T_PLACE_SIGN_HERE :{WHITE}Não é possível colocar placa neste local...
STR_ERROR_CAN_T_CHANGE_SIGN_NAME :{WHITE}Não é possível alterar o nome da placa...
STR_ERROR_CAN_T_DELETE_SIGN :{WHITE}Não é possível remover placa
STR_ERROR_CAN_T_DELETE_SIGN :{WHITE}Não é possível remover a placa...
# Translatable comment for OpenTTD's desktop shortcut
###external 1
@ -5429,7 +5429,7 @@ STR_INDUSTRY_NAME_TOY_FACTORY :Fábrica de Bri
STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS :Fontes de Plástico
STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY :Fábrica de Refrigerantes
STR_INDUSTRY_NAME_BUBBLE_GENERATOR :Gerador de Bolhas
STR_INDUSTRY_NAME_TOFFEE_QUARRY :Extração de Caramelo
STR_INDUSTRY_NAME_TOFFEE_QUARRY :Pedreira de Caramelo
STR_INDUSTRY_NAME_SUGAR_MINE :Mina de Açúcar
############ WARNING, using range 0x6000 for strings that are stored in the savegame
@ -5439,7 +5439,7 @@ STR_INDUSTRY_NAME_SUGAR_MINE :Mina de Açúca
STR_SV_EMPTY :
STR_SV_UNNAMED :Sem nome
STR_SV_TRAIN_NAME :Trem #{COMMA}
STR_SV_ROAD_VEHICLE_NAME :Veículo Rodoviário #{COMMA}
STR_SV_ROAD_VEHICLE_NAME :Veículo #{COMMA}
STR_SV_SHIP_NAME :Embarcação #{COMMA}
STR_SV_AIRCRAFT_NAME :Aeronave #{COMMA}
@ -5449,12 +5449,12 @@ STR_SV_STNAME_NORTH :Norte de {STRIN
STR_SV_STNAME_SOUTH :Sul de {STRING}
STR_SV_STNAME_EAST :Leste de {STRING}
STR_SV_STNAME_WEST :Oeste de {STRING}
STR_SV_STNAME_CENTRAL :Central de {STRING}
STR_SV_STNAME_TRANSFER :Baldeação de {STRING}
STR_SV_STNAME_CENTRAL :Centro de {STRING}
STR_SV_STNAME_TRANSFER :Transbordo de {STRING}
STR_SV_STNAME_HALT :Parada de {STRING}
STR_SV_STNAME_VALLEY :Vale de {STRING}
STR_SV_STNAME_HEIGHTS :Montes de {STRING}
STR_SV_STNAME_WOODS :Floresta de {STRING}
STR_SV_STNAME_WOODS :Bosques de {STRING}
STR_SV_STNAME_LAKESIDE :Lago de {STRING}
STR_SV_STNAME_EXCHANGE :Intercâmbio de {STRING}
STR_SV_STNAME_AIRPORT :Aeroporto de {STRING}
@ -5467,8 +5467,8 @@ STR_SV_STNAME_WAYPOINT :{STRING}
STR_SV_STNAME_ANNEXE :Anexo de {STRING}
STR_SV_STNAME_SIDINGS :Desvios de {STRING}
STR_SV_STNAME_BRANCH :Ramal de {STRING}
STR_SV_STNAME_UPPER :{STRING} Superior
STR_SV_STNAME_LOWER :{STRING} Inferior
STR_SV_STNAME_UPPER :{STRING} de Cima
STR_SV_STNAME_LOWER :{STRING} de Baixo
STR_SV_STNAME_HELIPORT :Heliporto de {STRING}
STR_SV_STNAME_FOREST :Floresta de {STRING}
STR_SV_STNAME_FALLBACK :Estação de {STRING} #{NUM}
@ -5530,7 +5530,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER :Vagão de Xarop
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN :Vagão de Doces
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN :Vagão de Brinquedos
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK :Vagão de Pilhas
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK :Tanque de Refrigerante
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK :Vagão de Refrigerantes
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK :Vagão de Plástico
STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC :'X2001' (Elétrico)
STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC :'Millennium Z1' (Elétrico)
@ -5749,7 +5749,7 @@ STR_FORMAT_DATE_LONG :{STRING} {STRIN
STR_FORMAT_DATE_ISO :{2:NUM}-{1:ZEROFILL_NUM}-{0:ZEROFILL_NUM}
STR_FORMAT_COMPANY_NUM :(Empresa {COMMA})
STR_FORMAT_GROUP_NAME :Agrupar {COMMA}
STR_FORMAT_GROUP_NAME :Grupo {COMMA}
STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA}
STR_FORMAT_INDUSTRY_NAME :{1:STRING} de {0:TOWN}
@ -5764,8 +5764,8 @@ STR_FORMAT_WAYPOINT_NAME_SERIAL :Ponto de contro
###length 6
STR_FORMAT_DEPOT_NAME_TRAIN :Depósito Ferroviário de {TOWN}
STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL :Depósito Ferroviário de {TOWN} #{COMMA}
STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE :Depósito de Veículos Rodoviários de {TOWN}
STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL :Depósito de Veículos Rodoviários de {TOWN} #{COMMA}
STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE :Depósito Rodoviário de {TOWN}
STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL :Depósito Rodoviário de {TOWN} #{COMMA}
STR_FORMAT_DEPOT_NAME_SHIP :Depósito de Embarcações de {TOWN}
STR_FORMAT_DEPOT_NAME_SHIP_SERIAL :Depósito de Embarcações de {TOWN} #{COMMA}
###next-name-looks-similar
@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5181,7 +5181,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}M
STR_CURRENCY_SHORT_GIGA :{NBSP}G
STR_CURRENCY_SHORT_TERA :{NBSP}T
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -1811,7 +1811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5367,7 +5367,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -6030,11 +6030,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}tis.
STR_CURRENCY_SHORT_MEGA :{NBSP}mil.
STR_CURRENCY_SHORT_GIGA :{NBSP}mld.
STR_CURRENCY_SHORT_TERA :{NBSP}bil.
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5798,11 +5798,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}mj
STR_CURRENCY_SHORT_GIGA :{NBSP}md
STR_CURRENCY_SHORT_TERA :{NBSP}bn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}K
STR_CURRENCY_SHORT_MEGA :{NBSP}M
STR_CURRENCY_SHORT_GIGA :{NBSP}B
STR_CURRENCY_SHORT_TERA :{NBSP}T
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5510,7 +5510,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -990,6 +990,11 @@ STR_GAME_OPTIONS_TAB_SOCIAL_TT :{BLACK}Vali sot
STR_GAME_OPTIONS_VOLUME :Helitase
STR_GAME_OPTIONS_VOLUME_0 :0%
STR_GAME_OPTIONS_VOLUME_25 :25%
STR_GAME_OPTIONS_VOLUME_50 :50%
STR_GAME_OPTIONS_VOLUME_75 :75%
STR_GAME_OPTIONS_VOLUME_100 :100%
STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valuuta
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Valuuta valimine
@ -1121,6 +1126,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Rohkem t
STR_BASESET_STATUS :{STRING} {RED}({NUM} puuduv/vigane fail{P "" s})
STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Ei õnnestunud tuvastada toetatud resulutsioone
STR_ERROR_FULLSCREEN_FAILED :{WHITE}Täisekraanrežiim ebaõnnestus
@ -2217,7 +2223,7 @@ STR_HELP_WINDOW_BUGTRACKER :{BLACK}Teata ve
STR_HELP_WINDOW_COMMUNITY :{BLACK}Kogukond
# Cheat window
STR_CHEATS :{WHITE}Petmine
STR_CHEATS :{WHITE}Liivakasti valikud
STR_CHEAT_MONEY :{LTBLUE}Suurenda raha hulka {CURRENCY_LONG} võrra
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Mängimine ettevõttena: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Võlubuldooser (eemaldab tööstused, paiksed objektid): {ORANGE}{STRING}
@ -2725,6 +2731,8 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Lülita
STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Lülita sisse jaama mõjupiirkonna näitamine
STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Võtab vastu: {GOLD}{CARGO_LIST}
STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tarnib: {GOLD}{CARGO_LIST}
STR_STATION_BUILD_INFRASTRUCTURE_COST_YEAR :{BLACK}Hoolduskulu: {GOLD}{CURRENCY_SHORT}/aasta
STR_STATION_BUILD_INFRASTRUCTURE_COST_PERIOD :{BLACK}Hoolduskulu: {GOLD}{CURRENCY_SHORT}/periood
# Join station window
STR_JOIN_STATION_CAPTION :{WHITE}Liida jaamale
@ -3665,6 +3673,8 @@ STR_SUBSIDIES_NONE :{ORANGE}Mitte
STR_SUBSIDIES_SUBSIDISED_TITLE :{BLACK}Juba toetatavad veoteenused:
STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING} kohast {STRING} kohta {STRING}{YELLOW} ({COMPANY}{YELLOW}, {STRING})
STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Vajuta pakkumisele, et keskendada vaade tööstusele/asustusele. Ctrl+klõps avab uue vaate ettevõtte/asustuse asukohas
STR_SUBSIDIES_SUBSIDISED_EXPIRY_DATE :kuni {DATE_SHORT}
STR_SUBSIDIES_SUBSIDISED_EXPIRY_TIME :{UNITS_MONTHS_OR_MINUTES} jäänud
# Story book window
STR_STORY_BOOK_CAPTION :{WHITE}«{COMPANY}» juturaamat
@ -3974,7 +3984,9 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Eemalda kõik s
STR_GROUP_RENAME_CAPTION :{BLACK}Ümbernimeta jagu
STR_GROUP_PROFIT_THIS_YEAR :Selle aasta kasum:
STR_GROUP_PROFIT_THIS_PERIOD :Kasum sellel perioodil:
STR_GROUP_PROFIT_LAST_YEAR :Eelmise aasta kasum:
STR_GROUP_PROFIT_LAST_PERIOD :Kasum eelmisel perioodil:
STR_GROUP_OCCUPANCY :Koormatus:
STR_GROUP_OCCUPANCY_VALUE :{NUM}%
@ -4653,6 +4665,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Eeldatav
STR_TIMETABLE_SCHEDULED :{BLACK}Plaanis
STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Vaheta eeldatava ja graafiku vahel
STR_TIMETABLE_ARRIVAL_DATE :A: {COLOUR}{DATE_TINY}
STR_TIMETABLE_DEPARTURE_DATE :D: {COLOUR}{DATE_TINY}
STR_TIMETABLE_ARRIVAL_SECONDS_IN_FUTURE :A: {COLOUR}{COMMA} sek
STR_TIMETABLE_DEPARTURE_SECONDS_IN_FUTURE :D: {COLOUR}{COMMA} sek
@ -5695,11 +5709,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -4530,7 +4530,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}000
STR_CURRENCY_SHORT_MEGA :{NBSP}milj.
STR_CURRENCY_SHORT_GIGA :{NBSP}mrd.
STR_CURRENCY_SHORT_TERA :{NBSP} t
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}Mio
STR_CURRENCY_SHORT_GIGA :{NBSP}Mrd
STR_CURRENCY_SHORT_TERA :{NBSP}kMrd
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -4719,7 +4719,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5434,7 +5434,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}M
STR_CURRENCY_SHORT_GIGA :{NBSP}MM
STR_CURRENCY_SHORT_TERA :{NBSP}bn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}t
STR_CURRENCY_SHORT_MEGA :{NBSP}Mio
STR_CURRENCY_SHORT_GIGA :{NBSP}Mrd
STR_CURRENCY_SHORT_TERA :{NBSP}Bio
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5570,7 +5570,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5207,7 +5207,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -1628,7 +1628,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5832,11 +5832,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}e
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}mrd
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -4769,7 +4769,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -1703,7 +1703,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5665,7 +5665,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5383,7 +5383,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5851,11 +5851,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5521,7 +5521,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :k
STR_CURRENCY_SHORT_MEGA :m
STR_CURRENCY_SHORT_GIGA :bn
STR_CURRENCY_SHORT_TERA :tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5384,7 +5384,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5821,11 +5821,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}tk.
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}mljrd.
STR_CURRENCY_SHORT_TERA :{NBSP}tonna
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5939,7 +5939,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}d
STR_CURRENCY_SHORT_MEGA :{NBSP}Mio
STR_CURRENCY_SHORT_GIGA :{NBSP}Mrd
STR_CURRENCY_SHORT_TERA :{NBSP}Bio
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -2221,7 +2221,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -4676,7 +4676,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -1747,7 +1747,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -2095,7 +2095,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5414,7 +5414,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -4911,7 +4911,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -4232,7 +4232,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -874,25 +874,25 @@ STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Łańcuchy prod
STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Ufunduj nowe przedsiębiorstwo
# URailway construction menu
STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Konstrukcja linii kolejowej
STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Konstrukcja linii zelektryfikowanej
STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Konstrukcja linii jednoszynowej
STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Konstrukcja linii Maglev
STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Budowa linii kolejowej
STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Budowa linii zelektryfikowanej
STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Budowa linii jednoszynowej
STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Budowa linii Maglev
# Road construction menu
STR_ROAD_MENU_ROAD_CONSTRUCTION :Budowa drogi
STR_ROAD_MENU_TRAM_CONSTRUCTION :Budowa linii tramwajowej
# Waterways construction menu
STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Konstrukcja kanału wodnego
STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Budowa dróg wodnych
# Aairport construction menu
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Konstrukcje lotnicze
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Budowa lotnisk
# Landscaping menu
STR_LANDSCAPING_MENU_LANDSCAPING :Kształtowanie krajobrazu
STR_LANDSCAPING_MENU_PLANT_TREES :Posadź drzewa
STR_LANDSCAPING_MENU_PLACE_SIGN :Umieść napis
STR_LANDSCAPING_MENU_PLANT_TREES :Sadzenie drzew
STR_LANDSCAPING_MENU_PLACE_SIGN :Umieszczanie napisów
# Music menu
STR_TOOLBAR_SOUND_MUSIC :Dźwięk/muzyka
@ -1240,7 +1240,7 @@ STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLAC
STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} zostało przejęte przez {STRING} za nieujawnioną kwotę!
STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Prezes)
STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} sponsoruje konstrukcję nowego miasta {TOWN}!
STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} sponsoruje budowę nowego miasta {TOWN}!
STR_NEWS_NEW_TOWN_UNSPONSORED :{BLACK}{BIG_FONT}Zostało wybudowane nowe miasto o nazwie {TOWN}!
STR_NEWS_INDUSTRY_CONSTRUCTION :{BIG_FONT}{BLACK}Rozpoczęto budowę nowe{G go j go} {STRING.d} blisko {TOWN}!
@ -1666,7 +1666,7 @@ STR_CONFIG_SETTING_RUNNING_COSTS :Koszty amortyza
STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT :Ustaw poziom kosztów utrzymania i amortyzacji pojazdów i infrastruktury
STR_CONFIG_SETTING_CONSTRUCTION_SPEED :Szybkość budowy: {STRING}
STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT :Ogranicz ilość czynności konstrukcyjnych wykonywanych przez SI
STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT :Ogranicz ilość czynności budowlanych wykonywanych przez SI
STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS :Awarie pojazdów: {STRING}
STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :Kontroluj jak często nieodpowiednio serwisowane pojazdy mogą się psuć
@ -1683,8 +1683,8 @@ STR_CONFIG_SETTING_SUBSIDY_DURATION_VALUE :{UNITS_YEARS_OR
###setting-zero-is-special
STR_CONFIG_SETTING_SUBSIDY_DURATION_DISABLED :Brak dotacji
STR_CONFIG_SETTING_CONSTRUCTION_COSTS :Koszty konstrukcji: {STRING}
STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT :Ustaw poziom kosztów konstrukcji i kupna
STR_CONFIG_SETTING_CONSTRUCTION_COSTS :Koszty budowy: {STRING}
STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT :Ustaw poziom kosztów budowy i kupna
STR_CONFIG_SETTING_RECESSIONS :Kryzys: {STRING}
STR_CONFIG_SETTING_RECESSIONS_HELPTEXT :Jeśli włączone, kryzys może występować okresowo. Podczas kryzysu produkcja jest znacznie niższa (powraca do poprzedniego poziomu, kiedy kryzys się kończy)
@ -1756,7 +1756,7 @@ STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :Maksymalna dłu
STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT :Maksymalna długość budowanych tuneli
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :Budowa przedsiębiorstw wydobywczych: {STRING}
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT :Metoda finansowania podstawowych przedsiębiorstw. „Niedostępna” oznacza brak możliwości finansowania czegokolwiek, „poszukiwania” oznacza, że finansowanie jest możliwe, ale konstrukcja pojawi się w losowym miejscu na mapie (oraz losowo budowa może zakończyć się porażką), „jak inne przedsiębiorstwa” oznacza, że przemysł wydobywczy może być budowany tak jak fabryki przetwórcze, w dowolnym miejscu
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT :Metoda finansowania przedsiębiorstw wydobywczych. „Niedostępna” oznacza brak możliwości finansowania czegokolwiek, „poszukiwania” oznacza, że finansowanie jest możliwe, ale budowa pojawi się w losowym miejscu na mapie (oraz losowo budowa może zakończyć się porażką), „jak inne przedsiębiorstwa” oznacza, że przedsiębiorstwa wydobywcze mogą być budowane przez firmy tak jak przedsiębiorstwa przetwórcze, w dowolnym miejscu
###length 3
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Niedostępna
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Jak inne przedsiębiorstwa
@ -1998,8 +1998,8 @@ STR_CONFIG_SETTING_STATION_SPREAD_HELPTEXT :Maksymalny obsz
STR_CONFIG_SETTING_SERVICEATHELIPAD :Automatycznie serwisuj helikoptery na lądowiskach: {STRING}
STR_CONFIG_SETTING_SERVICEATHELIPAD_HELPTEXT :Serwisuj helikoptery po każdym lądowaniu, nawet jeśli na lądowisku nie ma hangaru
STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR :Przyłącz narzędzia krajobrazu do okien środków transportu: {STRING}
STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR_HELPTEXT :Otwierając pasek konstrukcji typu transportu, otwieraj też pasek formowania terenu
STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR :Przyłącz narzędzia kształtowania krajobrazu do narzędzi budowy środków transportu: {STRING}
STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR_HELPTEXT :Otwierając pasek budowy typu transportu, otwieraj też pasek kształtowania terenu
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR :Kolor lądu używany w minimapie: {STRING}
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT :Kolor terenu na minimapie
@ -2093,7 +2093,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :Zezwól w czasi
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT :Wybierz, jakich akcji można dokonywać, gdy gra jest wstrzymana (włączona jest pauza)
###length 4
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :Brak działań
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :Wszystkie niezwiązane z konstrukcją
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :Wszystkie niezwiązane z budowaniem
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING :Wszystkie oprócz modyfikowania terenu
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS :Wszystkie działania
@ -2489,7 +2489,7 @@ STR_CONFIG_SETTING_SOUND :Dźwięk
STR_CONFIG_SETTING_INTERFACE :Interfejs
STR_CONFIG_SETTING_INTERFACE_GENERAL :Ogólne
STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Widok
STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstrukcje
STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Budowa
STR_CONFIG_SETTING_ADVISORS :Wiadomości i porady
STR_CONFIG_SETTING_COMPANY :Firma
STR_CONFIG_SETTING_ACCOUNTING :Finanse
@ -3158,10 +3158,10 @@ STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Zbuduj
STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Nieaktywne, ponieważ nie są dostępne pojazdy korzystające z takiej infrastruktury
# Rail construction toolbar
STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Konstrukcja linii kolejowej
STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION :Konstrukcja linii zelektryfikowanej
STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION :Konstrukcja linii jednoszynowej
STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION :Konstrukcja linii Maglev
STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Budowa linii kolejowej
STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION :Budowa linii zelektryfikowanej
STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION :Budowa linii jednoszynowej
STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION :Budowa linii Maglev
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Zbuduj tory kolejowe. Użyj Ctrl, aby usunąć tory. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Zbuduj tory kolejowe za pomocą trybu Autotory. Użyj Ctrl, aby usunąć tory. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
@ -3263,8 +3263,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE :{BLACK}Zbuduj m
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE :{BLACK}Zbuduj most tramwajowy. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL :{BLACK}Zbuduj tunel drogowy. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL :{BLACK}Zbuduj tunel tramwajowy. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD :{BLACK}Przełącz buduj/usuń dla konstrukcji dróg
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Przełącz buduj/usuń dla konstrukcji tramwajowej
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD :{BLACK}Przełącz budowanie/usuwanie dróg
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Przełącz budowanie/usuwanie linii tramwajowej
STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD :{BLACK}Zmień typ drogi. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM :{BLACK}Zmień typ torów tramwajowych. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
@ -3288,7 +3288,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION :{WHITE}Ukierunk
STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP :{BLACK}Wybierz ukierunkowanie tramwajowej stacji załadunkowej
# Waterways toolbar (last two for SE only)
STR_WATERWAYS_TOOLBAR_CAPTION :{WHITE}Konstrukcja kanału wodnego
STR_WATERWAYS_TOOLBAR_CAPTION :{WHITE}Budowa dróg wodnych
STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanał wodny
STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP :{BLACK}Zbuduj kanał wodny. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Zbuduj śluzę wodną. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
@ -3352,8 +3352,8 @@ STR_OBJECT_CLASS_TRNS :Nadajniki
# Tree planting window (last eight for SE only)
STR_PLANT_TREE_CAPTION :{WHITE}Drzewa
STR_PLANT_TREE_TOOLTIP :{BLACK}Wybierz typ drzew do sadzenia. Jeśli na wybranym miejscu są już drzewa, to dodasz więcej drzew różnego typu, bez względu na wybraną opcję.
STR_TREES_RANDOM_TYPE :{BLACK}Drzewa różnych rodzajów
STR_PLANT_TREE_TOOLTIP :{BLACK}Wybierz typ drzew do zasadzenia. Jeśli w wybranym miejscu są już drzewa, to zostanie dodanych więcej drzew różnego typu, bez względu na wybraną opcję
STR_TREES_RANDOM_TYPE :{BLACK}Drzewa różnego rodzaju
STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Posadź drzewa różnego rodzaju. Przeciągnij z użyciem Ctrl, aby zaznaczyć obszar po przekątnej. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Losowe drzewa
STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Pokryj losowo krajobraz drzewami
@ -4218,7 +4218,7 @@ STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Wydatki
###length 13
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Konstrukcje
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Budowa
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nowe pojazdy
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Pociągi
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Pojazdy drogowe
@ -4271,11 +4271,11 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_STATION :{WHITE}{COMMA}
STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT :{WHITE}{COMMA} lotnisk{P o a ""}
STR_COMPANY_VIEW_INFRASTRUCTURE_NONE :{WHITE}Brak
STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Budowa Siedziby
STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Zbuduj Siedzibę
STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Zbuduj siedzibę firmy
STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Zobacz SG
STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Zobacz Siedzibę
STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}Zobacz siedzibę firmy
STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Przenieś SG
STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Przenieś Siedzibę
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Zbuduj siedzibę główną w innym miejscu za cenę 1% wartości firmy. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Szczegóły
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Zobacz szczegółowe wartości infrastruktury
@ -6251,11 +6251,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}M
STR_CURRENCY_SHORT_GIGA :{NBSP}G
STR_CURRENCY_SHORT_TERA :{NBSP}T
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}mii
STR_CURRENCY_SHORT_MEGA :{NBSP}mil.
STR_CURRENCY_SHORT_GIGA :{NBSP}mld.
STR_CURRENCY_SHORT_TERA :{NBSP}bil.
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -6034,11 +6034,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}тыс.
STR_CURRENCY_SHORT_MEGA :{NBSP}млн
STR_CURRENCY_SHORT_GIGA :{NBSP}млрд.
STR_CURRENCY_SHORT_TERA :{NBSP}трлн.
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5718,7 +5718,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5806,11 +5806,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :b
STR_CURRENCY_SHORT_TERA :t
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5609,7 +5609,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5207,7 +5207,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5811,11 +5811,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}M
STR_CURRENCY_SHORT_GIGA :{NBSP}kM
STR_CURRENCY_SHORT_TERA :{NBSP}MM
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5515,7 +5515,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}t
STR_CURRENCY_SHORT_MEGA :{NBSP}mn
STR_CURRENCY_SHORT_GIGA :{NBSP}md
STR_CURRENCY_SHORT_TERA :{NBSP}bn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5338,11 +5338,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5117,7 +5117,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5567,7 +5567,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5821,11 +5821,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}mlyn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5799,11 +5799,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}тис.
STR_CURRENCY_SHORT_MEGA :{NBSP}млн
STR_CURRENCY_SHORT_GIGA :{NBSP}млрд
STR_CURRENCY_SHORT_TERA :{NBSP}трлн
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -3142,7 +3142,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -5810,11 +5810,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_RIGHT_ARROW :{RIGHT_ARROW}
STR_JUST_CHECKMARK :{CHECKMARK}

@ -5408,11 +5408,6 @@ STR_TOWN_NAME :{TOWN}
STR_VEHICLE_NAME :{VEHICLE}
STR_WAYPOINT_NAME :{WAYPOINT}
STR_CURRENCY_SHORT_KILO :{NBSP}k
STR_CURRENCY_SHORT_MEGA :{NBSP}m
STR_CURRENCY_SHORT_GIGA :{NBSP}bn
STR_CURRENCY_SHORT_TERA :{NBSP}tn
STR_JUST_CARGO :{CARGO_LONG}
STR_JUST_CHECKMARK :{CHECKMARK}
STR_JUST_COMMA :{COMMA}

@ -368,9 +368,15 @@ static inline byte SlCalcConvFileLen(VarType conv)
{
static const byte conv_file_size[] = {0, 1, 1, 2, 2, 4, 4, 8, 8, 2};
uint8_t type = GetVarFileType(conv);
assert(type < lengthof(conv_file_size));
return conv_file_size[type];
switch (GetVarFileType(conv)) {
case SLE_FILE_STRING:
return SlReadArrayLength();
default:
uint8_t type = GetVarFileType(conv);
assert_msg(type < lengthof(conv_file_size), "%u, %u", (uint)type, (uint)lengthof(conv_file_size));
return conv_file_size[type];
}
}
/** Return the size in bytes of a reference (pointer) */
@ -1781,7 +1787,7 @@ std::vector<SaveLoad> SlCompatTableHeader(const SaveLoadTable &slt, const SaveLo
/* In old savegames there can be data we no longer care for. We
* skip this by simply reading the amount of bytes indicated and
* send those to /dev/null. */
saveloads.push_back({"", SL_NULL, SLE_FILE_U8 | SLE_VAR_NULL, slc.length, slc.version_from, slc.version_to, 0, nullptr, 0, nullptr});
saveloads.push_back({"", SL_NULL, GetVarFileType(slc.null_type) | SLE_VAR_NULL, slc.null_length, slc.version_from, slc.version_to, 0, nullptr, 0, nullptr});
} else {
auto sld_it = key_lookup.find(slc.name);
/* If this branch triggers, it means that an entry in the

@ -312,7 +312,8 @@ struct SaveLoad {
*/
struct SaveLoadCompat {
std::string name; ///< Name of the field.
uint16_t length; ///< Length of the NULL field.
VarTypes null_type; ///< The type associated with the NULL field; defaults to SLE_FILE_U8 to just count bytes.
uint16_t null_length; ///< Length of the NULL field.
SaveLoadVersion version_from; ///< Save/load the variable starting from this savegame version.
SaveLoadVersion version_to; ///< Save/load the variable before this savegame version.
};
@ -833,18 +834,26 @@ inline constexpr bool SlCheckVarSize(SaveLoadType cmd, VarType type, size_t leng
* Field name where the real SaveLoad can be located.
* @param name The name of the field.
*/
#define SLC_VAR(name) {name, 0, SL_MIN_VERSION, SL_MAX_VERSION}
#define SLC_VAR(name) {name, SLE_FILE_U8, 0, SL_MIN_VERSION, SL_MAX_VERSION}
/**
* Empty space in every savegame version.
* @param length Length of the empty space.
* @param length Length of the empty space in bytes.
* @param from First savegame version that has the empty space.
* @param to Last savegame version that has the empty space.
*/
#define SLC_NULL(length, from, to) {{}, length, from, to}
#define SLC_NULL(length, from, to) {{}, SLE_FILE_U8, length, from, to}
/**
* Empty space in every savegame version that was filled with a string.
* @param length Number of strings in the empty space.
* @param from First savegame version that has the empty space.
* @param to Last savegame version that has the empty space.
*/
#define SLC_NULL_STR(length, from, to) {{}, SLE_FILE_STRING, length, from, to}
/** End marker of compat variables save or load. */
#define SLC_END() {{}, 0, SL_MIN_VERSION, SL_MIN_VERSION}
#define SLC_END() {{}, 0, 0, SL_MIN_VERSION, SL_MIN_VERSION}
/**
* Checks whether the savegame is below \a major.\a minor.

Loading…
Cancel
Save