From 2cdb0cb084a1c85cedc8ae3d26df83e8328cd2b7 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 9 Jun 2022 21:32:31 +0200 Subject: [PATCH 01/11] Codechange: Factor out OnStartScenario function --- src/openttd.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index e2cedd5775..7a1cd0bc4f 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -837,6 +837,15 @@ void HandleExitGameRequest() } } +/** + * Triggers everything required to set up a saved scenario for a new game. + */ +static void OnStartScenario() +{ + /* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */ + EngineOverrideManager::ResetToCurrentNewGRFConfig(); +} + /** * Triggers everything that should be triggered when starting a game. * @param dedicated_server Whether this is a dedicated server or not. @@ -1049,8 +1058,7 @@ void SwitchToMode(SwitchMode new_mode) ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); } else { if (_file_to_saveload.abstract_ftype == FT_SCENARIO) { - /* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */ - EngineOverrideManager::ResetToCurrentNewGRFConfig(); + OnStartScenario(); } OnStartGame(_network_dedicated); /* Decrease pause counter (was increased from opening load dialog) */ From 470c902bdc799cb2e13d4151213f67b7908df99b Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 9 Jun 2022 21:36:55 +0200 Subject: [PATCH 02/11] Fix #9918: Reset industy last production year on scenario start --- src/openttd.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/openttd.cpp b/src/openttd.cpp index 7a1cd0bc4f..638e851e70 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -844,6 +844,11 @@ static void OnStartScenario() { /* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */ EngineOverrideManager::ResetToCurrentNewGRFConfig(); + + /* Make sure all industries were built "this year", to avoid too early closures. (#9918) */ + for (Industry *i : Industry::Iterate()) { + i->last_prod_year = _cur_year; + } } /** From 814c61a321fc2073452c027b0d1b1372021d4869 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 11 Jun 2022 18:44:50 +0000 Subject: [PATCH 03/11] Update: Translations from eints tamil: 20 changes by Aswn --- src/lang/tamil.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index a6e1db9ab9..107c45efed 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -311,6 +311,8 @@ STR_SORT_BY_RANGE :வரையற STR_SORT_BY_POPULATION :மக்கள் தொகை STR_SORT_BY_RATING :மதிப்பீடு STR_SORT_BY_NUM_VEHICLES :வாகங்களின் எண்ணிக்கை +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :கடந்த ஆண்டின் மொத்த இலாபம் +STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :கடந்த ஆண்டின் சராசரி இலாபம் STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :இந்த ஆண்டின் சராசரி இலாபம் # Group by options for vehicle list @@ -1186,6 +1188,7 @@ STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :அடிக் STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER :மானியம் பெருக்கு: {STRING} STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT :மானியம் வழங்கப்பட்ட பணிகளுக்கு எவ்வுளவு தர வேண்டும் என்பதினை அமை +STR_CONFIG_SETTING_SUBSIDY_DURATION :மானியம் நீடிக்கும் காலம்: {STRING} STR_CONFIG_SETTING_SUBSIDY_DURATION_HELPTEXT :மானியம் வழங்கப்படும் ஆண்டுகளின் எண்ணிக்கையை அமை STR_CONFIG_SETTING_SUBSIDY_DURATION_VALUE :{NUM} ஆண்டு{P "" கள்} @@ -1417,6 +1420,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :கரும் STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :ஊதா ###length 4 +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :சாம்பல் நிறமான காட்சி ###length 4 STR_CONFIG_SETTING_SCROLLMODE_RMB :வலது சுட்டி பொத்தானைக் கொண்டு வரைபடத்தை நகர்த்தவும் @@ -1637,6 +1641,7 @@ STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} ###setting-zero-is-special STR_CONFIG_SETTING_ENDING_YEAR_ZERO :என்றுமில்லை +STR_CONFIG_SETTING_ECONOMY_TYPE :பொருளாதார வகை: {STRING} ###length 3 STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :உறைந்த @@ -2031,6 +2036,7 @@ STR_NETWORK_SERVER_LIST_LANDSCAPE :{SILVER}நி STR_NETWORK_SERVER_LIST_MAP_SIZE :{SILVER}வரைபடத்தின் அளவு: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_LIST_SERVER_VERSION :{SILVER}சர்வர் பதிப்பு: {WHITE}{STRING} STR_NETWORK_SERVER_LIST_SERVER_ADDRESS :{SILVER}சர்வரின் முகவரி: {WHITE}{STRING} +STR_NETWORK_SERVER_LIST_INVITE_CODE :{SILVER}அழைப்பு குறியீடு: {WHITE}{STRING} STR_NETWORK_SERVER_LIST_START_DATE :{SILVER}தொடக்கத் தேதி: {WHITE}{DATE_SHORT} STR_NETWORK_SERVER_LIST_CURRENT_DATE :{SILVER}இன்றையத் தேதி: {WHITE}{DATE_SHORT} STR_NETWORK_SERVER_LIST_PASSWORD :{SILVER}கடவுச்சொலினால் தடுக்கப்பட்டுள்ளது! @@ -2103,12 +2109,15 @@ STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE :{BLACK}தொ STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_TOOLTIP :{BLACK}உங்கள் சேவையகத்தை மற்றவர்கள் எப்படி அணுகலாம் STR_NETWORK_CLIENT_LIST_PLAYER_NAME_TOOLTIP :{BLACK}உங்கள் வீரரின் பெயர் STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP :{BLACK}இந்த நிறுவனத்திற்கான நிர்வாக நடவடிக்கைகள் +STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP :{BLACK}இந்த விளையாட்டாளருக்கு ஒரு செய்தியை அனுப்பவும் STR_NETWORK_CLIENT_LIST_CHAT_SPECTATOR_TOOLTIP :{BLACK}அனைத்து பார்வையாளர்களுக்கும் ஒரு செய்தியை அனுப்பவும் STR_NETWORK_CLIENT_LIST_NEW_COMPANY :(புதிய நிறுவனம்) +STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP :{BLACK}புதிய நிறுவனத்தினை நிறுவி விளையாடு STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}{NUM} வாடிக்கையாளர்{P "" கள்} / {NUM} நிறுவன{P ம் ங்கள்} # Matches ConnectionType ###length 5 +STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_UNKNOWN :{BLACK}இருப்பிட வலைப்பின்னல் STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_ISOLATED :{RED}தொலைக்கோடியான வீரர்களால் இணைய முடியவில்லை STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_STUN :{BLACK}NAT-யிற்கு பின்னால் @@ -2713,6 +2722,7 @@ STR_FRAMERATE_CAPTION_SMALL :{STRING}{WHITE} STR_FRAMERATE_RATE_GAMELOOP :{BLACK}உருவகப்படுத்துதலின் வேகம்: {STRING} STR_FRAMERATE_RATE_BLITTER :{BLACK}கிராபிக்ஸ் பிரேம் வீதம்: {STRING} STR_FRAMERATE_SPEED_FACTOR :{BLACK}தற்போதைய ஆட்டத்தின் வேக அமைப்பு: {DECIMAL} மடங்கு +STR_FRAMERATE_CURRENT :{WHITE}நடப்பு STR_FRAMERATE_AVERAGE :{WHITE}சராசரி STR_FRAMERATE_MEMORYUSE :{WHITE}நினைவாற்றல் STR_FRAMERATE_MS_GOOD :{LTBLUE}{DECIMAL} ms @@ -2736,6 +2746,7 @@ STR_FRAMERATE_ALLSCRIPTS :{BLACK} GS/AI ###length 15 STR_FRAMETIME_CAPTION_GL_ECONOMY :சரக்கு கையாளுதல் +STR_FRAMETIME_CAPTION_GL_TRAINS :இரயில் சொடுக்குகள் STR_FRAMETIME_CAPTION_GL_ROADVEHS :சாலை வாகனத்தின் பயண நேரம் STR_FRAMETIME_CAPTION_GL_AIRCRAFT :விமான டிக்குகள் STR_FRAMETIME_CAPTION_GL_LANDSCAPE :உலக சொடுக்குகள் @@ -2782,6 +2793,8 @@ STR_MAPGEN_DATE :{BLACK}தே STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}தொழிற்சாலைகளின் எண்ணிக்கை: STR_MAPGEN_HEIGHTMAP_HEIGHT :{BLACK}மிக உயர்ந்த சிகரம்: STR_MAPGEN_SNOW_COVERAGE :{BLACK}பனி முழுத் தழுவு அளவு: +STR_MAPGEN_SNOW_COVERAGE_DOWN :{BLACK}பனி முழுத் தழுவு அளவினை பத்து சதவிகிதம் குறைக்கவும் +STR_MAPGEN_SNOW_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_DESERT_COVERAGE :{BLACK}பாலைவன முழுத் தழுவு அளவு: STR_MAPGEN_DESERT_COVERAGE_UP :{BLACK}பாலைவன முழுத் தழுவு அளவினை பத்து சதவிகிதம் அதிகப்படுத்து STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}பாலைவன முழுத் தழுவு அளவினை பத்து சதவிகிதம் குறைக்கவும் @@ -2894,6 +2907,7 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}இந் STR_SAVE_PRESET_CAPTION :{WHITE}Preset-ஐ பதிவுசெய் STR_SAVE_PRESET_TITLE :{BLACK}Preset இற்கு ஒரு பெயரினை இடு STR_SAVE_PRESET_CANCEL :{BLACK}இரத்து செய் +STR_SAVE_PRESET_CANCEL_TOOLTIP :{BLACK}முன்னமைக்கப்பட்டவற்றை மாற்றாதே STR_SAVE_PRESET_SAVE :{BLACK}சேமி # NewGRF parameters window @@ -3063,6 +3077,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{YELLOW}தங STR_GOALS_CAPTION :{WHITE}{COMPANY} குறிக்கோள்கள் STR_GOALS_SPECTATOR_CAPTION :{WHITE}உலகளாவிய குறிக்கோள்கள் STR_GOALS_SPECTATOR :உலகளாவிய குறிக்கோள்கள் +STR_GOALS_COMPANY_BUTTON :{BLACK}நிறுவனம் STR_GOALS_COMPANY_BUTTON_HELPTEXT :{BLACK}நிறுவனத்தின் இலக்குகளைக் காட்டு STR_GOALS_TEXT :{ORANGE}{STRING} STR_GOALS_NONE :{ORANGE}- ஏதுமில்லை - @@ -3201,6 +3216,7 @@ STR_FINANCES_CAPTION :{WHITE}{COMPANY STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 +STR_FINANCES_REVENUE_TITLE :{WHITE}வருவாய் ###length 13 @@ -3210,6 +3226,7 @@ STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}இரய STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}சாலை வாகனங்களை இயக்கும் செலவுகள் STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}விமானங்களை இயக்கும் செலவுகள் STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}கப்பல்களை இயக்கும் செலவுகள் +STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}கப்பல்கள் STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}கடன் வட்டி STR_FINANCES_SECTION_OTHER :{GOLD}மற்றவை @@ -3310,6 +3327,7 @@ STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}தய STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}தொழிற்சாலை உடனடியாக மூடப்படும் என்று அறிவிக்கப்பட்டுள்ளது! STR_INDUSTRY_VIEW_REQUIRES_N_CARGO :{BLACK}வேண்டியவன: {YELLOW}{STRING}{STRING} +STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION :, {STRING}{STRING} STR_INDUSTRY_VIEW_REQUIRES :{BLACK}வேண்டியவன: STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} @@ -3687,6 +3705,7 @@ STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL :{LTBLUE} {DEPOT STR_VEHICLE_STATUS_CANNOT_REACH_STATION_VEL :{LTBLUE}{STATION} நிலையத்தினை அடைய முடியவில்லை, {VELOCITY} STR_VEHICLE_STATUS_CANNOT_REACH_WAYPOINT_VEL :{LTBLUE}{WAYPOINT}-இனை அடைய முடியவில்லை, {VELOCITY} STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_VEL :{ORANGE}{DEPOT}-இனை அடைய முடியாது , {VELOCITY} +STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_SERVICE_VEL :{LTBLUE}{DEPOT} இனை அடைய முடியவில்லை, {VELOCITY} # Vehicle stopped/started animations ###length 2 @@ -4075,6 +4094,7 @@ STR_SCREENSHOT_ZOOMIN_SCREENSHOT :{BLACK}தி STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT :{BLACK}திரைபிடிப்பு - இயல்பிருப்பு பெரிதாக்குதல் STR_SCREENSHOT_WORLD_SCREENSHOT :{BLACK}முழு வரைபடத்தின் திரைபிடிப்பு STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT :{BLACK}உயர்படத்தின் திரைப்பிடிப்பு +STR_SCREENSHOT_MINIMAP_SCREENSHOT :{BLACK}சிறிய வரைபட திரைபிடிப்பு # AI Parameters STR_AI_SETTINGS_CAPTION :{WHITE}{STRING} குணாதிசயங்கள் From 4acccc232a3a80e144277927d7e1e7847e24bd4d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 18 Jun 2022 11:08:13 +0100 Subject: [PATCH 04/11] Fix #9925: Industry tile layout validation for layouts of only one tile --- src/newgrf.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 0917cff1a0..90ef10384f 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3377,20 +3377,24 @@ static bool ValidateIndustryLayout(const IndustryTileLayout &layout) const size_t size = layout.size(); if (size == 0) return false; - size_t valid_regular_tiles = 0; - for (size_t i = 0; i < size - 1; i++) { for (size_t j = i + 1; j < size; j++) { if (layout[i].ti.x == layout[j].ti.x && layout[i].ti.y == layout[j].ti.y) { return false; } - if (layout[i].gfx != GFX_WATERTILE_SPECIALCHECK) { - ++valid_regular_tiles; - } } } - return valid_regular_tiles > 0; + + bool have_regular_tile = false; + for (size_t i = 0; i < size; i++) { + if (layout[i].gfx != GFX_WATERTILE_SPECIALCHECK) { + have_regular_tile = true; + break; + } + } + + return have_regular_tile; } /** From 79af42e992d1b2cccc06748ae1fd306b16c97875 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 19 Jun 2022 18:45:14 +0000 Subject: [PATCH 05/11] Update: Translations from eints czech: 9 changes by LubosKolouch --- src/lang/czech.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index dccc734bc0..24df1b1ef8 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -985,12 +985,12 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} nebude dále nabízena STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z{NBSP}{STRING.gen} do {STRING.gen} již nebude dále poskytována -STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Nabídka dotace:{}{}Doprava {STRING} z{STRING} do {STRING} bude {NUM} rok dotována místní správou! +STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Nabídka dotace:{}{}Doprava {STRING} z {STRING} do {STRING} bude {NUM} rok dotována místní správou! ###length 4 -STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Dotace přidělena společnosti {STRING}.{}{}Doprava {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} bude po {NUM} rok{P “” ů ů} vynášet 150{NBSP}% normální ceny +STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Dotace přidělena společnosti {STRING}!{}{}Doprava {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} bude po {NUM} rok{P “” ů ů} vynášet 150{NBSP}% normální ceny STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}Dotace přidělena společnosti {STRING}!{}{} Doprava {STRING} z{NBSP}{STRING} do {STRING} bude po {NUM} rok{P “” “” ů} vynášet dvojnásobek normální ceny! STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}Dotace přidělena společnosti {STRING}.{}{}Doprava {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} bude po {NUM} rok{P “” ů ů} vynášet trojnásobek normální ceny! -STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Dotace přidělena společnosti {STRING}.{}{}Doprava {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} bude po {NUM} rok{P “” ů ů} vynášet čtyřnásobek normální ceny! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Dotace přidělena společnosti {STRING}.{}{}Doprava {STRING.gen} z{STRING.gen} do {STRING.gen} bude po {NUM} rok{P “” ů ů} vynášet čtyřnásobek normální ceny! STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK}{TOWN} zažívá dopravní chaos!{}{}Program přestavby ulic sponzorovaný {STRING} přináší motoristům 6 měsíců utrpení! STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Transportní monopol! @@ -1839,6 +1839,7 @@ STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS :Nehody a katast STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS_HELPTEXT :Zobrazovat noviny o nehodách a katastrofách STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER :Nehody konkurenčních vozidel: {STRING} +STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER_HELPTEXT :Zobrazit protivníkům novinky o havarovaných vozidlech STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION :Informace o společnosti: {STRING} STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION_HELPTEXT :Zobrazovat noviny když společnost začne nebo hrozí krach @@ -3720,7 +3721,7 @@ STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Kapitál ###length 13 STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Výstavba STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nové dopravní prostředky -STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Provoz vlaků +STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Vlaky STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Provoz silničních vozidel STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Provoz letadel STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Provoz lodí @@ -3732,12 +3733,13 @@ STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Lodě STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Úroky z půjček STR_FINANCES_SECTION_OTHER :{GOLD}Další -STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} -STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG} +STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} +STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} STR_FINANCES_NET_PROFIT :{WHITE}Čistý zisk STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Stav na účtu STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Vlastní Prostředky STR_FINANCES_LOAN_TITLE :{WHITE}Půjčka +STR_FINANCES_INTEREST_RATE :{WHITE}Úrok z půjčky: {BLACK}{NUM}% STR_FINANCES_MAX_LOAN :{WHITE}Maximální půjčka: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Půjčit {CURRENCY_LONG} @@ -4322,7 +4324,7 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Hodnota: {LTBLUE}{CURRENCY_LONG} STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Celková kapacita tohoto vlaku: -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Prázdný From 278c1d06cff752df30db3ff80447b0bf95dcf858 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 20 Jun 2022 18:48:32 +0000 Subject: [PATCH 06/11] Update: Translations from eints italian: 6 changes by Rivarossi turkish: 37 changes by jnmbk --- src/lang/italian.txt | 12 +++++----- src/lang/turkish.txt | 55 +++++++++++++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 9597742506..91ae223ecc 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -354,11 +354,11 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Mostra l STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Mostra l'elenco degli aeromobili di una compagnia. CTRL+clic non apre la lista gruppi. STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}Zooma la visuale in avanti STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}Zooma la visuale indietro -STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Costruisci ferrovie -STR_TOOLBAR_TOOLTIP_BUILD_ROADS :{BLACK}Costruisci strade -STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS :{BLACK}Costruisci tranvie -STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Costruisci trasporti su acqua -STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Costruisci aeroporti +STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Costruzione ferrovie +STR_TOOLBAR_TOOLTIP_BUILD_ROADS :{BLACK}Costruzione strade +STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS :{BLACK}Costruzione tranvie +STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Costruzione trasporti su acqua +STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Costruzione aeroporti STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Apre la barra di modellazione del terreno per alzare/abbassare il terreno, piantare alberi, etc. STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Mostra la finestra suoni/musica STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Mostra l'ultimo messaggio/notizia, mostra le opzioni dei messaggi @@ -468,7 +468,7 @@ STR_ROAD_MENU_TRAM_CONSTRUCTION :Costruzione tra # Waterways construction menu ###length 1 -STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Costruisci trasporti su acqua +STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Costruzione trasporti su acqua # Aairport construction menu ###length 1 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index f91ce864ec..8845585d2f 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -898,13 +898,13 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} artık {STRING} ve {STRING} kabul ediyor STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Teşvik önerisinin süresi doldu:{}{}{1:STRING} ile {2:STRING} arasındaki {0:STRING} taşıma hizmeti artık teşvik almayacak -STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Teşvik geri çekildi:{}{}{1:STRING} ile {2:STRING} arasındaki {0:STRING} taşıma hizmeti artık teşvik almayacak -STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Hizmet teşviği önerildi:{}{} {STRING} -> {STRING} arası ilk {STRING} taşıma hizmeti belediyeden {NUM} yıllık teşvik alacak! +STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Hizmet teşviği geri çekildi:{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında artık teşvik sağlamayacak +STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Hizmet teşviği teklif edildi:{}{}{STRING} taşıma hizmetine {STRING} -> {STRING} arasında gelecek {NUM} yıl boyunca yerel yönetim tarafından teşvik sağlanacak! ###length 4 -STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} -> {STRING} arasındaki {STRING} taşıma hizmeti gelecek {NUM} yıl boyunca %50 fazla gelir sağlayacak! -STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} -> {STRING} arasındaki {STRING} taşıma hizmeti gelecek {NUM} yıl boyunca iki kat fazla gelir sağlayacak! -STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} -> {STRING} arasındaki {STRING} taşıma hizmeti gelecek {NUM} yıl boyunca üç kat fazla gelir sağlayacak! -STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} -> {STRING} arasındaki {STRING} taşıma hizmeti gelecek {NUM} yıl boyunca dört kat fazla gelir sağlayacak! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında gelecek {NUM} yıl boyunca fazladan %50 ödeme yapacak! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında gelecek {NUM} yıl boyunca iki kat fazla ödeme yapacak! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında gelecek {NUM} yıl boyunca üç kat fazla ödeme yapacak! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Hizmet teşviği {STRING} şirketine verildi!{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında gelecek {NUM} yıl boyunca dört kat fazla ödeme yapacak! STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK} {TOWN} şehrinde trafik durdu!{}{} {STRING} şirketinin yol yapım çalışmaları başladı! STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Taşımacılıkta tekel! @@ -1026,6 +1026,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Ayar sad STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Dikey senkronizasyon'u aktif etmek için bu kutuyu işaretleyin. Değiştirilmiş bir ayar sadece oyun yeniden başlatıldığında uygulanır. Yalnızca donanım ivmesi aktifken çalışır +STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Geçerli sürücü: {STRING} STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Arayüz boyutu STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Kullanmak üzere arayüz bileşen boyutunu seçin @@ -1154,9 +1155,10 @@ STR_TERRAIN_TYPE_CUSTOM :Özel yüksekli STR_TERRAIN_TYPE_CUSTOM_VALUE :Özel yükseklik ({NUM}) ###length 4 +STR_CITY_APPROVAL_LENIENT :Hoşgörülü STR_CITY_APPROVAL_TOLERANT :Töleranslı STR_CITY_APPROVAL_HOSTILE :Düşman -STR_CITY_APPROVAL_PERMISSIVE :İzne tabi +STR_CITY_APPROVAL_PERMISSIVE :İzin verici (şirket faaliyetinden etkilenmez) STR_WARNING_NO_SUITABLE_AI :{WHITE}Uygun YZ'ler yok...{}'Çevrimiçi içerik' sistemiyle pek çok YZ indirebilirsiniz @@ -1236,7 +1238,7 @@ STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS :Araç bozulmala STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :Yetersiz bakım gören araçların ne sıklıkta bozulacağını ayarlayın STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER :Ödenek çarpanı: {STRING} -STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT :Sübvanse edilen bağlantılar için ne kadar ödeneceğini belirleyin +STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT :Teşvik edilen bağlantılara ne kadar ödeneceğini belirler STR_CONFIG_SETTING_SUBSIDY_DURATION :Ödenek süresi: {STRING} STR_CONFIG_SETTING_SUBSIDY_DURATION_HELPTEXT :Teşvik verilen yıl süresini ayarla @@ -1257,8 +1259,8 @@ STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Etkinleştirild STR_CONFIG_SETTING_DISASTERS :Felaketler: {STRING} STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Araçları ya da altyapıyı yok edebilecek felaketleri açın ya da kapatın -STR_CONFIG_SETTING_CITY_APPROVAL :Arazi şekillendirmeye karşı belediye meclisinin tavrı: {STRING} -STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Şirketlerin sebep olduğu gürültü ve çevreye zararın kasaba beğenilerini ve ilerideki inşaatlarını nasıl etkileyeceğini seçin +STR_CONFIG_SETTING_CITY_APPROVAL :Yerel yönetimin tutumu: {STRING} +STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Şirketlerin sebep olduğu gürültü ve çevreye zararın; kasaba değerlendirmesini ve kasabada gelecekteki inşaat faaliyetlerini nasıl etkileyeceğini seçin STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Harita azami yükseklik limiti: {STRING} STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT :Harita arazisinin azami yüksekliğini ayarlayın. "(otomatik)" ile arazi oluşturulduktan sonra güzel bir değer seçilecektir @@ -1528,7 +1530,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Yeşil STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Koyu yeşil STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Mor +STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Kargo akış görünümü renkleri: {STRING} +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_HELPTEXT :Kargo akış görünümünde kullanılacak renk düzenini ayarla. ###length 4 +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :Yeşilden kırmızıya (özgün) +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Yeşilden maviye +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Griden kırmızıya +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Gri tonlamalı STR_CONFIG_SETTING_SCROLLMODE :Bakış noktası kaydırma davranışı: {STRING} STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Haritada gezinirkenki davranış @@ -3613,22 +3621,33 @@ STR_FINANCES_CAPTION :{WHITE}{COMPANY STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 +STR_FINANCES_REVENUE_TITLE :{WHITE}Gelir +STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Faaliyet Harcamaları +STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Sermaye Harcamaları ###length 13 STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}İnşaat STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Yeni Araçlar -STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Tren Bakımları -STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Kara Taşıtı Bakımları -STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Hava Taşıtı Bakımları -STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Gemi Bakımları +STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trenler +STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Karayolu Araçları +STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Hava Taşıtları +STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Gemiler +STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Altyapı +STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Trenler +STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE :{GOLD}Karayolu Araçları +STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Uçak +STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Gemiler STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Kredi Faizi STR_FINANCES_SECTION_OTHER :{GOLD}Diğer -STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} -STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG} +STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} +STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} +STR_FINANCES_NET_PROFIT :{WHITE}Net Kâr STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Banka Hesabı +STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Kendi Sermayem STR_FINANCES_LOAN_TITLE :{WHITE}Kredi +STR_FINANCES_INTEREST_RATE :{WHITE}Kredi Faizi: {BLACK}%{NUM} STR_FINANCES_MAX_LOAN :{WHITE}Azami Kredi: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}{CURRENCY_LONG} Kredi Al @@ -4210,8 +4229,8 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Değeri: {LTBLUE}{CURRENCY_LONG} STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Bu trenin toplam kapasitesi: -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Boş STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO_LONG} - {STATION} From f64cf8679dc383e4452efc7cbf0f536db38e62d6 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 21 Jun 2022 18:47:23 +0000 Subject: [PATCH 07/11] Update: Translations from eints chinese (traditional): 6 changes by wpi3 italian: 2 changes by Rivarossi turkish: 1 change by jnmbk --- src/lang/italian.txt | 4 ++-- src/lang/traditional_chinese.txt | 12 ++++++------ src/lang/turkish.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 91ae223ecc..0d876de1a3 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2828,7 +2828,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Costruis # Airport construction window STR_STATION_BUILD_AIRPORT_CAPTION :{WHITE}Selezione aeroporto STR_STATION_BUILD_AIRPORT_TOOLTIP :{BLACK}Seleziona dimensione/tipo di aeroporto -STR_STATION_BUILD_AIRPORT_CLASS_LABEL :{BLACK}Tipo aeroporto +STR_STATION_BUILD_AIRPORT_CLASS_LABEL :{BLACK}Categoria aeroporto STR_STATION_BUILD_AIRPORT_LAYOUT_NAME :{BLACK}Disposizione {NUM} STR_AIRPORT_SMALL :Piccolo @@ -2975,7 +2975,7 @@ STR_LAND_AREA_INFORMATION_LANDINFO_COORDS :{BLACK}Coordina STR_LAND_AREA_INFORMATION_BUILD_DATE :{BLACK}Costruito il: {LTBLUE}{DATE_LONG} STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Tipo stazione: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo stazione: {LTBLUE}{STRING} -STR_LAND_AREA_INFORMATION_AIRPORT_CLASS :{BLACK}Tipo aeroporto: {LTBLUE}{STRING} +STR_LAND_AREA_INFORMATION_AIRPORT_CLASS :{BLACK}Categoria aeroporto: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_AIRPORT_NAME :{BLACK}Nome aeroporto: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Nome blocco aeroporto: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index cb59891b7a..c952d66141 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2031,7 +2031,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :列車的路徑 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :設定列車使用的路徑搜尋方式。 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :車輛的路徑搜尋方式：{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_HELPTEXT :設定公路車輛（包括電車）使用的路徑搜尋方式。 -STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :船隻的路徑搜尋方式：{STRING} +STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :船舶的路徑搜尋方式：{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT :設定船舶使用的路徑搜尋方式。 STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :在號誌自動倒轉：{STRING} STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT :設定是否容許列車在號誌前等候超過一段時間後調頭。 @@ -3071,8 +3071,8 @@ STR_FRAMERATE_GRAPH_SECONDS :{TINY_FONT}{COM STR_FRAMERATE_GAMELOOP :{BLACK}遊戲週期合計： STR_FRAMERATE_GL_ECONOMY :{BLACK} 貨物處理： STR_FRAMERATE_GL_TRAINS :{BLACK} 列車耗時 -STR_FRAMERATE_GL_ROADVEHS :{BLACK} 道路車輛耗時 -STR_FRAMERATE_GL_SHIPS :{BLACK} 船隻耗時 +STR_FRAMERATE_GL_ROADVEHS :{BLACK} 公路車輛耗時 +STR_FRAMERATE_GL_SHIPS :{BLACK} 船舶耗時 STR_FRAMERATE_GL_AIRCRAFT :{BLACK} 飛機耗時 STR_FRAMERATE_GL_LANDSCAPE :{BLACK} 世界耗時 STR_FRAMERATE_GL_LINKGRAPH :{BLACK} 貨物分配圖延遲 @@ -3088,8 +3088,8 @@ STR_FRAMERATE_AI :{BLACK} AI {N STR_FRAMETIME_CAPTION_GAMELOOP :遊戲週期 STR_FRAMETIME_CAPTION_GL_ECONOMY :貨物處理 STR_FRAMETIME_CAPTION_GL_TRAINS :列車耗時 -STR_FRAMETIME_CAPTION_GL_ROADVEHS :道路車輛耗時 -STR_FRAMETIME_CAPTION_GL_SHIPS :船隻耗時 +STR_FRAMETIME_CAPTION_GL_ROADVEHS :公路車輛耗時 +STR_FRAMETIME_CAPTION_GL_SHIPS :船舶耗時 STR_FRAMETIME_CAPTION_GL_AIRCRAFT :飛機耗時 STR_FRAMETIME_CAPTION_GL_LANDSCAPE :世界耗時 STR_FRAMETIME_CAPTION_GL_LINKGRAPH :貨物分配圖延遲 @@ -4102,7 +4102,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE ###length VEHICLE_TYPES STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}將列車置於畫面中央。雙擊將會使視野跟隨列車。 按住 Ctrl 點選可於列車開啟新視窗視野 STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}將車輛置於畫面中央。雙擊將會使視野跟隨車輛。 按住 Ctrl 點選可於車輛位置開啟新視窗視野 -STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}將船隻置於畫面中央。雙擊將會使視野跟隨船隻。 按住 Ctrl 點選可於船隻位置開啟新視窗視野 +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}將船舶置於畫面中央。雙擊將會使視野跟隨船舶。 按住 Ctrl 點選可於船舶位置開啟新視窗視野 STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}將飛機置於畫面中央。雙擊將會使視野跟隨飛機。 按住 Ctrl 點選可於飛機位置開啟新視窗視野 ###length VEHICLE_TYPES diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 8845585d2f..b040824dd8 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1185,7 +1185,7 @@ STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Aşağı STR_CONFIG_SETTING_RESTRICT_BASIC :Temel (sadece önemli ayarları göster) STR_CONFIG_SETTING_RESTRICT_ADVANCED :Gelişmiş (çoğu ayarı göster) STR_CONFIG_SETTING_RESTRICT_ALL :Uzman (garip olanlar dahil tüm ayarları göster) -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Geçerli değerden farklı bir değere sahip ayarlama +STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Öntanımlıdan farklı değerdeki ayarlar STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Yeni oyun ayarlarınızdan farklı bir değere sahip ayarlar STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT :{BLACK}Aşağıdaki liste belirli bir ayar türüne göre kısıtlanır From 68257e0d7d3402494db9756c66ca43a5397ef520 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 23 Jun 2022 18:50:06 +0000 Subject: [PATCH 08/11] Update: Translations from eints turkish: 1 change by jnmbk spanish: 12 changes by MontyMontana --- src/lang/spanish.txt | 21 ++++++++++++--------- src/lang/turkish.txt | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 0797868379..fe98a69dbf 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1026,6 +1026,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}El ajust STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}Sincronización vertical STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Marca esta casilla para activar la sincronización vertical en la pantalla. El cambio sólo se aplicará después de reiniciar el juego. Sólo funciona si la aceleración por hardware está activada. +STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Controlador actual: {STRING} STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Tamaño de la interfaz STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Selecciona el tamaño de los elementos de la interfaz a usar @@ -1156,7 +1157,7 @@ STR_TERRAIN_TYPE_CUSTOM_VALUE :Altura personal ###length 4 STR_CITY_APPROVAL_TOLERANT :Tolerante STR_CITY_APPROVAL_HOSTILE :Hostil -STR_CITY_APPROVAL_PERMISSIVE :Permisiva +STR_CITY_APPROVAL_PERMISSIVE :Permisiva (sin efecto sobre las acciones de las compañías) STR_WARNING_NO_SUITABLE_AI :{WHITE}No se han encontrado IA apropiadas...{}Puedes descargar IA a través del sistema de 'Contenido Online' @@ -1257,7 +1258,7 @@ STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Si se activa, l STR_CONFIG_SETTING_DISASTERS :Desastres: {STRING} STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Activa desastres que ocasionalmente pueden bloquear o destruir vehículos o infraestructuras -STR_CONFIG_SETTING_CITY_APPROVAL :Actitud de los municipios frente a reestructuraciones en su zona: {STRING} +STR_CONFIG_SETTING_CITY_APPROVAL :Actitud de las autoridades locales: {STRING} STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Permite elegir en que medida el ruido y el daño ambiental causado por las empresas afecta a su calificación y nuevas acciones de construcción en los municipios STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Límite de altura del mapa: {STRING} @@ -3618,15 +3619,17 @@ STR_FINANCES_YEAR :{WHITE}{NUM} ###length 13 STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Construcción STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nuevos vehículos -STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Coste operación Trenes -STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Coste de operación de vehículos de carretera -STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Coste operación Aeronaves -STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Coste operación Barcos +STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trenes +STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Vehículos de carretera +STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Aeronaves +STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Barcos +STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Infraestructura +STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Trenes STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Intereses de Préstamo STR_FINANCES_SECTION_OTHER :{GOLD}Otros -STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} -STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG} +STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} +STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Saldo en Banco STR_FINANCES_LOAN_TITLE :{WHITE}Préstamo STR_FINANCES_MAX_LOAN :{WHITE}Préstamo Máximo: {BLACK}{CURRENCY_LONG} @@ -4210,7 +4213,7 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Valor: {LTBLUE}{CURRENCY_LONG} STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Capacidad de carga total de este tren: -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Vacío diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index b040824dd8..56bdfa43bd 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -816,7 +816,7 @@ STR_NEWS_FIRST_AIRCRAFT_ARRIVAL :{BIG_FONT}{BLAC STR_NEWS_TRAIN_CRASH :{BIG_FONT}{BLACK}Tren Kazası!!! Talihsiz kazada{}{COMMA} kişi öldü... STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER :{BIG_FONT}{BLACK}Trafik kazası!{}Trenle çarpışan aracın şoförü feci şekilde can verdi... STR_NEWS_ROAD_VEHICLE_CRASH :{BIG_FONT}{BLACK}Trafik kazası!{}{COMMA} kişi patlamadan kurtulamadı... -STR_NEWS_AIRCRAFT_CRASH :{BIG_FONT}{BLACK}Uçak Kazası!{}{COMMA} kişinin öldüğü yer {STATION} +STR_NEWS_AIRCRAFT_CRASH :{BIG_FONT}{BLACK}Uçak Kazası!{}{1:STATION}nda {0:COMMA} kişi öldü STR_NEWS_PLANE_CRASH_OUT_OF_FUEL :{BIG_FONT}{BLACK}Uçak Kazası!{}Uçağın havada yakıtı bitti, {COMMA} kişi hayatını kaybetti STR_NEWS_DISASTER_ZEPPELIN :{BIG_FONT}{BLACK}{STATION} yakınlarına bir zeplin düştü ! From ffd3c11ba7d3abd3dc3e387df24c157f281c8d15 Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 24 Jun 2022 18:48:39 +0000 Subject: [PATCH 09/11] Update: Translations from eints italian: 8 changes by Rivarossi spanish: 19 changes by MontyMontana --- src/lang/italian.txt | 16 ++++++++-------- src/lang/spanish.txt | 22 +++++++++++++++++++--- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 0d876de1a3..0e44cdef13 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -115,7 +115,7 @@ STR_QUANTITY_PAPER :{WEIGHT_LONG} d STR_QUANTITY_GOLD :{COMMA}{NBSP}sacc{P o hi} di oro STR_QUANTITY_WATER :{VOLUME_LONG} di acqua STR_QUANTITY_WHEAT :{WEIGHT_LONG} di frumento -STR_QUANTITY_RUBBER :{VOLUME_LONG} di gomma +STR_QUANTITY_RUBBER :{VOLUME_LONG} di caucciù STR_QUANTITY_SUGAR :{WEIGHT_LONG} di zucchero STR_QUANTITY_TOYS :{COMMA}{NBSP}giocattol{P o i} STR_QUANTITY_SWEETS :{COMMA}{NBSP}sacc{P o hi} di caramelle @@ -5156,7 +5156,7 @@ STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC :{G=f}Banca STR_INDUSTRY_NAME_DIAMOND_MINE :{G=f}Miniera di diamanti STR_INDUSTRY_NAME_IRON_ORE_MINE :{G=f}Miniera di ferro STR_INDUSTRY_NAME_FRUIT_PLANTATION :{G=m}Frutteto -STR_INDUSTRY_NAME_RUBBER_PLANTATION :{G=f}Piantagione di gomma +STR_INDUSTRY_NAME_RUBBER_PLANTATION :{G=f}Piantagione di caucciù STR_INDUSTRY_NAME_WATER_SUPPLY :{G=f}Falda acquifera STR_INDUSTRY_NAME_WATER_TOWER :{G=f}Torre idrica STR_INDUSTRY_NAME_FACTORY_2 :{G=f}Fabbrica @@ -5263,7 +5263,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PAPER_TRUCK :Carro per carta STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER :Tramoggia per rame STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WATER_TANKER :Carro cisterna (acqua) STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FRUIT_TRUCK :Carro per frutta -STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK :Carro per gomma +STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK :Carro per caucciù STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK :Carro per zucchero STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER :Tramoggia per zucchero filato STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER :Tramoggia per toffee @@ -5293,7 +5293,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK :Carro per carta STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER :Tramoggia per rame STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER :Carro cisterna (acqua) STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FRUIT_TRUCK :Carro per frutta -STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK :Carro per gomma +STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK :Carro per caucciù STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK :Carro per zucchero STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER :Tramoggia per zucchero filato STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER :Tramoggia per toffee @@ -5325,7 +5325,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK :Carro per carta STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER :Tramoggia per rame STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER :Carro cisterna (acqua) STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FRUIT_TRUCK :Carro per frutta -STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK :Carro per gomma +STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK :Carro per caucciù STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK :Carro per zucchero STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER :Tramoggia per zucchero filato STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER :Tramoggia per toffee @@ -5393,9 +5393,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER :Autobotte MPS STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK :Autocarro frutta Balogh STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK :Autocarro frutta Uhl STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK :Autocarro frutta Kelling -STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK :Autocarro gomma Balogh -STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK :Autocarro gomma Uhl -STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK :Autocarro gomma RMT +STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK :Autocarro caucciù Balogh +STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK :Autocarro caucciù Uhl +STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK :Autocarro caucciù RMT STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK :Autocarro zucchero MightyMover STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK :Autocarro zucchero Powernaught STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK :Autocarro zucchero Wizzowow diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index fe98a69dbf..8bdca47f1e 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1155,6 +1155,7 @@ STR_TERRAIN_TYPE_CUSTOM :Altura personal STR_TERRAIN_TYPE_CUSTOM_VALUE :Altura personalizada ({NUM}) ###length 4 +STR_CITY_APPROVAL_LENIENT :Tolerante STR_CITY_APPROVAL_TOLERANT :Tolerante STR_CITY_APPROVAL_HOSTILE :Hostil STR_CITY_APPROVAL_PERMISSIVE :Permisiva (sin efecto sobre las acciones de las compañías) @@ -1529,7 +1530,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Verde STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Verde oscuro STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Violeta +STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Colores de Flujos de Carga: {STRING} +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_HELPTEXT :Esquema de Color que se usará para el grafo de Flujos de Carga. ###length 4 +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :De verde a rojo (original) +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :De verde a azul +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :De gris a rojo +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Escala de grises STR_CONFIG_SETTING_SCROLLMODE :Desplazamiento de vista: {STRING} STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamiento al desplazar el mapa @@ -3614,24 +3621,33 @@ STR_FINANCES_CAPTION :{WHITE}Finanzas STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 +STR_FINANCES_REVENUE_TITLE :{WHITE}Ingresos +STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Gastos de explotación +STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Gastos de capital ###length 13 STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Construcción STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nuevos vehículos STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trenes -STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Vehículos de carretera +STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Vehículos de Carretera STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Aeronaves STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Barcos STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Infraestructura STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Trenes +STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE :{GOLD}Vehículos de Carretera +STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Aeronaves +STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Barcos STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Intereses de Préstamo STR_FINANCES_SECTION_OTHER :{GOLD}Otros STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} +STR_FINANCES_NET_PROFIT :{WHITE}Beneficio neto STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Saldo en Banco +STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Fondos propios STR_FINANCES_LOAN_TITLE :{WHITE}Préstamo +STR_FINANCES_INTEREST_RATE :{WHITE}Tipo de interés del préstamo: {BLACK}{NUM}% STR_FINANCES_MAX_LOAN :{WHITE}Préstamo Máximo: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Pedir Préstamo {CURRENCY_LONG} @@ -4214,7 +4230,7 @@ STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Capacidad de carga total de este tren: STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Vacío STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO_LONG} desde {STATION} @@ -4520,7 +4536,7 @@ STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Script d STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}IA que serán cargadas en la próxima partida STR_AI_CONFIG_HUMAN_PLAYER :Jugador humano STR_AI_CONFIG_RANDOM_AI :IA aleatoria -STR_AI_CONFIG_NONE :(ninguna) +STR_AI_CONFIG_NONE :(ninguno) STR_AI_CONFIG_MOVE_UP :{BLACK}Mover hacia arriba STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Mover la IA seleccionada hacia arriba From f72b9fa7675d7b7d3eefa07e89a1338c544fd045 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 28 Jun 2022 18:54:28 +0000 Subject: [PATCH 10/11] Update: Translations from eints italian: 22 changes by Rivarossi --- src/lang/italian.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 0e44cdef13..2d3e134fb6 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1675,7 +1675,7 @@ STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST :L'ultimo dispon STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED :Il più usato STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION :Mostra i percorsi riservati sui binari: {STRING} -STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION_HELPTEXT :Dà ai binari riservati un colore differente, aiutando a correggere problemi di treni che si rifiutano di entrare in blocchi protetti con segnali a percorso +STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION_HELPTEXT :Dà ai binari riservati un colore differente, aiutando a correggere problemi di treni che si rifiutano di entrare in blocchi protetti con segnali di percorso STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Mantieni aperte le finestre di costruzione dopo l'uso: {STRING} STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Mantiene aperti dopo l'uso gli strumenti di costruzione di ponti, tunnel, etc. @@ -2728,17 +2728,17 @@ STR_STATION_CLASS_WAYP :Waypoint STR_BUILD_SIGNAL_CAPTION :{WHITE}Selezione segnale STR_BUILD_SIGNAL_TOGGLE_ADVANCED_SIGNAL_TOOLTIP :{BLACK}Attiva/disattiva la visualizzazione dei tipi di segnale avanzati STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Segnale di blocco (semaforico){}I segnali sono necessari per impedire ai convogli di scontrarsi su reti ferroviarie dove viaggia più di un treno -STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Pre-segnale (semaforico){}Via libera se è presente almeno un segnale di uscita su via libera al termine della sezione di blocco successiva. Altrimenti presenta via impedita -STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Segnale di uscita (semaforico){}Si comporta come un segnale di blocco, ma è necessario per far funzionare correttamente i pre-segnali e i segnali combinati all'ingresso della sezione -STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Segnale combinato (semaforico){}Un segnale combinato funziona contemporaneamente da segnale d'uscita e da pre-segnale. In questo modo è possibile costruire "alberi" di pre-segnali -STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Segnale a percorso (semaforico){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario -STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Segnale a percorso s. u. (semaforico){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario +STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Segnale di entrata (semaforico){}Questo pre-segnale permette l'accesso a un blocco solo se è presente almeno un segnale di uscita verde al termine della sezione del blocco, altrimenti è rosso. +STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Segnale di uscita (semaforico){}Questo pre-segnale interagisce con i segnali di entrata, comunicandogli se vi sono uscite disponibili dal blocco, a cui entrambi appartengono. Se non è in combinazione con un segnale di entrata, si comporta come un comune segnale di blocco. +STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Segnale combinato (semaforico){}Questo pre-segnale funziona contemporaneamente da segnale di uscita e di entrata. Questa sua caratteristica permette di costruire "alberi" di pre-segnali. +STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Segnale di percorso (semaforico){}Un segnale di percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario +STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Segnale di percorso s. u. (semaforico){}Un segnale di percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Segnale di blocco (luminoso){}I segnali sono necessari per impedire ai convogli di scontrarsi su reti ferroviarie dove viaggia più di un treno -STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Pre-segnale (luminoso){}Via libera se è presente almeno un segnale di uscita su via libera al termine della sezione di blocco successiva. Altrimenti presenta via impedita -STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Segnale di uscita (luminoso){}Si comporta come un segnale di blocco, ma è necessario per far funzionare correttamente i pre-segnali e i segnali combinati all'ingresso della sezione -STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Segnale combinato (luminoso){}Un segnale combinato funziona contemporaneamente da segnale d'uscita e da pre-segnale. In questo modo è possibile costruire "alberi" di pre-segnali -STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Segnale a percorso (luminoso){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario -STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Segnale a percorso s. u. (luminoso){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario +STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Segnale di entrata (luminoso){}Questo pre-segnale permette l'accesso a un blocco solo se è presente almeno un segnale di uscita verde al termine della sezione del blocco, altrimenti è rosso. +STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Segnale di uscita (luminoso){}Questo pre-segnale interagisce con i segnali di entrata, comunicandogli se vi sono uscite disponibili dal blocco, a cui entrambi appartengono. Se non è in combinazione con un segnale di entrata, si comporta come un comune segnale di blocco. +STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Segnale combinato (luminoso){}Questo pre-segnale funziona contemporaneamente da segnale di uscita e di entrata. Questa sua caratteristica permette la costruzione di "alberi" di pre-segnali. +STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Segnale di percorso (luminoso){}Un segnale di percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario +STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Segnale di percorso s. u. (luminoso){}Un segnale di percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Conversione segnali - Se attivato, facendo clic su un segnale esistente lo si converte nel tipo selezionato, mentre con CTRL+clic se ne modifica la variante. MAIUSC+clic mostra il costo stimato della conversione STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Distanza fra i segnali costruiti automaticamente trascinando il cursore STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Riduce la distanza fra i segnali costruiti @@ -3002,23 +3002,23 @@ STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Ferrovia con se STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :Ferrovia con pre-segnali STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Ferrovia con segnali di uscita STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :Ferrovia con segnali combinati -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Ferrovia con segnali a percorso -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Ferrovia con segnali a percorso s.u. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Ferrovia con segnali di percorso +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Ferrovia con segnali di percorso s.u. STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :Ferrovia con segnali di blocco e pre-segnali STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :Ferrovia con segnali di blocco e di uscita STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Ferrovia con segnali di blocco e combinati -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Ferrovia con segnali di blocco e a percorso -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Ferrovia con segnali di blocco e a percorso s.u. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Ferrovia con segnali di blocco e di percorso +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Ferrovia con segnali di blocco e di percorso s.u. STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :Ferrovia con pre-segnali e segnali di uscita STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :Ferrovia con pre-segnali e segnali combinati -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :Ferrovia con pre-segnali e segnali a percorso -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :Ferrovia con pre-segnali e segnali a percorso s.u. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :Ferrovia con pre-segnali e segnali di percorso +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :Ferrovia con pre-segnali e segnali di percorso s.u. STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :Ferrovia con segnali di uscita e combinati -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Ferrovia con segnali di uscita e a percorso -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Ferrovia con segnali di uscita e a percorso s.u. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Ferrovia con segnali combinati e a percorso -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Ferrovia con segnali combinati e a percorso s.u. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Ferrovia con segnali a percorso e a percorso s.u. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Ferrovia con segnali di uscita e di percorso +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Ferrovia con segnali di uscita e di percorso s.u. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Ferrovia con segnali combinati e di percorso +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Ferrovia con segnali combinati e di percorso s.u. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Ferrovia con segnali di percorso e di percorso s.u. STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :Deposito ferroviario STR_LAI_ROAD_DESCRIPTION_ROAD :Strada From 19af139631b5bc98dba6de4c4f0b7aeb6b3ac6aa Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 29 Jun 2022 00:48:33 +0100 Subject: [PATCH 11/11] Fix #9937: Station industries_near incorrect after removing part moved sign RecomputeCatchment was being called before moving the sign tile instead of afterwards --- src/station_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 2c038c548c..85c18b6faa 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -752,7 +752,6 @@ void Station::AfterStationTileSetChange(bool adding, StationType type) InvalidateWindowData(WC_STATION_LIST, this->owner, 0); } else { MarkCatchmentTilesDirty(); - this->RecomputeCatchment(); } switch (type) { @@ -776,6 +775,7 @@ void Station::AfterStationTileSetChange(bool adding, StationType type) InvalidateWindowData(WC_SELECT_STATION, 0, 0); } else { DeleteStationIfEmpty(this); + this->RecomputeCatchment(); } }