From 908ff68459c8468b0dc6fd4fb8db4a969b956395 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 17 Mar 2012 11:20:43 +0000 Subject: [PATCH] (svn r24034) [1.2] -Backport from trunk: - Feature: Increase the station class limit from 32 to 256 (r24031) - Fix: [NoAI] reset 'is random' status of temporary variable during saveload as it is not always written to when loading an AI which means it wouldd be taking the 'is random' setting of another AI (r24033) - Fix: [NoAI] Make AIEngine::IsArticulated return true if the articulated callback flag is set, do not try to run the callback (r24029) - Fix: Pass cases down into the list of cargos [FS#5090] (r24024, r24023, r24022) --- src/articulated_vehicles.cpp | 10 +++++++ src/articulated_vehicles.h | 1 + src/lang/afrikaans.txt | 10 +++---- src/lang/arabic_egypt.txt | 10 +++---- src/lang/belarusian.txt | 10 +++---- src/lang/brazilian_portuguese.txt | 10 +++---- src/lang/bulgarian.txt | 10 +++---- src/lang/catalan.txt | 10 +++---- src/lang/croatian.txt | 10 +++---- src/lang/czech.txt | 10 +++---- src/lang/danish.txt | 10 +++---- src/lang/dutch.txt | 10 +++---- src/lang/english.txt | 11 +++---- src/lang/english_AU.txt | 10 +++---- src/lang/english_US.txt | 10 +++---- src/lang/esperanto.txt | 10 +++---- src/lang/estonian.txt | 10 +++---- src/lang/finnish.txt | 10 +++---- src/lang/french.txt | 10 +++---- src/lang/galician.txt | 10 +++---- src/lang/german.txt | 10 +++---- src/lang/greek.txt | 10 +++---- src/lang/hebrew.txt | 10 +++---- src/lang/hungarian.txt | 10 +++---- src/lang/icelandic.txt | 10 +++---- src/lang/indonesian.txt | 10 +++---- src/lang/irish.txt | 10 +++---- src/lang/italian.txt | 10 +++---- src/lang/japanese.txt | 10 +++---- src/lang/korean.txt | 10 +++---- src/lang/latvian.txt | 10 +++---- src/lang/lithuanian.txt | 10 +++---- src/lang/luxembourgish.txt | 10 +++---- src/lang/malay.txt | 10 +++---- src/lang/norwegian_bokmal.txt | 10 +++---- src/lang/norwegian_nynorsk.txt | 10 +++---- src/lang/polish.txt | 10 +++---- src/lang/portuguese.txt | 10 +++---- src/lang/romanian.txt | 10 +++---- src/lang/russian.txt | 10 +++---- src/lang/serbian.txt | 10 +++---- src/lang/simplified_chinese.txt | 10 +++---- src/lang/slovak.txt | 10 +++---- src/lang/slovenian.txt | 10 +++---- src/lang/spanish.txt | 10 +++---- src/lang/swedish.txt | 10 +++---- src/lang/traditional_chinese.txt | 10 +++---- src/lang/turkish.txt | 10 +++---- src/lang/ukrainian.txt | 10 +++---- src/lang/unfinished/frisian.txt | 6 ++-- src/lang/unfinished/ido.txt | 4 +-- src/lang/unfinished/macedonian.txt | 6 ++-- src/lang/unfinished/persian.txt | 6 ++-- src/lang/unfinished/tamil.txt | 2 +- src/lang/unfinished/thai.txt | 6 ++-- src/lang/unfinished/urdu.txt | 6 ++-- src/lang/vietnamese.txt | 10 +++---- src/lang/welsh.txt | 10 +++---- src/newgrf_station.h | 2 +- src/saveload/ai_sl.cpp | 1 + src/script/api/script_engine.cpp | 2 +- src/station_gui.cpp | 47 +++--------------------------- src/strings.cpp | 32 ++++++++++++++++++++ src/table/control_codes.h | 1 + src/table/strgen_tables.h | 1 + src/vehicle_gui.cpp | 35 ++++------------------ 66 files changed, 322 insertions(+), 337 deletions(-) diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index d153a169f3..a889ab3d82 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -54,6 +54,16 @@ static EngineID GetNextArticulatedPart(uint index, EngineID front_type, Vehicle return GetNewEngineID(front_engine->GetGRF(), front_engine->type, callback); } +/** + * Does a NewGRF report that this should be an articulated vehicle? + * @param engine_type The engine to check. + * @return True iff the articulated engine callback flag is set. + */ +bool IsArticulatedEngine(EngineID engine_type) +{ + return HasBit(EngInfo(engine_type)->callback_mask, CBM_VEHICLE_ARTIC_ENGINE); +} + /** * Count the number of articulated parts of an engine. * @param engine_type The engine to get the number of parts of. diff --git a/src/articulated_vehicles.h b/src/articulated_vehicles.h index f9df46b080..46b4da3744 100644 --- a/src/articulated_vehicles.h +++ b/src/articulated_vehicles.h @@ -23,6 +23,7 @@ uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_car uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type); bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *cargo_type); bool IsArticulatedVehicleRefittable(EngineID engine); +bool IsArticulatedEngine(EngineID engine_type); void CheckConsistencyOfArticulatedVehicle(const Vehicle *v); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 771f8227dc..127bcf0dbd 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1886,8 +1886,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Af STR_STATION_BUILD_COVERAGE_ON :{BLACK}Aan STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Moenie die dekking area van die voorgestelde bouterrein verlig nie STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Verlig dekking area van die voorgestelde bouterrein -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aanvaar: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Voorraad: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aanvaar: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Voorraad: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Sluit by stasie aan @@ -2586,7 +2586,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Aanvaar STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Wys lys van aanvaarde vrag -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aanvaar: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aanvaar: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Graderings STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Toon stasie graderings @@ -2829,9 +2829,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Gewig: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kos: {GOLD}{CURRENCY_LONG}{BLACK} Spoed: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapasiteit: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Self Krag Waens: {GOLD}+{POWER}{BLACK} Gewig: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Herpasbaar na: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Herpasbaar na: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alle vrag tipes -STR_PURCHASE_INFO_ALL_BUT :Alles behalwe {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alles behalwe {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. Traktiewe Poging: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Trein voertuig keuse lys - kliek op voertuig vir inligting diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 762fe45f60..bb0bc6ab2c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1928,8 +1928,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}غلق STR_STATION_BUILD_COVERAGE_ON :{BLACK}فتح STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}لا توضح منطقة التغطية للموقح المقترح STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}وضح منطقة التغطيةللموقع المقترح -STR_STATION_BUILD_ACCEPTS_CARGO :{GOLD}{STRING}{BLACK}يقبل: -STR_STATION_BUILD_SUPPLIES_CARGO :{GOLD}{STRING}{BLACK}الموارد: +STR_STATION_BUILD_ACCEPTS_CARGO :{GOLD}{CARGO_LIST}{BLACK}يقبل: +STR_STATION_BUILD_SUPPLIES_CARGO :{GOLD}{CARGO_LIST}{BLACK}الموارد: # Join station window STR_JOIN_STATION_CAPTION :{WHITE}اربط المحطات @@ -2671,7 +2671,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}يستقبل STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}عرض لائحة بالبضائع المقبولة -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}يقبل: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}يقبل: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}معدل النقل STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}اظهار معدل النقل للمحطة @@ -2893,9 +2893,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}الوز STR_PURCHASE_INFO_COST_SPEED :{BLACK}التكلفة: {GOLD}{CURRENCY_LONG}{BLACK} السرعة : {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK} السعة {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK} العربات ذات الطاقة: {GOLD}+{POWER}{BLACK} الوزن: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}يمكن تعديلها الى: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}يمكن تعديلها الى: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :كل انواع الحمولة -STR_PURCHASE_INFO_ALL_BUT :الكل الا {GOLD} +STR_PURCHASE_INFO_ALL_BUT :الكل الا {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}تأثير الجذب القصى: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}قائمة اختيار القطارات - اضغط على العربة لعرض معلوماتها diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index f52a022b23..4a3c4a45f0 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -2279,8 +2279,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Выкл STR_STATION_BUILD_COVERAGE_ON :{BLACK}Укл. STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Не паказваць зону пакрыцьця STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Паказваць зону пакрыцьця -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Прымае: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Прапаноўвае: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Прымае: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Прапаноўвае: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Аб'яднаць станцыі @@ -3059,7 +3059,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Прымае STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Паказаць сьпіс прымаемых грузаў -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Прымае: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Прымае: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Рэйтынг STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Паказаць рэйтынг станцыі @@ -3304,9 +3304,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Вага STR_PURCHASE_INFO_COST_SPEED :{BLACK}Кошт: {GOLD}{CURRENCY_LONG}{BLACK} Хуткасьць: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Ёмістасьць: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Маторныя вагоны: {GOLD}+{POWER}{BLACK} Вага: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Пераабст. для: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Пераабст. для: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Усе тыпы грузаў -STR_PURCHASE_INFO_ALL_BUT :Усё, акрамя {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Усё, акрамя {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс. цягавае намаганьне: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Далёкасьць: {GOLD}{COMMA} клет{P ка кi ак} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 1092081fa7..86ec48d6c2 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Desativa STR_STATION_BUILD_COVERAGE_ON :{BLACK}Ativar STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Não destacar área de cobertura da construção proposto STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Destacar área de cobertura da construção proposta -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceita: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Suprimentos: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceita: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Suprimentos: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Unir estação @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Aceita STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Exibir lista de carga aceita -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceita: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceita: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Avaliações STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Exibir avaliações da estação @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Preço: {GOLD}{CURRENCY_LONG}{BLACK} Velocidade: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacidade: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagões energizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Adaptável para: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Adaptável para: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Todos as cargas -STR_PURCHASE_INFO_ALL_BUT :Todas menos {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Todas menos {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Tração máx : {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Alcance: {GOLD}{COMMA} quadrados diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index a550ec4b4b..f663819a1c 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1889,8 +1889,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Изкл STR_STATION_BUILD_COVERAGE_ON :{BLACK}Включен STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Не отбелязвай зоната от предложеното място STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Отбележи зоната от предложеното място -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Приема: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Запаси: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Приема: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Запаси: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Присъедини станцията @@ -2609,7 +2609,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Приема STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Покажи списък с приетите товари -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Приема: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Приема: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Рейтинги STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Покажи нивото на обслужване @@ -2829,9 +2829,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Тегл STR_PURCHASE_INFO_COST_SPEED :{BLACK}Цема {GOLD}{CURRENCY_LONG}{BLACK} Скорост: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Капацитет: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Вагони с мощност: {GOLD}+{POWER}{BLACK} Тегло: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Преобразуваем на: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Преобразуваем на: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Всички видове товар -STR_PURCHASE_INFO_ALL_BUT :Всичко освен {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Всичко освен {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс. теглеща сила: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Списък с влакове - натисни върху влак за информация diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 08cf277f53..ab8f70aca7 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Inactiu STR_STATION_BUILD_COVERAGE_ON :{BLACK}Actiu STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}No marcar l'àrea de cobertura del lloc proposat STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Marcar l'àrea de cobertura del lloc proposat -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepta: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provisions: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepta: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provisions: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Ajuntar estació @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepta STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Mostra la llista de càrregues admeses -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepta: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepta: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ratis STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Mostra els ratis de l'estació @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Pes: {GO STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Velocitat: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacitat: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagons Automotrius: {GOLD}+{POWER}{BLACK} Pes: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Remodelable a: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Remodelable a: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Totes les càrregues -STR_PURCHASE_INFO_ALL_BUT :Tots menys {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Tots menys {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Esforç de Tracció: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Abast: {GOLD}{COMMA} cel·les diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 5b7fa1d606..72d1195259 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2042,8 +2042,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Isključ STR_STATION_BUILD_COVERAGE_ON :{BLACK}Uključeno STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nemoj označiti područje koje pokriva željeno mjesto STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Označi područje koje pokriva željeno mjesto -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prihvaća: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Zalihe: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prihvaća: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Zalihe: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Spoji postaju @@ -2818,7 +2818,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Prihvaća STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Pokaži popis tereta koji se prihvaća -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Prihvaća: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Prihvaća: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ocjene STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Pokaži ocjene postaje @@ -3063,9 +3063,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Težina: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Trošak: {GOLD}{CURRENCY_LONG}{BLACK} Brzina: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Nosivost: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK} Pokretni vagoni:.{GOLD}+{POWER}{BLACK} Težina: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prenamjenjivo u: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prenamjenjivo u: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Sve vrste tereta -STR_PURCHASE_INFO_ALL_BUT :Sve osim {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Sve osim {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK} Maks. vučni napor: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Domet: {GOLD}{COMMA} pločica diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 4f2e87b319..a3201bdf06 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2020,8 +2020,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Vypnuto STR_STATION_BUILD_COVERAGE_ON :{BLACK}Zapnuto STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nezvýrazňovat oblast pokrytí STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Zvýraznit oblast pokrytí -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Přijímá: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Poskytuje: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Přijímá: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Poskytuje: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Spojování stanic @@ -2781,7 +2781,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Přijímá STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Ukázat seznam přijímaného nákladu -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Přijímá: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Přijímá: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Hodnocení STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Ukázat hodnocení společností @@ -3026,9 +3026,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Hmotnost STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Rychlost: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacita: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Poháněné vagony: {GOLD}+{POWER}{BLACK} Hmotnost: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refitovatelné na: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refitovatelné na: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Všechny druhy nákladu -STR_PURCHASE_INFO_ALL_BUT :Všechny kromě {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Všechny kromě {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. tažná síla: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Seznam vlaků - stiskni na vlaku pro informace diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 1b7c16f83a..5edd12e3ef 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Fra STR_STATION_BUILD_COVERAGE_ON :{BLACK}Til STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Marker ikke dækningsområdet af den foreslåede placering STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Marker dækningsområdet af den foreslåede placering -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepterer: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Forsyninger: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepterer: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Forsyninger: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Sammenkæd station @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepterer STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Vis liste over accepteret last -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepterer: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepterer: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Bedømmelse STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Vis stationens bedømmelse @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Vægt: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Pris: {GOLD}{CURRENCY_LONG}{BLACK} Hastighed: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacitet: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Motoriserede Vogne: {GOLD}+{POWER}{BLACK} Vægt: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Kan ombygges til: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Kan ombygges til: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alle lasttyper -STR_PURCHASE_INFO_ALL_BUT :Alle undtagen {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alle undtagen {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. trækkraft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Rækkevidde: {GOLD}{COMMA} felter diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index a06ddd32d6..578f194b1b 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Uit STR_STATION_BUILD_COVERAGE_ON :{BLACK}Aan STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Markeer het dekkingsgebied van de voorgestelde locatie niet STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Markeer het dekkingsgebied van de voorgestelde locatie -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepteert: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Biedt aan: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepteert: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Biedt aan: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Station samenvoegen @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepteert STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Laat lijst van gevraagde goederen zien -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepteert: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepteert: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Rangen STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Bekijk stationsreputaties @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Gewicht: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kosten: {GOLD}{CURRENCY_LONG}{BLACK} Snelheid: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capaciteit: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Aangedreven wagons: {GOLD}+{POWER}{BLACK} Gewicht: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Om te bouwen voor: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Om te bouwen voor: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alle vrachttypen -STR_PURCHASE_INFO_ALL_BUT :Alles behalve {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alles behalve {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. trekkracht: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Bereik: {GOLD}{COMMA} tegels diff --git a/src/lang/english.txt b/src/lang/english.txt index 0f919a9d60..940eb57ae6 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't highlight coverage area of proposed site STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{RAW_STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{RAW_STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepts STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Show list of accepted cargo -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepts: {WHITE}{RAW_STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepts: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ratings STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Show station ratings @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Weight: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Speed: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacity: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Powered Wagons: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD}{STRING2} STR_PURCHASE_INFO_ALL_TYPES :All cargo types -STR_PURCHASE_INFO_ALL_BUT :All but {GOLD} +STR_PURCHASE_INFO_ALL_BUT :All but {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Tractive Effort: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Range: {GOLD}{COMMA} tiles @@ -4422,6 +4422,7 @@ STR_JUST_CHECKMARK :{CHECKMARK} STR_JUST_COMMA :{COMMA} STR_JUST_CURRENCY_SHORT :{CURRENCY_SHORT} STR_JUST_CURRENCY_LONG :{CURRENCY_LONG} +STR_JUST_CARGO_LIST :{CARGO_LIST} STR_JUST_INT :{NUM} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_SHORT :{DATE_SHORT} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 67d22171b2..0660a8bf8b 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't highlight coverage area of proposed site STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepts STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Show list of accepted cargo -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepts: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepts: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ratings STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Show station ratings @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Weight: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Speed: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacity: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Powered Wagons: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :All cargo types -STR_PURCHASE_INFO_ALL_BUT :All but {GOLD} +STR_PURCHASE_INFO_ALL_BUT :All but {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Tractive Effort: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Range: {GOLD}{COMMA} tiles diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 6abc8ca2c8..d54ae7f605 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't highlight coverage area of proposed site STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepts STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Show list of accepted cargo -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepts: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepts: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ratings STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Show station ratings @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Weight: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Speed: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacity: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Powered Wagons: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :All cargo types -STR_PURCHASE_INFO_ALL_BUT :All but {GOLD} +STR_PURCHASE_INFO_ALL_BUT :All but {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Tractive Effort: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Range: {GOLD}{COMMA} tiles diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 600d027d01..9f1b94e39c 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1885,8 +1885,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Malaktiv STR_STATION_BUILD_COVERAGE_ON :{BLACK}Aktiva STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ne marku ŝarĝregionon de proponata loko STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Marku ŝarĝregionon ĉe proponata loko -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Akceptiĝas: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provizoj: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Akceptiĝas: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provizoj: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Ligi stacion @@ -2559,7 +2559,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Akceptas STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Montri liston de akceptataj ŝarĝoj. -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Akceptiĝas: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Akceptiĝas: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Takso STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Montru stacian takson @@ -2780,9 +2780,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Pezo: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kosto: {GOLD}{CURRENCY_LONG}{BLACK} Rapido: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Enhaveco: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagonfortoj: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Transformebla al: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Transformebla al: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Ĉiaj ŝarĝoj -STR_PURCHASE_INFO_ALL_BUT :Ĉio krom {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Ĉio krom {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maksimuma Tiro: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Trajnveturila elektolisto - alklaku veturilon por informoj diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 0aa7c621c2..355d9a0560 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2003,8 +2003,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Väljas STR_STATION_BUILD_COVERAGE_ON :{BLACK}Sees STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Lülita välja jaama mõjupiirkonna näitamine 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}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tarnib: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Võtab vastu: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tarnib: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Liida jaamale @@ -2779,7 +2779,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Võtab vastu STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Näita vastuvõetavate veoste nimistut -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Võtab vastu: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Võtab vastu: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Hinnangud STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Näita jaamahinnangut @@ -3024,9 +3024,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Mass: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Hind: {GOLD}{CURRENCY_LONG}{BLACK} Tippkiirus: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kandevõime: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Kiirendavad vagunid: {GOLD}+{POWER}{BLACK} Mass: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ümberseadistatav: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ümberseadistatav: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Kõik kaubatüübid -STR_PURCHASE_INFO_ALL_BUT :Kõik, välja arvatud {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Kõik, välja arvatud {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Suurim veojõud: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Tegevusradius: {GOLD}{COMMA} ruutu diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 6e3ddba368..da3600b187 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}pois STR_STATION_BUILD_COVERAGE_ON :{BLACK}päällä STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Älä korosta ehdotetun tontin vaikutusaluetta. STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Korosta ehdotetun tontin vaikutusalue. -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Vastaanottaa: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tuottaa: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Vastaanottaa: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tuottaa: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Liitä asema @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Ottaa vastaan STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Näytä luettelo vastaanotettavasta rahdista. -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Vastaanottaa: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Vastaanottaa: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Arviot STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Näytä aseman arviot. @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Paino: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Hinta: {GOLD}{CURRENCY_LONG}{BLACK} Nopeus: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapasiteetti: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Moottoroidut vaunut: {GOLD}+{POWER}{BLACK} Paino: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Sovitettavissa: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Sovitettavissa: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Kaikki rahtityypit -STR_PURCHASE_INFO_ALL_BUT :Kaikki paitsi {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Kaikki paitsi {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Suurin vääntömomentti: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Toimintasäde: {GOLD}{COMMA} ruutua diff --git a/src/lang/french.txt b/src/lang/french.txt index b87e999bf1..fb0776c1cb 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Désacti STR_STATION_BUILD_COVERAGE_ON :{BLACK}Activé STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ne pas afficher la zone couverte STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Afficher la zone couverte -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepte{NBSP}: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fournit{NBSP}: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepte{NBSP}: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fournit{NBSP}: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Joindre une station @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepte STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Afficher les marchandises acceptées -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepte{NBSP}: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepte{NBSP}: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Qualité STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Afficher la qualité de service de la station @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Poids{NB STR_PURCHASE_INFO_COST_SPEED :{BLACK}Prix{NBSP}: {GOLD}{CURRENCY_LONG}{BLACK} − Vitesse{NBSP}: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacité{NBSP}: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Wagons motorisés{NBSP}: {GOLD}+{POWER}{BLACK} − Poids{NBSP}: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Réaménageable pour{NBSP}: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Réaménageable pour{NBSP}: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Tous les types de cargaison -STR_PURCHASE_INFO_ALL_BUT :Tous sauf {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Tous sauf {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Effort de traction max.{NBSP}: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Rayon d'action{NBSP}: {GOLD}{COMMA} cases diff --git a/src/lang/galician.txt b/src/lang/galician.txt index bb857edb76..8b80d82cd5 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1809,8 +1809,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Non resalta-la área de cobertura do sitio proposto STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Resalta-la área de cobertura do sitio proposto -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acepta: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Suministros: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acepta: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Suministros: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Unir estación @@ -2444,7 +2444,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Acepta STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Mostrar a lista da carga aceptada -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acepta: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acepta: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Puntuacións: STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Mostra-las puntuacións da estación @@ -2660,9 +2660,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Custo: {GOLD}{CURRENCY_LONG}{BLACK} Velocidade: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacidade: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagóns tractores: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Actualizable a: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Actualizable a: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Tódolos tipos de carga -STR_PURCHASE_INFO_ALL_BUT :Todo excepto {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Todo excepto {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Esforzo Max. de Tracción: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Lista de selección de vehículos para trens - pincha nun vehículo para máis información diff --git a/src/lang/german.txt b/src/lang/german.txt index 3e9d72b769..2f320e4189 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}aus STR_STATION_BUILD_COVERAGE_ON :{BLACK}an STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Einzugsgebiet nicht angezeigen STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Einzugsgebiet anzeigen -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Nimmt an: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Liefert: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Nimmt an: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Liefert: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Verbinde mit Station @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Angenommen STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Zeige Liste der angenommenen Frachtarten -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Nimmt an: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Nimmt an: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Bewertung STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Stationsbewertung anzeigen @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Gewicht: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kosten: {GOLD}{CURRENCY_LONG}{BLACK} Geschw.: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapazität: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Angetriebene Waggons: {GOLD}+{POWER}{BLACK} Gewicht: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Umrüstbar auf: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Umrüstbar auf: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alle Frachtarten -STR_PURCHASE_INFO_ALL_BUT :Alles außer {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alles außer {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Zugkraft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Reichweite: {GOLD}{COMMA} Felder diff --git a/src/lang/greek.txt b/src/lang/greek.txt index aca981209b..6df785bb93 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -2008,8 +2008,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ανεν STR_STATION_BUILD_COVERAGE_ON :{BLACK}Ενεργό STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Μη εμφάνιση κάλυψης του προτεινούμενου τόπου STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Εμφάνιση κάλυψης του προτεινούμενου τόπου -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Δέχεται: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Προμηθεύει : {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Δέχεται: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Προμηθεύει : {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Συνενώση σταθμού @@ -2721,7 +2721,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Δέχεται STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Εμφάνιση λίστας αποδεκτών φορτίων -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Δέχεται: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Δέχεται: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Βαθμολογίες STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Εμφάνιση στατιστικών σταθμού @@ -2955,9 +2955,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Βάρο STR_PURCHASE_INFO_COST_SPEED :{BLACK}Κόστος: {GOLD}{CURRENCY_LONG}{BLACK} Ταχύτητα: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Χωρητικότητα: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Ενισχυμένα βαγόνια: {GOLD}+{POWER}{BLACK} Βάρος: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Μετατρέψιμο σε: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Μετατρέψιμο σε: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Όλοι οι τύποι εμπορεύματος -STR_PURCHASE_INFO_ALL_BUT :Όλα εκτός {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Όλα εκτός {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Μεγ. Δύναμη Έλξης: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Λίστα επιλεγμένων βαγονιών τρένων - κάντε κλικ σε ένα βαγόνι για πληροφορίες diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index bb79be5446..21f8ea0d4b 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1860,8 +1860,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}מופס STR_STATION_BUILD_COVERAGE_ON :{BLACK}מופעל STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}בטל הדגשת השטח המכוסה ע"י התחנה STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}הדגש את השטח המכוסה ע"י התחנה -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}מקבלת: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}מספקת: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}מקבלת: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}מספקת: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}חבר לתחנה קיימת @@ -2513,7 +2513,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}מקבל STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}הצג רשימת סוגי המטען שהתחנה מקבלת -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}מקבלת: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}מקבלת: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}דירוג STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}הצג את דירוג השירות @@ -2733,9 +2733,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}משקל STR_PURCHASE_INFO_COST_SPEED :{GOLD}{1:VELOCITY}{BLACK} : מהירות {GOLD}{0:CURRENCY_LONG} {BLACK} :מחיר STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}קיבולת: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}קרונות ממונעים: {GOLD}+{POWER}{BLACK} משקל: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK} :ניתן להתאים ל{GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK} :ניתן להתאים ל{GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :כל סוגי המטען -STR_PURCHASE_INFO_ALL_BUT :{GOLD} כל סוגי המטען למעט +STR_PURCHASE_INFO_ALL_BUT :{CARGO_LIST} כל סוגי המטען למעט STR_PURCHASE_INFO_MAX_TE :{BLACK}כוח סחיבה מקסימלי: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK} בחירת קרונות - לחץ על קרון לקבלת מידע diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index ac0b4e8a0a..f3811f602f 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2010,8 +2010,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ki STR_STATION_BUILD_COVERAGE_ON :{BLACK}Be STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Az állomással lefedett terület elrejtése STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Az állomással lefedett terület mutatása (vonzáskörzet) -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Elfogad:{GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Termel: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Elfogad:{GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Termel: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Állomás egyesítése @@ -2786,7 +2786,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Elfogadás STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Az elfogadott áruk listájának mutatása -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Elfogad:{WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Elfogad:{WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Vélemény STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Vélemény megmutatása az állomásról @@ -3031,9 +3031,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Súly: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Ár: {GOLD}{CURRENCY_LONG}{BLACK} Sebesség: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacitás: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Meghajtott vagonok: {GOLD}+{POWER}{BLACK} Súly: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Átalakítható: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Átalakítható: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Minden rakomány típusra -STR_PURCHASE_INFO_ALL_BUT :Mindenre, kivéve {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Mindenre, kivéve {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maximális vonóerő: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Hatótávolság: {GOLD}{COMMA} mező diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0901403c44..ad0fbd25db 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1854,8 +1854,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Fela STR_STATION_BUILD_COVERAGE_ON :{BLACK}Sýna STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ekki sýna svæði sem tilheyrir stöð STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Sýna svæði sem tilheyrir stöð -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Móttekur: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Birgðir: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Móttekur: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Birgðir: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Tengja stöðvar @@ -2546,7 +2546,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Tekur við STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Sýna lista yfir móttækilegan varning -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Móttekur: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Móttekur: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Einkunn STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Sýna einkunn stöðvar @@ -2764,9 +2764,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Þyngd: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Verð: {GOLD}{CURRENCY_LONG}{BLACK} Hámarkshraði: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Burðargeta: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Drifvagnar: {GOLD}+{POWER}{BLACK} Þyngd: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Hægt að breyta farmi í: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Hægt að breyta farmi í: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Allar tegundir farms -STR_PURCHASE_INFO_ALL_BUT :Allt nema {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Allt nema {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Hámarks : {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Lestarlisti - smelltu á farartæki fyrir meiri upplýsingar diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 5952647b6a..480ca4a8fb 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1945,8 +1945,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Non-akti STR_STATION_BUILD_COVERAGE_ON :{BLACK}Aktif STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Jangan soroti area yang dapat dilayani dari lokasi yang hendak dibangun STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Soroti area yang dapat dilayani dari lokasi yang hendak dibangun -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Menerima: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Suplai: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Menerima: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Suplai: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Gabung stasiun @@ -2696,7 +2696,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Menerima STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Tampilkan daftar kargo yang bisa diterima -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Menerima: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Menerima: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Peringkat STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Tampilkna peringkat dari stasiun @@ -2941,9 +2941,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Berat: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Biaya: {GOLD}{CURRENCY_LONG}{BLACK} Kecepatan: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Daya Muat: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Daya Gerbong: {GOLD}+{POWER}{BLACK} Berat: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Kargo dapat di ganti untuk: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Kargo dapat di ganti untuk: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Semua jenis kargo -STR_PURCHASE_INFO_ALL_BUT :Semua tapi tidak untuk {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Semua tapi tidak untuk {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Traksi Maks.: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Jangkauan: {GOLD}{COMMA} kotak diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 78f9d98f1b..84de783690 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -1879,8 +1879,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}As STR_STATION_BUILD_COVERAGE_ON :{BLACK}Ar siúl STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ná haibhsigh an limistéar clúdaigh don suíomh beartaithe STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Aibhsigh an limistéar clúdaigh don suíomh beartaithe -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Glactar le: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Soláthar: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Glactar le: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Soláthar: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Ceangail stáisiún @@ -2576,7 +2576,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Glactar le STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Taispeáin liosta den lastas a ghlactar leis -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Glactar le: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Glactar le: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Rátálacha STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Taispeáin rátálacha na stáisiún @@ -2796,9 +2796,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Meáchan STR_PURCHASE_INFO_COST_SPEED :{BLACK}Costas: {GOLD}{CURRENCY_LONG}{BLACK} Luas: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Toilleadh: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vaigíní faoi Chumhacht: {GOLD}+{POWER}{BLACK} Meáchan: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Is féidir athfheistiú go: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Is féidir athfheistiú go: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Gach cineál lastais -STR_PURCHASE_INFO_ALL_BUT :Gach rud seachas {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Gach rud seachas {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Iarracht uasta tarraingthe: {GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Liosta chun feithicil traenach a roghnú - cliceáil ar fheithicil le faisnéis a fháil diff --git a/src/lang/italian.txt b/src/lang/italian.txt index c78a79abee..866ea4eb7b 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1970,8 +1970,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Non evidenziare l'area di copertura del sito proposto STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Evidenzia l'area di copertura del sito proposto -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accetta: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fornisce: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accetta: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fornisce: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Unisci stazione @@ -2750,7 +2750,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accetta STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Mostra la lista delle merci accettate -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accetta: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accetta: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Valutazione STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Mostra la valutazione della stazione @@ -2995,9 +2995,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Costo: {GOLD}{CURRENCY_LONG}{BLACK} Velocità: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacità: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagoni motorizzati: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Riadattabile per: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Riadattabile per: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Tutti i tipi di carico -STR_PURCHASE_INFO_ALL_BUT :Tutto tranne {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Tutto tranne {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Sforzo di trazione massimo: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Autonomia: {GOLD}{COMMA} riquadr{P o i} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index a6415f14e7..a4bcd8fcf8 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1893,8 +1893,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}切 STR_STATION_BUILD_COVERAGE_ON :{BLACK}入 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}駅の受入れる地域をハイライトしません STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}駅の受入れる地域をハイライトします -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}受入れ貨物：{GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}供給: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}受入れ貨物：{GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}供給: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}駅を統合 @@ -2596,7 +2596,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}（{1:S STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}受入れ貨物 STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}受入れる貨物のリストを表示します -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}受入れ貨物：{WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}受入れ貨物：{WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}評価 STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}駅の評価を表示します @@ -2821,9 +2821,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}重量 STR_PURCHASE_INFO_COST_SPEED :{BLACK}価格：{GOLD}{CURRENCY_LONG}{BLACK}　最大速度：{GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}収容能力：{GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}動力貨車：{GOLD}+{POWER}{BLACK}　重量：{GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}再装備の貨物種類：{GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}再装備の貨物種類：{GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :すべて -STR_PURCHASE_INFO_ALL_BUT :{GOLD}を除いてすべて +STR_PURCHASE_INFO_ALL_BUT :{CARGO_LIST}を除いてすべて STR_PURCHASE_INFO_MAX_TE :{BLACK}最大牽引力：{GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}列車のリスト - 情報を見るには列車をクリックします diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 8c9868a5f3..4141410ce1 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}끄기 STR_STATION_BUILD_COVERAGE_ON :{BLACK}켜기 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}역세권을 하이라이트하지 않습니다. STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}역세권을 하이라이트합니다. -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}받음: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}공급: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}받음: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}공급: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}같은 이름으로 정거장 만들기 @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({1:STA STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}받음 STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}받는 화물의 목록 표시 -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}받음: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}받음: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}등급 STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}역의 등급 표시 @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}중량: STR_PURCHASE_INFO_COST_SPEED :{BLACK}가격: {GOLD}{CURRENCY_LONG}{BLACK} 속력: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}수용량: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}전원 화물차: {GOLD}+{POWER}{BLACK} 중량: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}개조가능 화물: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}개조가능 화물: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :모든 종류의 화물 -STR_PURCHASE_INFO_ALL_BUT :{GOLD}을 제외한 모든 화물 +STR_PURCHASE_INFO_ALL_BUT :{CARGO_LIST}을 제외한 모든 화물 STR_PURCHASE_INFO_MAX_TE :{BLACK}최고 견인 효과: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}항속거리: {GOLD}{COMMA} 칸 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index e42318ff07..8288164bf0 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1948,8 +1948,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Nav STR_STATION_BUILD_COVERAGE_ON :{BLACK}Ir STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Neiezīmēt jaunceļamā objekta pārklājumu STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Iezīmēt jaunceļamā objekta pārklājumu -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Pieņem: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Piegādā: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Pieņem: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Piegādā: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Pievienot staciju @@ -2730,7 +2730,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Pieņem STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Rādīt pieņemamo kravu sarakstu -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Pieņem: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Pieņem: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Vērtējumi STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Rādīt stacijas vērtējumu @@ -2976,9 +2976,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Svars: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Ātrums: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Ietilpība: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Motorvagoni: {GOLD}+{POWER}zs{BLACK} Svars: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Pielāgojams uz: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Pielāgojams uz: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Visi kravu veidi -STR_PURCHASE_INFO_ALL_BUT :Visu izņemot {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Visu izņemot {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maksimālais vilces spēks: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Apgabas: {GOLD}{COMMA} lauciņi diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 2f0987dcba..71e66f8485 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2021,8 +2021,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Išjungt STR_STATION_BUILD_COVERAGE_ON :{BLACK}Įjungta STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nerodyti stotelės aptarnaujamos teritorijos STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Rodyti stotelės aptarnaujamą teritoriją -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Priima: {GOLD}{STRING.ka} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tiekia: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Priima: {GOLD}{CARGO_LIST.ka} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tiekia: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Sujungti stotį @@ -2797,7 +2797,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Priima STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Rodyti priimamų krovinių sąrašą -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Priima: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Priima: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Reitingai STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Parodyti stotelės reitingus @@ -3042,9 +3042,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Svoris: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kaina: {GOLD}{CURRENCY_LONG}{BLACK} Greitis: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Talpa: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Pajungta vagonų: {GOLD}+{POWER}{BLACK} Svoris: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Galima pertvarkyti {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Galima pertvarkyti {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :visiems krovinių tipams -STR_PURCHASE_INFO_ALL_BUT :visiems krovinių tipams, išskyrus {GOLD} +STR_PURCHASE_INFO_ALL_BUT :visiems krovinių tipams, išskyrus {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Didž. traukos jėga: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Nuotolis: {GOLD}{COMMA} langeliai diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 31c492753b..b74ed6302c 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1945,8 +1945,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Aus STR_STATION_BUILD_COVERAGE_ON :{BLACK}Un STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Weis d'Reechwäit vun dem Gebäi net un STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Weis d'Reechwäit vun dem Gebäi un -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acceptéiert: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Liwwerung: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acceptéiert: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Liwwerung: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}D'Gare verbannen @@ -2721,7 +2721,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Acceptéiert STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Weis d'Lëscht vun den acceptéierten Wueren -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acceptéiert: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acceptéiert: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Bewertungen STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Weis d'Statiounsbewertungen @@ -2966,9 +2966,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Gewiicht STR_PURCHASE_INFO_COST_SPEED :{BLACK}Käschten: {GOLD}{CURRENCY_LONG}{BLACK} Geschw.: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapazitéit: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Ugedriwwen Wagonen: {GOLD}+{POWER}{BLACK} Gewiicht: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Embaubaur zu: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Embaubaur zu: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :All Typ Wueren -STR_PURCHASE_INFO_ALL_BUT :Alles ausser {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alles ausser {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Zéikraaft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Distanz: {GOLD}{COMMA} Felder diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 66309aad72..66db8b326d 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -1936,8 +1936,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Tiada STR_STATION_BUILD_COVERAGE_ON :{BLACK}Ada STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Jangan serlahkan kawasan liputan tapak yang dicadangkan STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Serlahkan kawasan liputan tapak yang dicadangkan -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Menerima: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Bekalan-berkalan: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Menerima: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Bekalan-berkalan: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Gabungkan stesen @@ -2682,7 +2682,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Terima STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Tunjukkan senarai kargo yang diterima -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Menerima: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Menerima: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Penarafan STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Tunjukkan penarafan stesen @@ -2927,9 +2927,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Berat: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kos: {GOLD}{CURRENCY_LONG}{BLACK} Kelajuan: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Muatan: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Gerabak Berkuasa: {GOLD}+{POWER}{BLACK} Berat: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ubahsuai kepada: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ubahsuai kepada: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Semua jenis kargo -STR_PURCHASE_INFO_ALL_BUT :Semua kecuali {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Semua kecuali {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Usaha Penarikan Maks.: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Jarak: {GOLD}{COMMA} petak diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 328bbe03ff..718038502d 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1948,8 +1948,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Av STR_STATION_BUILD_COVERAGE_ON :{BLACK}På STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ikke marker dekningsområdet til den foreslåtte plasseringen STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Marker dekningsområdet til den foreslåtte plasseringen -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Godtar: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tilbyr: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Godtar: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tilbyr: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Slå sammen stasjoner @@ -2724,7 +2724,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Godtar STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Vis liste over godtatte varer -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Godtar: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Godtar: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Vurderinger STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Vis stasjonsvurdering @@ -2969,9 +2969,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Vekt: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kostnad: {GOLD}{CURRENCY_LONG}{BLACK} Hastighet: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapasitet: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Lokomotivvogner: {GOLD}+{POWER}{BLACK} Vekt: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Kan bygges om til: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Kan bygges om til: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alle varetyper -STR_PURCHASE_INFO_ALL_BUT :Alt utenom {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alt utenom {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks trekkraft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Rekkevidde: {GOLD}{COMMA} ruter diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 020c5b1e46..65cc9ce8d8 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1948,8 +1948,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Av STR_STATION_BUILD_COVERAGE_ON :{BLACK}På STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Gøym dekningsområdet til den foreslåtte plasseringa STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Syne dekningsområdet til den foreslåtte plasseringa -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Godtek: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Forsyningar: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Godtek: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Forsyningar: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Spleisa stasjonen @@ -2724,7 +2724,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Aksepterer STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Syne liste over godtekne varer -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Godtek: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Godtek: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Vurderingar STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Syne stasjonsvurdering @@ -2969,9 +2969,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Vekt: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kostnad: {GOLD}{CURRENCY_LONG}{BLACK} Hastigheit: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapasitet: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Lokomotivvogner: {GOLD}+{POWER}{BLACK} Vekt: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ombyggbart til: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ombyggbart til: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alle varetypar -STR_PURCHASE_INFO_ALL_BUT :Alt utanom {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Alt utanom {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. trekkraft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Rekkevidde: {GOLD}{COMMA} ruter diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 1fcb64ab67..4b18126b65 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2326,8 +2326,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Wył. STR_STATION_BUILD_COVERAGE_ON :{BLACK}Wł. STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nie podświetlaj zasięgu projektowanej stacji STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Podświetl zasięg projektowanej stacji -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Akceptuje: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Zasoby: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Akceptuje: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Zasoby: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Połącz stację @@ -3102,7 +3102,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Akceptuje STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Pokaż listę akceptowanych ładunków -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Akceptuje: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Akceptuje: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Oceny STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Pokaż ocenę stacji @@ -3347,9 +3347,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Waga: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Koszt: {GOLD}{CURRENCY_LONG}{BLACK} Prędkość: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Pojemność: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Moc: {GOLD}+{POWER}{BLACK} Waga: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Można przebudować na: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Można przebudować na: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Wszystkie typy ładunków -STR_PURCHASE_INFO_ALL_BUT :Wszystko oprócz {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Wszystko oprócz {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Siła Pociągowa: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Zasięg: {GOLD}{COMMA} pól diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 7929cef987..f313eafc60 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off STR_STATION_BUILD_COVERAGE_ON :{BLACK}On STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Não exibir área de cobertura do sítio proposto STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Exibir área de cobertura do sítio proposto -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceita: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fornecimentos: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceita: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fornecimentos: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Juntar estação @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Aceita STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Mostrar lista de carga aceite -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceita: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceita: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Avaliações STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Mostrar avaliações da estação @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Custo: {GOLD}{CURRENCY_LONG}{BLACK} Velocidade: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacidade: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagões Motorizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reconvertível para: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reconvertível para: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Todos os tipos de carga -STR_PURCHASE_INFO_ALL_BUT :Todas menos {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Todas menos {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Máx. Força de Tracção: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Alcance: {GOLD}{COMMA} quadrados diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index e8969b9000..cadb485522 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Inactiv STR_STATION_BUILD_COVERAGE_ON :{BLACK}Activ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nu arăta aria de acoperire a locaţiei propuse STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Arată aria de acoperire a locaţiei propuse -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acceptă: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Resurse: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acceptă: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Resurse: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Uneşte staţia @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Acceptă STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Afişează lista de încărcături acceptate -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acceptă: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acceptă: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Evaluări STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Afişează evaluările staţiei @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Greutate STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Viteză: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacitate: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagoane electrificate: {GOLD}+{POWER}{BLACK} Greutate: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modificabil pentru: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modificabil pentru: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Toate tipurile de mărfuri -STR_PURCHASE_INFO_ALL_BUT :Toate, cu excepţia {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Toate, cu excepţia {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Efort tractor max.: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Rază acțiune: {GOLD}{COMMA} pătrățele diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 78a9b89563..632067f482 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2118,8 +2118,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Выкл STR_STATION_BUILD_COVERAGE_ON :{BLACK}Вкл STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Не показывать зону покрытия STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Показывать зону покрытия -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Принимается: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Отправляется: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Принимается: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Отправляется: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Объединить станции @@ -2906,7 +2906,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Принимает STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Показать список принимаемых грузов -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Принимается: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Принимается: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Рейтинг STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Показать рейтинг станции @@ -3151,9 +3151,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Вес: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Цена: {GOLD}{CURRENCY_LONG}{BLACK} Скорость: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Ёмкость: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Ведущие вагоны: {GOLD}+{POWER}{BLACK} Вес: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Может перевозить: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Может перевозить: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Все типы грузов -STR_PURCHASE_INFO_ALL_BUT :Всё, кроме {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Всё, кроме {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс. тяговое усилие: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Дальность: {GOLD}{COMMA} клет{P ка ки ок} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index ae37b6f388..9c2631f2ec 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -2141,8 +2141,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Isključ STR_STATION_BUILD_COVERAGE_ON :{BLACK}Uključeno STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Isključi označavanje zahvaćenog područja STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Uključi označavanje zahvaćenog područja -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prihvata: {GOLD}{STRING.aku} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Snadbeva: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prihvata: {GOLD}{CARGO_LIST.aku} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Snadbeva: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Pridruži stanicu @@ -2917,7 +2917,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Prihvata STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Prikaži spisak tovara koje stanica prihvata -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Prihvata: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Prihvata: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ocene STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Prikaži ocene stanice @@ -3162,9 +3162,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Težina: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Brzina: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Nosivost: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Motorni vagoni: {GOLD}+{POWER}{BLACK} Težina: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prepravljivo za: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prepravljivo za: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Sve vrste tovara -STR_PURCHASE_INFO_ALL_BUT :Sve sem {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Sve sem {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Najveća vučna snaga: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Domet: {GOLD}{COMMA} pločica diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 1f21c51bab..639a94d1f2 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1944,8 +1944,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}关闭 STR_STATION_BUILD_COVERAGE_ON :{BLACK}开启 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}不显示覆盖的区域 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}显示可以覆盖的区域 -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}接受：{GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}供给: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}接受：{GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}供给: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}合并车站 @@ -2718,7 +2718,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}接受 STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}显示接受的货物列表 -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}接受：{WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}接受：{WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}评价 STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}显示车站评价 @@ -2963,9 +2963,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}重量 STR_PURCHASE_INFO_COST_SPEED :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK} 速度：{GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}运载能力：{GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}功率：{GOLD}+{POWER}{BLACK} 重量：{GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}可改装为：{GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}可改装为：{GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :所有类型 -STR_PURCHASE_INFO_ALL_BUT :除了 {GOLD} +STR_PURCHASE_INFO_ALL_BUT :除了 {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}最大牵引力：{GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}航行距离: {GOLD}{COMMA} 格 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index acdd27e92e..8e99fe79e2 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2013,8 +2013,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Vyp. STR_STATION_BUILD_COVERAGE_ON :{BLACK}Zap. STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nezvýrazňovať oblasť pokrytia stavanej plochy STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Zobraziť oblasť pokrytia stavanej plochy -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prijíma: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Dodáva: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prijíma: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Dodáva: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Spojiť stanicu @@ -2789,7 +2789,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Prijíma STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Zobraziť zoznam prijímaného nákladu -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Prijíma: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Prijíma: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Hodnotenie STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Zobraziť hodnotenia stanice @@ -3034,9 +3034,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Hmotnos STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Rýchlosť: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacita: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Poháňané vagóny: {GOLD}+{POWER}{BLACK} Hmotnosť: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prestavatelne na: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prestavatelne na: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Všetky druhy nákladu -STR_PURCHASE_INFO_ALL_BUT :Všetko okrem {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Všetko okrem {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. trakčná sila: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Dosah: {GOLD}{COMMA} políčok diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 32da5eae3c..647834216c 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2098,8 +2098,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Izključ STR_STATION_BUILD_COVERAGE_ON :{BLACK}Vključeno STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ne osvetli zajemnega območja predvidene lokacije STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Osvetli zajemno območje predvidene lokacije -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Sprejema: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Dobavlja: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Sprejema: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Dobavlja: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Združi postaje @@ -2874,7 +2874,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Sprejema STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Prikaži seznam sprejetega tovora -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Sprejema: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Sprejema: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ocene STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Prikaz ocen postaje @@ -3119,9 +3119,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Teža: { STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Hitrost: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Zmogljivost: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Pogonski vagoni: {GOLD}+{POWER}{BLACK} Teža: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Preureditve za: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Preureditve za: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Vse vrste tovora -STR_PURCHASE_INFO_ALL_BUT :Vse, razen {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Vse, razen {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Največja vlečna moč: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Domet: {GOLD}{COMMA} polj diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 4e0a077116..17800301b7 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1947,8 +1947,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Apagado STR_STATION_BUILD_COVERAGE_ON :{BLACK}Encendido STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}No mostrar área de recogida del lugar propuesto STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Mostrar área de recogida del lugar propuesto -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acepta: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provisiones: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acepta: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provisiones: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Unir estación @@ -2723,7 +2723,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Acepta STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Mostrar lista de carga aceptada -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acepta: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acepta: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Ranking STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Ver calificación de la estación @@ -2968,9 +2968,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Coste: {GOLD}{CURRENCY_LONG}{BLACK} Velocidad: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacidad: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagones con motor: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reformable a: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reformable a: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Todos los tipos de carga -STR_PURCHASE_INFO_ALL_BUT :Todo excepto {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Todo excepto {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}F.T máxima: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Alcance: {GOLD}{COMMA} casillas diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 0e62013fd7..58f0a2b3fb 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Av STR_STATION_BUILD_COVERAGE_ON :{BLACK}På STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Markera inte upptagningsområde för stationen STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Markera stationens upptagningsområde -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepterar: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tillhandahåller: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepterar: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Tillhandahåller: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Slå ihop stationer @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Accepterar STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Visa lista över accepterat gods -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepterar: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Accepterar: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Värderingar STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Visa stationens klassificering @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Vikt: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Kostnad: {GOLD}{CURRENCY_LONG}{BLACK} Hastighet: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacitet: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Motoriserade vagnar: {GOLD}+{POWER}{BLACK} Vikt: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Anpassningsbar till: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Anpassningsbar till: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Alla typer av last -STR_PURCHASE_INFO_ALL_BUT :Allt utom {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Allt utom {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maximal Dragkraft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Räckvidd: {GOLD}{COMMA} rutor diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 20c1e62fb6..c0ffea2400 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1888,8 +1888,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}關 STR_STATION_BUILD_COVERAGE_ON :{BLACK}開 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}不顯示設置地點的運輸涵蓋範圍 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}顯示設置地點的運輸涵蓋範圍 -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}接受：{GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}供應：{GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}接受：{GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}供應：{GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}合併車站 @@ -2590,7 +2590,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}接受貨物 STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}顯示接受的貨物種類 -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}接受：{WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}接受：{WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}評價 STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}顯示車站評價 @@ -2810,9 +2810,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}載重 STR_PURCHASE_INFO_COST_SPEED :{BLACK}費用：{GOLD}{CURRENCY_LONG}{BLACK} 速度：{GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}容量：{GOLD}{CARGO_LONG}，{CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}動力車廂：{GOLD}+{POWER}{BLACK} 載重：{GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}可改裝成：{GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}可改裝成：{GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :所有貨物種類 -STR_PURCHASE_INFO_ALL_BUT :{GOLD}除了 +STR_PURCHASE_INFO_ALL_BUT :{CARGO_LIST}除了 STR_PURCHASE_INFO_MAX_TE :{BLACK}最大牽引力：{GOLD}{FORCE} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}列車選單 - 點選列車檢視資訊 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index c89aafa4de..59999ca108 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1940,8 +1940,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Kapalı STR_STATION_BUILD_COVERAGE_ON :{BLACK}Açık STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Kapsama alanını gösterme STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Kapsama alanını göster -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}İstenen: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Sağladıkları: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}İstenen: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Sağladıkları: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}İstasyonu birleştir @@ -2706,7 +2706,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}İstenen STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}İstenen kargoların listesini göster -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}İstenen: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}İstenen: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Reyting STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}İstasyonun reytinglerini göster @@ -2951,9 +2951,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Ağırl STR_PURCHASE_INFO_COST_SPEED :{BLACK}Fiyat: {GOLD}{CURRENCY_LONG}{BLACK} Hız: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapasite: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Güç Veren Vagonlar: {GOLD}+{POWER}{BLACK} Ağırlık: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Dönüştürülebildiği kargolar: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Dönüştürülebildiği kargolar: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Tüm kargo türleri -STR_PURCHASE_INFO_ALL_BUT :Şunlar hariç tümü: {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Şunlar hariç tümü: {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Mak. Çekim Gücü: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Menzil: {GOLD}{COMMA} kare diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 682ee53b82..14ca135c0a 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2071,8 +2071,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ні STR_STATION_BUILD_COVERAGE_ON :{BLACK}Так STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Не підсвічувати зону покриття станції STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Підсвічувати зону покриття станції -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Приймає: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Постачає: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Приймає: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Постачає: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Об'єднати станцію @@ -2847,7 +2847,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Приймає STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Показати список приймання вантажів -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Приймає: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Приймає: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Рейтинг STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Показати рейтинг станції @@ -3092,9 +3092,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Вага STR_PURCHASE_INFO_COST_SPEED :{BLACK}Ціна: {GOLD}{CURRENCY_LONG}{BLACK} Швидкість: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Місткість: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Потужність: {GOLD}+{POWER}{BLACK} Вага: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Переобладнати на: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Переобладнати на: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Всі типи вантажів -STR_PURCHASE_INFO_ALL_BUT :Всі крім {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Всі крім {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Максимальна тягова сила: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Дальність: {GOLD}{COMMA} клітинок diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index d436aa4493..06739ac09b 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1689,8 +1689,8 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Kin it d # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ut STR_STATION_BUILD_COVERAGE_ON :{BLACK}Oan -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aksepteart: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Levert: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aksepteart: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Levert: {GOLD}{CARGO_LIST} # Join station window @@ -2141,7 +2141,7 @@ STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_L STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} ûnderweis fan {STATION} ôf) STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK} -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aksepteart: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aksepteart: {WHITE}{CARGO_LIST} STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%) diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index a86b04e495..0372d11563 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -648,7 +648,7 @@ STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS :sendinta tro mu # Transparency settings window # Base for station construction window(s) -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceptas: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceptas: {GOLD}{CARGO_LIST} # Join station window @@ -838,7 +838,7 @@ STR_NEWGRF_INVALID_CARGO_ABBREV :?? STR_STATION_VIEW_WAITING_TITLE :{BLACK}Vartabas: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceptas: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceptas: {WHITE}{CARGO_LIST} ############ range for rating starts diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 5c6c1c056f..127f560d8a 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -1035,8 +1035,8 @@ STR_CONTENT_TYPE_GS_LIBRARY :ГШ библи # Transparency settings window # Base for station construction window(s) -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Прифаќа: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Залихи: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Прифаќа: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Залихи: {GOLD}{CARGO_LIST} # Join station window @@ -1316,7 +1316,7 @@ STR_STATION_VIEW_WAITING_TITLE :{BLACK}Чека STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} пренасочено од {STATION}) -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Прифаќа: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Прифаќа: {WHITE}{CARGO_LIST} ############ range for rating starts diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index f1e2f73b41..910f6a9006 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -1944,8 +1944,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}خامو STR_STATION_BUILD_COVERAGE_ON :{BLACK}روشن STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}منطقه تحت پوشش از سایت پیشنهادی را نشان نده STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}منطقه تحت پوشش از سایت پیشنهادی را نشان بده -STR_STATION_BUILD_ACCEPTS_CARGO :{GOLD}{STRING}{BLACK}قبول می کند: -STR_STATION_BUILD_SUPPLIES_CARGO :{GOLD}{STRING}{BLACK}تدارکات: +STR_STATION_BUILD_ACCEPTS_CARGO :{GOLD}{CARGO_LIST}{BLACK}قبول می کند: +STR_STATION_BUILD_SUPPLIES_CARGO :{GOLD}{CARGO_LIST}{BLACK}تدارکات: # Join station window STR_JOIN_STATION_CAPTION :{WHITE}پیوستن ایستگاه @@ -2710,7 +2710,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}قبول می کند STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}نشان دادن لیست کالاهای قابل دریافت -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}قبول می کند: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}قبول می کند: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}رده بندی STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}نشان دادن رتبه بندی ایستگاه diff --git a/src/lang/unfinished/tamil.txt b/src/lang/unfinished/tamil.txt index 18e7f4dbdd..fc247044f1 100644 --- a/src/lang/unfinished/tamil.txt +++ b/src/lang/unfinished/tamil.txt @@ -1685,7 +1685,7 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}எட STR_PURCHASE_INFO_COST_SPEED :{BLACK}விலை: {GOLD}{CURRENCY_LONG}{BLACK} வேகம்: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}கொள்ளளவு: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_ALL_TYPES :அனைத்து சரக்கு வகைகள் -STR_PURCHASE_INFO_ALL_BUT :அனைத்தும் {GOLD} தவிர +STR_PURCHASE_INFO_ALL_BUT :அனைத்தும் {CARGO_LIST} தவிர STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}வாகனத்தை வாங்கு diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index b06c816452..41db1a15d2 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -1893,8 +1893,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}ปิ STR_STATION_BUILD_COVERAGE_ON :{BLACK}เปิด STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}ปิดการแสดงพื้นที่ให้บริการ STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}เปิดการแสดงพื้นที่ให้บริการ -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}กำลังต้องการ: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}ผลิต: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}กำลังต้องการ: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}ผลิต: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}รวมสถานี @@ -2345,7 +2345,7 @@ STR_STATION_VIEW_WAITING_TITLE :{BLACK}กำ STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} ถ่ายมาจาก {STATION}) -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}กำลังต้องการ: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}กำลังต้องการ: {WHITE}{CARGO_LIST} ############ range for rating starts diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 75aaf88989..8627320b49 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -1931,8 +1931,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}بند STR_STATION_BUILD_COVERAGE_ON :{BLACK}آن STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}مجوزہ جگہ کا کوریج کا علاقہ واضح نہ کریں STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}مجوزہ جگہ کا کوریج کا علاقہ واضح کریں -STR_STATION_BUILD_ACCEPTS_CARGO :{GOLD}{STRING}{BLACK}منظور کرتا ہے: -STR_STATION_BUILD_SUPPLIES_CARGO :{GOLD}{STRING}{BLACK}فراہم کرتا ہے: +STR_STATION_BUILD_ACCEPTS_CARGO :{GOLD}{CARGO_LIST}{BLACK}منظور کرتا ہے: +STR_STATION_BUILD_SUPPLIES_CARGO :{GOLD}{CARGO_LIST}{BLACK}فراہم کرتا ہے: # Join station window STR_JOIN_STATION_CAPTION :{WHITE}اسٹیشن ملائیں @@ -2288,7 +2288,7 @@ STR_STATION_VIEW_WAITING_TITLE :{BLACK}منتظ STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} سے براستہ ہے {STATION}) -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}منظور کرتا ہے: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}منظور کرتا ہے: {WHITE}{CARGO_LIST} ############ range for rating starts diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index e4e4f9e005..3f19be1572 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Tắt STR_STATION_BUILD_COVERAGE_ON :{BLACK}Bật STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Không hiện vùng che phủ của điểm đề xuất. STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Hiện vùng che phủ của điểm đề xuất -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Chấp nhận: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Cung cấp: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Chấp nhận: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Cung cấp: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Nối ga, bến @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Chấp nhận STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Liệt kê hàng hoá được chấp nhận -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Chấp nhận: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Chấp nhận: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Uy tín STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Hiện uy tín ga, bến, cảng @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Tải tr STR_PURCHASE_INFO_COST_SPEED :{BLACK}Giá thành: {GOLD}{CURRENCY_LONG}{BLACK} Tốc độ: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Sức chứa: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Công suất toa xe: {GOLD}+{POWER}{BLACK} Tải trọng: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Cải biến thành: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Cải biến thành: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Tất cả kiểu hàng hoá -STR_PURCHASE_INFO_ALL_BUT :Tất cả trừ {GOLD} +STR_PURCHASE_INFO_ALL_BUT :Tất cả trừ {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Lực kéo tối đa: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Tầm xa: {GOLD}{COMMA} ô diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 91c8502539..8a8571a033 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1946,8 +1946,8 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}I Ffwrdd STR_STATION_BUILD_COVERAGE_ON :{BLACK}Ymlaen STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Peidio amlygu'r ardal fydd yn cael ei ddylanwadu STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Amlygu'r ardal fydd yn cael ei ddylanwadu -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Derbyn: {GOLD}{STRING} -STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Deunydd crai yn weddill: {GOLD}{STRING} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Derbyn: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Deunydd crai yn weddill: {GOLD}{CARGO_LIST} # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Uno gorsaf @@ -2722,7 +2722,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Derbyn STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Dangos rhestr o'r llwythi sy'n cael eu derbyn -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Derbyn: {WHITE}{STRING} +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Derbyn: {WHITE}{CARGO_LIST} STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Perfformiad STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Dangos graddfeydd gorsaf @@ -2967,9 +2967,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Pwysau: STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Cyflymder: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Gallu cludo: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Wageni Pŵer: {GOLD}+{POWER}{BLACK} Pwysau: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modd ei ailffitio i: {GOLD} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modd ei ailffitio i: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Pob math o lwyth -STR_PURCHASE_INFO_ALL_BUT :Popeth ond{GOLD} +STR_PURCHASE_INFO_ALL_BUT :Popeth ond{CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Grym Tynnol Uchaf: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Pellter cyrhaeddiad: {GOLD}{COMMA} teil diff --git a/src/newgrf_station.h b/src/newgrf_station.h index b05706c53b..9f31431d2a 100644 --- a/src/newgrf_station.h +++ b/src/newgrf_station.h @@ -24,7 +24,7 @@ enum StationClassID { STAT_CLASS_BEGIN = 0, ///< the lowest valid value STAT_CLASS_DFLT = 0, ///< Default station class. STAT_CLASS_WAYP, ///< Waypoint class. - STAT_CLASS_MAX = 32, ///< Maximum number of classes. + STAT_CLASS_MAX = 256, ///< Maximum number of classes. }; typedef SimpleTinyEnumT StationClassIDByte; template <> struct EnumPropsT : MakeEnumPropsT {}; diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp index 00ae7d72fe..51d0a50b8c 100644 --- a/src/saveload/ai_sl.cpp +++ b/src/saveload/ai_sl.cpp @@ -67,6 +67,7 @@ static void Load_AIPL() while ((index = (CompanyID)SlIterateArray()) != (CompanyID)-1) { if (index >= MAX_COMPANIES) SlErrorCorrupt("Too many AI configs"); + _ai_saveload_is_random = 0; _ai_saveload_version = -1; SlObject(NULL, _ai_company); diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp index 54fc54cb17..adad559c56 100644 --- a/src/script/api/script_engine.cpp +++ b/src/script/api/script_engine.cpp @@ -233,7 +233,7 @@ if (!IsValidEngine(engine_id)) return false; if (GetVehicleType(engine_id) != ScriptVehicle::VT_ROAD && GetVehicleType(engine_id) != ScriptVehicle::VT_RAIL) return false; - return CountArticulatedParts(engine_id, true) != 0; + return IsArticulatedEngine(engine_id); } /* static */ ScriptAirport::PlaneType ScriptEngine::GetPlaneType(EngineID engine_id) diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 44945158fc..e3610c2cce 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -34,45 +34,6 @@ #include "table/strings.h" -/** - * Draw a (multi)line of cargoes seperated by commas, and prefixed with a string. - * @param cargo_mask Mask of cargoes to include in the list. - * @param r Rectangle to draw the cargoes in. - * @param prefix String to use as prefix for the list of cargoes. - * @return Bottom position of the last line used for drawing the cargoes. - */ -static int DrawCargoListText(uint32 cargo_mask, const Rect &r, StringID prefix) -{ - bool first = true; - char string[512]; - char *b = string; - - CargoID i; - FOR_EACH_SET_CARGO_ID(i, cargo_mask) { - if (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode() - - if (first) { - first = false; - } else { - /* Add a comma if this is not the first item */ - *b++ = ','; - *b++ = ' '; - } - b = InlineString(b, CargoSpec::Get(i)->name); - } - - /* If first is still true then no cargo is accepted */ - if (first) b = InlineString(b, STR_JUST_NOTHING); - - *b = '\0'; - - /* Make sure we detect any buffer overflow */ - assert(b < endof(string)); - - SetDParamStr(0, string); - return DrawStringMultiLine(r.left, r.right, r.top, r.bottom, prefix); -} - /** * Calculates and draws the accepted or supplied cargo around the selected tile(s) * @param left x position where the string is to be drawn @@ -106,8 +67,8 @@ int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageTyp if (cargoes[i] >= (supplies ? 1U : 8U)) SetBit(cargo_mask, i); } } - Rect r = {left, top, right, INT32_MAX}; - return DrawCargoListText(cargo_mask, r, supplies ? STR_STATION_BUILD_SUPPLIES_CARGO : STR_STATION_BUILD_ACCEPTS_CARGO); + SetDParam(0, cargo_mask); + return DrawStringMultiLine(left, right, top, INT32_MAX, supplies ? STR_STATION_BUILD_SUPPLIES_CARGO : STR_STATION_BUILD_ACCEPTS_CARGO); } /** @@ -1091,8 +1052,8 @@ struct StationViewWindow : public Window { for (CargoID i = 0; i < NUM_CARGO; i++) { if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::GES_ACCEPTANCE)) SetBit(cargo_mask, i); } - Rect s = {r.left + WD_FRAMERECT_LEFT, r.top + WD_FRAMERECT_TOP, r.right - WD_FRAMERECT_RIGHT, INT32_MAX}; - int bottom = DrawCargoListText(cargo_mask, s, STR_STATION_VIEW_ACCEPTS_CARGO); + SetDParam(0, cargo_mask); + int bottom = DrawStringMultiLine(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, INT32_MAX, STR_STATION_VIEW_ACCEPTS_CARGO); return CeilDiv(bottom - r.top - WD_FRAMERECT_TOP, FONT_HEIGHT_NORMAL); } diff --git a/src/strings.cpp b/src/strings.cpp index a1c147c83b..954996d680 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1106,6 +1106,38 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg break; } + case SCC_CARGO_LIST: { // {CARGO_LIST} + uint32 cmask = args->GetInt32(SCC_CARGO_LIST); + bool first = true; + + const CargoSpec *cs; + FOR_ALL_SORTED_CARGOSPECS(cs) { + if (!HasBit(cmask, cs->Index())) continue; + + if (buff >= last - 2) break; // ',' and ' ' + + if (first) { + first = false; + } else { + /* Add a comma if this is not the first item */ + *buff++ = ','; + *buff++ = ' '; + } + + buff = GetStringWithArgs(buff, cs->name, args, last, next_substr_case_index, game_script); + } + + /* If first is still true then no cargo is accepted */ + if (first) buff = GetStringWithArgs(buff, STR_JUST_NOTHING, args, last, next_substr_case_index, game_script); + + *buff = '\0'; + next_substr_case_index = 0; + + /* Make sure we detect any buffer overflow */ + assert(buff < last); + break; + } + case SCC_CURRENCY_SHORT: // {CURRENCY_SHORT} buff = FormatGenericCurrency(buff, _currency, args->GetInt64(), true, last); break; diff --git a/src/table/control_codes.h b/src/table/control_codes.h index 81b100921a..50233d5f60 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -54,6 +54,7 @@ enum StringControlCode { SCC_CARGO_LONG, SCC_CARGO_SHORT, SCC_CARGO_TINY, + SCC_CARGO_LIST, SCC_POWER, SCC_VOLUME_LONG, SCC_VOLUME_SHORT, diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h index 276a94cce2..ed77d54ef4 100644 --- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -73,6 +73,7 @@ static const CmdStruct _cmd_structs[] = { {"CARGO_LONG", EmitSingleChar, SCC_CARGO_LONG, 2, C_NONE | C_GENDER}, {"CARGO_SHORT", EmitSingleChar, SCC_CARGO_SHORT, 2, C_NONE}, // short cargo description, only ### tons, or ### litres {"CARGO_TINY", EmitSingleChar, SCC_CARGO_TINY, 2, C_NONE}, // tiny cargo description with only the amount, not a specifier for the amount or the actual cargo name + {"CARGO_LIST", EmitSingleChar, SCC_CARGO_LIST, 1, C_CASE}, {"POWER", EmitSingleChar, SCC_POWER, 1, C_NONE}, {"VOLUME_LONG", EmitSingleChar, SCC_VOLUME_LONG, 1, C_NONE}, {"VOLUME_SHORT", EmitSingleChar, SCC_VOLUME_SHORT, 1, C_NONE}, diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 399a35576e..81f85f534d 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -931,49 +931,26 @@ uint ShowRefitOptionsList(int left, int right, int y, EngineID engine) uint32 cmask = GetUnionOfArticulatedRefitMasks(engine, false); /* List of cargo types available in this climate */ uint32 lmask = _cargo_mask; - char string[512]; - char *b = string; /* Draw nothing if the engine is not refittable */ if (HasAtMostOneBit(cmask)) return y; - b = InlineString(b, STR_PURCHASE_INFO_REFITTABLE_TO); - if (cmask == lmask) { /* Engine can be refitted to all types in this climate */ - b = InlineString(b, STR_PURCHASE_INFO_ALL_TYPES); + SetDParam(0, STR_PURCHASE_INFO_ALL_TYPES); } else { /* Check if we are able to refit to more cargo types and unable to. If * so, invert the cargo types to list those that we can't refit to. */ if (CountBits(cmask ^ lmask) < CountBits(cmask) && CountBits(cmask ^ lmask) <= 7) { cmask ^= lmask; - b = InlineString(b, STR_PURCHASE_INFO_ALL_BUT); - } - - bool first = true; - - /* Add each cargo type to the list */ - const CargoSpec *cs; - FOR_ALL_SORTED_CARGOSPECS(cs) { - if (!HasBit(cmask, cs->Index())) continue; - - if (b >= lastof(string) - (2 + 2 * 4)) break; // ", " and two calls to Utf8Encode() - - if (!first) b = strecpy(b, ", ", lastof(string)); - first = false; - - b = InlineString(b, cs->name); + SetDParam(0, STR_PURCHASE_INFO_ALL_BUT); + } else { + SetDParam(0, STR_JUST_CARGO_LIST); } + SetDParam(1, cmask); } - /* Terminate and display the completed string */ - *b = '\0'; - - /* Make sure we detect any buffer overflow */ - assert(b < endof(string)); - - SetDParamStr(0, string); - return DrawStringMultiLine(left, right, y, INT32_MAX, STR_JUST_RAW_STRING); + return DrawStringMultiLine(left, right, y, INT32_MAX, STR_PURCHASE_INFO_REFITTABLE_TO); } /** Get the cargo subtype text from NewGRF for the vehicle details window. */