From 914fb4c9871128ed999a1b997d6b731b0b1acdd0 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 20 Dec 2020 19:04:18 +0000 Subject: [PATCH 01/38] Update: Translations from eints korean: 1 change by telk5093 slovak: 6 changes by FuryPapaya latvian: 9 changes by lexuslatvia --- src/lang/korean.txt | 1 + src/lang/latvian.txt | 9 +++++++++ src/lang/slovak.txt | 12 ++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 80046c2ad0..68d66b1bd0 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -5038,6 +5038,7 @@ STR_FORMAT_BUOY_NAME :{TOWN} 부표 STR_FORMAT_BUOY_NAME_SERIAL :{TOWN} 부표 #{COMMA} STR_FORMAT_COMPANY_NUM :(회사 {COMMA}) STR_FORMAT_GROUP_NAME :그룹 {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} {COMMA} STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} STR_FORMAT_WAYPOINT_NAME :{TOWN} 경유지 STR_FORMAT_WAYPOINT_NAME_SERIAL :{TOWN} 경유지 #{COMMA} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 5a9c86f247..b4811bb901 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -196,6 +196,7 @@ STR_COLOUR_DEFAULT :Noklusējuma STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}jūdzes stundā STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}lauciņi/diena STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}ZS STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ZS @@ -1555,6 +1556,11 @@ STR_CONFIG_SETTING_ENDING_YEAR :Vērtēšanas b STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT :Spēles beigas gads (tiek izmantots rezultāta noteikšanai). Šī gada beigās uzņēmuma rezultāti tiek ierakstīti un uz ekrāna tiek parādīti labākie rezultāti, bet spēlētāji var turpināt spēlēt arī pēc šī datuma.{}Ja tas ir norādīts pirms spēles sākuma datuma, labākie rezultāti nekad netiek parādīti. STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} STR_CONFIG_SETTING_ENDING_YEAR_ZERO :Nekad +STR_CONFIG_SETTING_ECONOMY_TYPE :Ekonomikas tips: {STRING} +STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Vienmērīga ekonomika liek mainīt ražošanas apjomus biežāk un mazākos soļos. Saldēta ekonomika aptur ražošanas izmaiņas un nozaru slēgšanu. Šim iestatījumam var nebūt ietekmes, ja nozares veidus nodrošina NewGRF. +STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Orģināls +STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Gluds +STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Saldēts STR_CONFIG_SETTING_ALLOW_SHARES :Atļaut akciju pirkšanu no citiem uzņēmumiem: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Ja iespējots, ir atļauts pirkt un pārdodot uzņēmumu akcijas. Akcijas būs pieejamas tikai atbilstošu vecumu sasniegušiem uzņēmumiem STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimālais uzņēmuma vecums, lai tirgotos ar akcijām: {STRING} @@ -1675,6 +1681,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Vai lietotāja STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :impērijas, britu (jūdzes stundā) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :metriskās (km/h) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI, starptautiskās (m/s) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Spēles vienības (lauciņi/dienas) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Transportlīdzekļu jaudas mērvienības: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Vai lietotāja saskarnē rāda transporta līdzekļa jaudu, rādīt norādītajās mērvienībās @@ -1809,6 +1816,7 @@ STR_INTRO_TRANSLATION :{BLACK}Šim tul # Quit window STR_QUIT_CAPTION :{WHITE}Iziet +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Vai esat pārliecināts ka vēlaties iziet no OpenTTD? STR_QUIT_YES :{BLACK}Jā STR_QUIT_NO :{BLACK}Nē @@ -5040,6 +5048,7 @@ STR_FORMAT_BUOY_NAME :{TOWN} boja STR_FORMAT_BUOY_NAME_SERIAL :{TOWN} boja Nr. #{COMMA} STR_FORMAT_COMPANY_NUM :({COMMA}. uzņēmums) STR_FORMAT_GROUP_NAME :Grupa {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA} STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} STR_FORMAT_WAYPOINT_NAME :Pieturas punkts {TOWN} STR_FORMAT_WAYPOINT_NAME_SERIAL :Pieturas punkts {TOWN} #{COMMA} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 5c5eef0509..8e7c29f1db 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1747,7 +1747,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Vždy, keď sa STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperiálne (mph) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metrické (km/h) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/s) -STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Jednotky hry (políčka/deň) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Jednotky v hre (políčka/deň) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Jednotky výkonu vozidiel: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Vždy, keď sa zobrazí výkon vozidla v užívateľskom rozhraní, zobrazí sa vo vybraných jednotkách @@ -4801,7 +4801,7 @@ STR_INDUSTRY_NAME_SUGAR_MINE :{G=z}Cukrová b STR_SV_EMPTY : STR_SV_UNNAMED :Bez názvu STR_SV_TRAIN_NAME :{G=m}Vlak č. {COMMA} -STR_SV_ROAD_VEHICLE_NAME :{G=s}Cestné vozidlo {COMMA} +STR_SV_ROAD_VEHICLE_NAME :{G=s}Cestné vozidlo č. {COMMA} STR_SV_SHIP_NAME :{G=z}Loď č. {COMMA} STR_SV_AIRCRAFT_NAME :{G=s}Lietadlo č. {COMMA} @@ -5102,20 +5102,20 @@ STR_FORMAT_DATE_LONG :{STRING} {STRIN STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_FORMAT_BUOY_NAME :{TOWN} Bója -STR_FORMAT_BUOY_NAME_SERIAL :{TOWN} Bója #{COMMA} +STR_FORMAT_BUOY_NAME_SERIAL :{TOWN} Bója č. {COMMA} STR_FORMAT_COMPANY_NUM :(Spoločnosť {COMMA}) STR_FORMAT_GROUP_NAME :Skupina {COMMA} STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} č. {COMMA} STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} STR_FORMAT_WAYPOINT_NAME :Smerový bod {TOWN} -STR_FORMAT_WAYPOINT_NAME_SERIAL :Smerový bod {TOWN} #{COMMA} +STR_FORMAT_WAYPOINT_NAME_SERIAL :Smerový bod {TOWN} č. {COMMA} STR_FORMAT_DEPOT_NAME_TRAIN :Vlakové depo {TOWN} STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL :Vlakové depo {TOWN} č. {COMMA} STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE :Garáž {TOWN} -STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL :Garáž {TOWN} #{COMMA} +STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL :Garáž {TOWN} č. {COMMA} STR_FORMAT_DEPOT_NAME_SHIP :Lodenica {TOWN} -STR_FORMAT_DEPOT_NAME_SHIP_SERIAL :Lodenica {TOWN} #{COMMA} +STR_FORMAT_DEPOT_NAME_SHIP_SERIAL :Lodenica {TOWN} č. {COMMA} STR_FORMAT_DEPOT_NAME_AIRCRAFT :Letecký hangár {STATION} STR_UNKNOWN_STATION :neznáma stanica From 5575cb9133cd47553ed37a20f0981f0d14ae0e08 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Mon, 21 Dec 2020 18:21:59 +0100 Subject: [PATCH 02/38] Remove: Remnants of PSP support. No active target is that limited in concurrent file descriptors. --- src/fileio.cpp | 57 +------------------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index eb529632cd..e294a82929 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -46,10 +46,6 @@ struct Fio { byte buffer_start[FIO_BUFFER_SIZE]; ///< local buffer when read from file const char *filenames[MAX_FILE_SLOTS]; ///< array of filenames we (should) have open char *shortnames[MAX_FILE_SLOTS]; ///< array of short names for spriteloader's use -#if defined(LIMITED_FDS) - uint open_handles; ///< current amount of open handles - uint usage_count[MAX_FILE_SLOTS]; ///< count how many times this file has been opened -#endif /* LIMITED_FDS */ }; static Fio _fio; ///< #Fio instance. @@ -94,18 +90,6 @@ void FioSeekTo(size_t pos, int mode) } } -#if defined(LIMITED_FDS) -static void FioRestoreFile(int slot) -{ - /* Do we still have the file open, or should we reopen it? */ - if (_fio.handles[slot] == nullptr) { - DEBUG(misc, 6, "Restoring file '%s' in slot '%d' from disk", _fio.filenames[slot], slot); - FioOpenFile(slot, _fio.filenames[slot]); - } - _fio.usage_count[slot]++; -} -#endif /* LIMITED_FDS */ - /** * Switch to a different file and seek to a position. * @param slot Slot number of the new file. @@ -113,12 +97,7 @@ static void FioRestoreFile(int slot) */ void FioSeekToFile(uint8 slot, size_t pos) { - FILE *f; -#if defined(LIMITED_FDS) - /* Make sure we have this file open */ - FioRestoreFile(slot); -#endif /* LIMITED_FDS */ - f = _fio.handles[slot]; + FILE *f = _fio.handles[slot]; assert(f != nullptr); _fio.cur_fh = f; _fio.filename = _fio.filenames[slot]; @@ -202,9 +181,6 @@ static inline void FioCloseFile(int slot) _fio.shortnames[slot] = nullptr; _fio.handles[slot] = nullptr; -#if defined(LIMITED_FDS) - _fio.open_handles--; -#endif /* LIMITED_FDS */ } } @@ -216,30 +192,6 @@ void FioCloseAll() } } -#if defined(LIMITED_FDS) -static void FioFreeHandle() -{ - /* If we are about to open a file that will exceed the limit, close a file */ - if (_fio.open_handles + 1 == LIMITED_FDS) { - uint i, count; - int slot; - - count = UINT_MAX; - slot = -1; - /* Find the file that is used the least */ - for (i = 0; i < lengthof(_fio.handles); i++) { - if (_fio.handles[i] != nullptr && _fio.usage_count[i] < count) { - count = _fio.usage_count[i]; - slot = i; - } - } - assert(slot != -1); - DEBUG(misc, 6, "Closing filehandler '%s' in slot '%d' because of fd-limit", _fio.filenames[slot], slot); - FioCloseFile(slot); - } -} -#endif /* LIMITED_FDS */ - /** * Open a slotted file. * @param slot Index to assign. @@ -250,9 +202,6 @@ void FioOpenFile(int slot, const char *filename, Subdirectory subdir) { FILE *f; -#if defined(LIMITED_FDS) - FioFreeHandle(); -#endif /* LIMITED_FDS */ f = FioFOpenFile(filename, "rb", subdir); if (f == nullptr) usererror("Cannot open file '%s'", filename); long pos = ftell(f); @@ -269,10 +218,6 @@ void FioOpenFile(int slot, const char *filename, Subdirectory subdir) if (t2 != nullptr) *t2 = '\0'; strtolower(_fio.shortnames[slot]); -#if defined(LIMITED_FDS) - _fio.usage_count[slot] = 0; - _fio.open_handles++; -#endif /* LIMITED_FDS */ FioSeekToFile(slot, (uint32)pos); } From f24bc8b509dc6148c355dfd7e3a393ea78cc7cef Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 21 Dec 2020 18:08:31 +0000 Subject: [PATCH 03/38] Update: Translations from eints vietnamese: 3 changes by KhoiCanDev russian: 4 changes by Ln-Wolf polish: 11 changes by yazalo --- src/lang/polish.txt | 13 +++++++++++-- src/lang/russian.txt | 6 ++++-- src/lang/vietnamese.txt | 3 +++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 3cb810848b..c39f1b0c38 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -573,6 +573,7 @@ STR_COLOUR_DEFAULT :Domyślny STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mph STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}p{P ole ola ól}/dzień STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}KM STR_UNITS_POWER_METRIC :{COMMA}{NBSP}KM @@ -1694,7 +1695,7 @@ STR_CONFIG_SETTING_SHOW_NEWGRF_NAME :Pokaż nazwę N STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT :Dodaj linię do okna budowy pojazdów, pokazujących z którego NewGRF'a wybrany pojazd pochodzi. STR_CONFIG_SETTING_LANDSCAPE :Krajobraz: {STRING} -STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT :Krajobrazy określają podstawowe scenariusze gry, które różnią się przedsiębiorstwami, towarami i wymogami dla rozwoju miast. Pliki NewGRF i skrypty umożliwiają dokładniejszą kontrolę warunków rozgrywki +STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT :Krajobrazy określają podstawowe scenariusze gry, które różnią się przedsiębiorstwami, ładunkiem i wymogami dla rozwoju miast. Pliki NewGRF i skrypty umożliwiają dokładniejszą kontrolę warunków rozgrywki STR_CONFIG_SETTING_LAND_GENERATOR :Generator krajobrazu: {STRING} STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT :Oryginalny generator tworzy tylko proste kształty krajobrazu i jest zależny od podstawowego zestawu grafiki. TerraGenesis jest oparty na generatorze szumu Perlina, który umożliwia precyzyjną kontrolę parametrów STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL :Oryginalny @@ -1933,6 +1934,11 @@ STR_CONFIG_SETTING_ENDING_YEAR :Punktacja na ko STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT :Rok, w którym gra się kończy na cel punktacji. Na koniec tego roku, punkty firmy są zarejestrowane i ekran wyników najwyższych jest pokazywany, ale gracze mogą po tym dalej grać.{}Jeżeli jest to przed rokiem startowym, ekran wyników najwyższych nie jest nigdy pokazywany. STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} STR_CONFIG_SETTING_ENDING_YEAR_ZERO :Nigdy +STR_CONFIG_SETTING_ECONOMY_TYPE :Typ ekonomii: {STRING} +STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Płynna ekonomia oznacza, że zmiany w produkcji zachodzą częściej i w mniejszych krokach. Zamrożona gospodarka zatrzymuje zmiany w produkcji i zamykanie przedsiębiorstw. To ustawienie może nie mieć żadnego wpływu, jeśli przemysł jest regulowany przez NewGRFy. +STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Oryginalna +STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Płynna +STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Zamrożona STR_CONFIG_SETTING_ALLOW_SHARES :Pozwól kupować udziały w innych firmach: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Kiedy włączone, pozwala na kupowanie i sprzedawanie udziałów w firmie. Udziały będą dostępne tylko dla firm z odpowiednim stażem STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimalny wiek firmy pozwalający na handel udziałami: {STRING} @@ -2053,6 +2059,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Kiedy prędkoś STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperialne (mph) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metryczne (km/h) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/s) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Jednostki gry (pola/dzień) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Jednostka mocy pojazdów: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Kiedy moc pojazdu jest pokazywana w interfejsie użytkownika, wyświetl ją w wybranych jednostkach @@ -2185,6 +2192,7 @@ STR_INTRO_TRANSLATION :{BLACK}Tej wers # Quit window STR_QUIT_CAPTION :{WHITE}Wyjście +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Czy jesteś pewien, że chcesz wyjść z OpenTTD? STR_QUIT_YES :{BLACK}Tak STR_QUIT_NO :{BLACK}Nie @@ -4756,7 +4764,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE :{WHITE}Nie moż STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Przylega do więcej niż jednej stacji STR_ERROR_STATION_TOO_SPREAD_OUT :{WHITE}... stacja zbyt rozległa -STR_ERROR_TOO_MANY_STATIONS_LOADING :{WHITE}Za duzo stacji +STR_ERROR_TOO_MANY_STATIONS_LOADING :{WHITE}Za dużo stacji STR_ERROR_TOO_MANY_STATION_SPECS :{WHITE}Za dużo części stacji kolejowej STR_ERROR_TOO_MANY_BUS_STOPS :{WHITE}Zbyt wiele przystanków autobusowych STR_ERROR_TOO_MANY_TRUCK_STOPS :{WHITE}Zbyt wiele stacji załadunku ciężarówek @@ -5452,6 +5460,7 @@ STR_FORMAT_BUOY_NAME :Boja {TOWN} STR_FORMAT_BUOY_NAME_SERIAL :Boja {TOWN} #{COMMA} STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_FORMAT_GROUP_NAME :Grupa {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA} STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} STR_FORMAT_WAYPOINT_NAME :Post. {TOWN} STR_FORMAT_WAYPOINT_NAME_SERIAL :Post. {TOWN} #{COMMA} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 9ceb1b6bc4..650b21d6a8 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -320,7 +320,7 @@ STR_COLOUR_DEFAULT :По умолч STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}мил{P я и ь}/ч STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}км/ч STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с -STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}клет{P ка ки ок}/день +STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}кл./день STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}лс STR_UNITS_POWER_METRIC :{COMMA}{NBSP}лс @@ -1831,6 +1831,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Показыв STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :английская (миль/ч) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :метрическая (км/ч) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :СИ (м/с) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :внутриигровая (клетки в день) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Система единиц для мощности: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Показывать значения мощности двигателей транспортных средств в выбранной системе единиц @@ -1878,7 +1879,7 @@ STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Мар STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ограничения STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Аварии и катастрофы STR_CONFIG_SETTING_GENWORLD :{ORANGE}Создание карты -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Окружающая среда +STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Окружение STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Городская администрация STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Города STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Предприятия @@ -5265,6 +5266,7 @@ STR_FORMAT_BUOY_NAME :Буй {TOWN} STR_FORMAT_BUOY_NAME_SERIAL :Буй {TOWN} №{COMMA} STR_FORMAT_COMPANY_NUM :(Компания {COMMA}) STR_FORMAT_GROUP_NAME :Группа {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} (№{COMMA}) STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} STR_FORMAT_WAYPOINT_NAME :Точка пути {TOWN} STR_FORMAT_WAYPOINT_NAME_SERIAL :Точка пути {TOWN} №{COMMA} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index e317952ff1..8d3abf6d96 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1553,6 +1553,8 @@ STR_CONFIG_SETTING_ENDING_YEAR :Năm kết thú STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT :Năm mà ván chơi sẽ kết thúc và tính điểm. Khi năm đó kết thúc, điểm số của công ty sẽ được lưu lại và hiển thị bảng điểm chơi cao nhất, sau đó người chơi vẫn có thể tiếp tục ván chơi.{} Nếu năm được đặt nhỏ hơn năm bắt đầu, bảng điểm chơi cao nhất sẽ không bao giờ được hiển thị. STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} STR_CONFIG_SETTING_ENDING_YEAR_ZERO :Không bao giờ +STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Nguyên gốc +STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Đóng băng STR_CONFIG_SETTING_ALLOW_SHARES :Cho phép mua cổ phần của các công ty khác: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Nếu bật, cho phép mua và bán cổ phần công ty. Cổ phần chỉ có thể mua bán nếu công ty đã tồn tại một thời gian nhất định nào đó STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Tuổi công ty tối thiểu để bán cổ phần: {STRING} @@ -5029,6 +5031,7 @@ STR_FORMAT_BUOY_NAME :Phao {TOWN} STR_FORMAT_BUOY_NAME_SERIAL :Phao {TOWN} số #{COMMA} STR_FORMAT_COMPANY_NUM :(Công ty {COMMA}) STR_FORMAT_GROUP_NAME :Nhóm {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA} STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} STR_FORMAT_WAYPOINT_NAME :Điểm mốc {TOWN} STR_FORMAT_WAYPOINT_NAME_SERIAL :Điểm mốc {TOWN} số #{COMMA} From 0c3ddc5436a28051aab41b100fa9cacfa1b3907c Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Mon, 21 Dec 2020 21:32:29 +0100 Subject: [PATCH 04/38] Fix: support non-ubuntu/debian Linux variants with LSB support (#8408) This now generates a warning, as we would still like people to make a Pull Request to support the target. But it does continue with packing to a txz. --- cmake/InstallAndPackage.cmake | 47 ++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake index 53b6ce3e2c..3f33f699ee 100644 --- a/cmake/InstallAndPackage.cmake +++ b/cmake/InstallAndPackage.cmake @@ -114,31 +114,38 @@ elseif(UNIX) # With FHS, we can create deb/rpm/... Without it, they would be horribly broken # and not work. The other way around is also true; with FHS they are not # usable, and only flat formats work. - if(OPTION_INSTALL_FHS) - set(CPACK_GENERATOR "DEB") - include(PackageDeb) - else() + if(NOT OPTION_INSTALL_FHS) set(CPACK_GENERATOR "TXZ") - endif() - - find_program(LSB_RELEASE_EXEC lsb_release) - execute_process(COMMAND ${LSB_RELEASE_EXEC} -is - OUTPUT_VARIABLE LSB_RELEASE_ID - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - if(NOT LSB_RELEASE_ID) - set(PLATFORM "generic") - elseif(LSB_RELEASE_ID STREQUAL "Ubuntu" OR LSB_RELEASE_ID STREQUAL "Debian") - execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs - OUTPUT_VARIABLE LSB_RELEASE_CODENAME + else() + find_program(LSB_RELEASE_EXEC lsb_release) + execute_process(COMMAND ${LSB_RELEASE_EXEC} -is + OUTPUT_VARIABLE LSB_RELEASE_ID OUTPUT_STRIP_TRAILING_WHITESPACE ) - string(TOLOWER "${LSB_RELEASE_ID}-${LSB_RELEASE_CODENAME}" PLATFORM) - else() - message(FATAL_ERROR "Unknown Linux distribution found for packaging; please consider creating a Pull Request to add support for this distribution.") + if(NOT LSB_RELEASE_ID) + set(PLATFORM "generic") + set(CPACK_GENERATOR "TXZ") + + message(WARNING "Unknown Linux distribution found for packaging; can only pack to a txz. Please consider creating a Pull Request to add support for this distribution.") + elseif(LSB_RELEASE_ID STREQUAL "Ubuntu" OR LSB_RELEASE_ID STREQUAL "Debian") + execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs + OUTPUT_VARIABLE LSB_RELEASE_CODENAME + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(TOLOWER "${LSB_RELEASE_ID}-${LSB_RELEASE_CODENAME}" PLATFORM) + + set(CPACK_GENERATOR "DEB") + include(PackageDeb) + else() + set(PLATFORM "unknown") + set(CPACK_GENERATOR "TXZ") + + message(WARNING "Unknown LSB-based Linux distribution '${LSB_RELEASE_ID}' found for packaging; can only pack to a txz. Please consider creating a Pull Request to add support for this distribution.") + endif() + + set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}") endif() - set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}") else() message(FATAL_ERROR "Unknown OS found for packaging; please consider creating a Pull Request to add support for this OS.") endif() From 34051c10df373da8f85675d2a02043c3c92c4eed Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Mon, 21 Dec 2020 22:28:56 +0100 Subject: [PATCH 05/38] Doc: some comments for the win32 video driver (#8409) Co-authored-by: Niels Martin Hansen --- src/video/win32_v.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 3411873201..fa780dd3d5 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -44,18 +44,18 @@ typedef BOOL (WINAPI *PFNTRACKMOUSEEVENT)(LPTRACKMOUSEEVENT lpEventTrack); static PFNTRACKMOUSEEVENT _pTrackMouseEvent = nullptr; static struct { - HWND main_wnd; - HBITMAP dib_sect; - void *buffer_bits; - HPALETTE gdi_palette; - RECT update_rect; - int width; - int height; - int width_org; - int height_org; - bool fullscreen; - bool has_focus; - bool running; + HWND main_wnd; ///< Handle to system window. + HBITMAP dib_sect; ///< System bitmap object referencing our rendering buffer. + void *buffer_bits; ///< Internal rendering buffer. + HPALETTE gdi_palette; ///< Palette object for 8bpp blitter. + RECT update_rect; ///< Current dirty rect. + int width; ///< Width in pixels of our display surface. + int height; ///< Height in pixels of our display surface. + int width_org; ///< Original monitor resolution width, before we changed it. + int height_org; ///< Original monitor resolution height, before we changed it. + bool fullscreen; ///< Whether to use (true) fullscreen mode. + bool has_focus; ///< Does our window have system focus? + bool running; ///< Is the main loop running? } _wnd; bool _force_full_redraw; @@ -262,6 +262,8 @@ static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT_PTR event, DW */ bool VideoDriver_Win32::MakeWindow(bool full_screen) { + /* full_screen is whether the new window should be fullscreen, + * _wnd.fullscreen is whether the current window is. */ _fullscreen = full_screen; /* recreate window? */ From d05be2cff55b71247d747fa2df1650023be0c38c Mon Sep 17 00:00:00 2001 From: Xaroth Brook Date: Wed, 16 Dec 2020 22:54:52 +0100 Subject: [PATCH 06/38] Cleanup: Rework the CargoSpec macro for improved readability. --- src/lang/english.txt | 8 +- src/table/cargo_const.h | 218 ++++++++++++++-------------------------- src/table/sprites.h | 19 ++-- 3 files changed, 92 insertions(+), 153 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index d829b44361..6d11d2d761 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Wheat STR_CARGO_PLURAL_RUBBER :Rubber STR_CARGO_PLURAL_SUGAR :Sugar STR_CARGO_PLURAL_TOYS :Toys -STR_CARGO_PLURAL_CANDY :Sweets +STR_CARGO_PLURAL_SWEETS :Sweets STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Candyfloss +STR_CARGO_PLURAL_CANDYFLOSS :Candyfloss STR_CARGO_PLURAL_BUBBLES :Bubbles STR_CARGO_PLURAL_TOFFEE :Toffee STR_CARGO_PLURAL_BATTERIES :Batteries @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Wheat STR_CARGO_SINGULAR_RUBBER :Rubber STR_CARGO_SINGULAR_SUGAR :Sugar STR_CARGO_SINGULAR_TOY :Toy -STR_CARGO_SINGULAR_CANDY :Sweet +STR_CARGO_SINGULAR_SWEETS :Sweet STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Candyfloss +STR_CARGO_SINGULAR_CANDYFLOSS :Candyfloss STR_CARGO_SINGULAR_BUBBLE :Bubble STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Battery diff --git a/src/table/cargo_const.h b/src/table/cargo_const.h index ad1ed8a215..8518a25614 100644 --- a/src/table/cargo_const.h +++ b/src/table/cargo_const.h @@ -7,157 +7,91 @@ /** @file cargo_const.h Table of all default cargo types */ -/** Construction macro for a #CargoSpec structure. */ -#define MK(bt, label, c, e, f, g, h, fr, te, ks1, ks2, ks3, ks4, ks5, l, m, cmult) \ - {bt, label, c, c, e, cmult, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, nullptr, nullptr, 0} +/** Construction macros for the #CargoSpec StringID entries. */ +#define MK_STR_CARGO_PLURAL(label_plural) STR_CARGO_PLURAL_ ## label_plural +#define MK_STR_CARGO_SINGULAR(label_singular) STR_CARGO_SINGULAR_ ## label_singular +#define MK_STR_QUANTITY(label_plural) STR_QUANTITY_ ## label_plural +#define MK_STR_ABBREV(label_plural) STR_ABBREV_ ## label_plural +/** Construction macros for the #CargoSpec SpriteID entry. */ +#define MK_SPRITE(label_plural) SPR_CARGO_ ## label_plural + +/** + * Construction macro for a #CargoSpec structure. + * The order of arguments matches the order in which they are defined in #CargoSpec. + * Some macros are used to automatically expand to the correct StringID consts, this + * means that adding/changing a cargo spec requires updating of the following strings: + * - STR_CARGO_PLURAL_ + * - STR_CARGO_SINGULAR_ + * - STR_QUANTITY_ + * - STR_ABBREV_ + * And the following sprite: + * - SPR_CARGO_ + * + * @param bt Cargo bit number, is #INVALID_CARGO for a non-used spec. + * @param label Unique label of the cargo type. + * @param colour CargoSpec->legend_colour and CargoSpec->rating_colour. + * @param weight Weight of a single unit of this cargo type in 1/16 ton (62.5 kg). + * @param mult Capacity multiplier for vehicles. (8 fractional bits). + * @param ip CargoSpec->initial_payment. + * @param td1 CargoSpec->transit_days[0]. + * @param td2 CargoSpec->transit_days[1]. + * @param freight Cargo type is considered to be freight (affects train freight multiplier). + * @param te The effect that delivering this cargo type has on towns. Also affects destination of subsidies. + * @param str_plural The name suffix used to populate CargoSpec->name, CargoSpec->quantifier, + * CargoSpec->abbrev and CargoSpec->sprite. See above for more detailed information. + * @param str_singular The name suffix used to populate CargoSpec->name_single. See above for more information. + * @param str_volume Name of a single unit of cargo of this type. + * @param classes Classes of this cargo type. @see CargoClass + */ +#define MK(bt, label, colour, weight, mult, ip, td1, td2, freight, te, str_plural, str_singular, str_volume, classes) \ + {bt, label, colour, colour, weight, mult, ip, {td1, td2}, freight, te, 0, 0, \ + MK_STR_CARGO_PLURAL(str_plural), MK_STR_CARGO_SINGULAR(str_singular), str_volume, MK_STR_QUANTITY(str_plural), MK_STR_ABBREV(str_plural), \ + MK_SPRITE(str_plural), classes, nullptr, nullptr, 0} + /** Cargo types available by default. */ static const CargoSpec _default_cargo[] = { - MK( 0, 'PASS', 152, 1, 3185, 0, 24, false, TE_PASSENGERS, - STR_CARGO_PLURAL_PASSENGERS, STR_CARGO_SINGULAR_PASSENGER, STR_PASSENGERS, STR_QUANTITY_PASSENGERS, STR_ABBREV_PASSENGERS, - SPR_CARGO_PASSENGER, CC_PASSENGERS, 0x400), - - MK( 1, 'COAL', 6, 16, 5916, 7, 255, true, TE_NONE, - STR_CARGO_PLURAL_COAL, STR_CARGO_SINGULAR_COAL, STR_TONS, STR_QUANTITY_COAL, STR_ABBREV_COAL, - SPR_CARGO_COAL, CC_BULK, 0x100), - - MK( 2, 'MAIL', 15, 4, 4550, 20, 90, false, TE_MAIL, - STR_CARGO_PLURAL_MAIL, STR_CARGO_SINGULAR_MAIL, STR_BAGS, STR_QUANTITY_MAIL, STR_ABBREV_MAIL, - SPR_CARGO_MAIL, CC_MAIL, 0x200), - + MK( 0, 'PASS', 152, 1, 0x400, 3185, 0, 24, false, TE_PASSENGERS, PASSENGERS, PASSENGER, STR_PASSENGERS, CC_PASSENGERS), + MK( 1, 'COAL', 6, 16, 0x100, 5916, 7, 255, true, TE_NONE, COAL, COAL, STR_TONS, CC_BULK), + MK( 2, 'MAIL', 15, 4, 0x200, 4550, 20, 90, false, TE_MAIL, MAIL, MAIL, STR_BAGS, CC_MAIL), /* Oil in temperate and arctic */ - MK( 3, 'OIL_', 174, 16, 4437, 25, 255, true, TE_NONE, - STR_CARGO_PLURAL_OIL, STR_CARGO_SINGULAR_OIL, STR_LITERS, STR_QUANTITY_OIL, STR_ABBREV_OIL, - SPR_CARGO_OIL, CC_LIQUID, 0x100), - + MK( 3, 'OIL_', 174, 16, 0x100, 4437, 25, 255, true, TE_NONE, OIL, OIL, STR_LITERS, CC_LIQUID), /* Oil in subtropic */ - MK( 3, 'OIL_', 174, 16, 4892, 25, 255, true, TE_NONE, - STR_CARGO_PLURAL_OIL, STR_CARGO_SINGULAR_OIL, STR_LITERS, STR_QUANTITY_OIL, STR_ABBREV_OIL, - SPR_CARGO_OIL, CC_LIQUID, 0x100), - - MK( 4, 'LVST', 208, 3, 4322, 4, 18, true, TE_NONE, - STR_CARGO_PLURAL_LIVESTOCK, STR_CARGO_SINGULAR_LIVESTOCK, STR_ITEMS, STR_QUANTITY_LIVESTOCK, STR_ABBREV_LIVESTOCK, - SPR_CARGO_LIVESTOCK, CC_PIECE_GOODS, 0x100), - - MK( 5, 'GOOD', 194, 8, 6144, 5, 28, true, TE_GOODS, - STR_CARGO_PLURAL_GOODS, STR_CARGO_SINGULAR_GOODS, STR_CRATES, STR_QUANTITY_GOODS, STR_ABBREV_GOODS, - SPR_CARGO_GOODS, CC_EXPRESS, 0x200), - - MK( 6, 'GRAI', 191, 16, 4778, 4, 40, true, TE_NONE, - STR_CARGO_PLURAL_GRAIN, STR_CARGO_SINGULAR_GRAIN, STR_TONS, STR_QUANTITY_GRAIN, STR_ABBREV_GRAIN, - SPR_CARGO_GRAIN, CC_BULK, 0x100), - - MK( 6, 'WHEA', 191, 16, 4778, 4, 40, true, TE_NONE, - STR_CARGO_PLURAL_WHEAT, STR_CARGO_SINGULAR_WHEAT, STR_TONS, STR_QUANTITY_WHEAT, STR_ABBREV_WHEAT, - SPR_CARGO_GRAIN, CC_BULK, 0x100), - - MK( 6, 'MAIZ', 191, 16, 4322, 4, 40, true, TE_NONE, - STR_CARGO_PLURAL_MAIZE, STR_CARGO_SINGULAR_MAIZE, STR_TONS, STR_QUANTITY_MAIZE, STR_ABBREV_MAIZE, - SPR_CARGO_GRAIN, CC_BULK, 0x100), - + MK( 3, 'OIL_', 174, 16, 0x100, 4892, 25, 255, true, TE_NONE, OIL, OIL, STR_LITERS, CC_LIQUID), + MK( 4, 'LVST', 208, 3, 0x100, 4322, 4, 18, true, TE_NONE, LIVESTOCK, LIVESTOCK, STR_ITEMS, CC_PIECE_GOODS), + MK( 5, 'GOOD', 194, 8, 0x200, 6144, 5, 28, true, TE_GOODS, GOODS, GOODS, STR_CRATES, CC_EXPRESS), + MK( 6, 'GRAI', 191, 16, 0x100, 4778, 4, 40, true, TE_NONE, GRAIN, GRAIN, STR_TONS, CC_BULK), + MK( 6, 'WHEA', 191, 16, 0x100, 4778, 4, 40, true, TE_NONE, WHEAT, WHEAT, STR_TONS, CC_BULK), + MK( 6, 'MAIZ', 191, 16, 0x100, 4322, 4, 40, true, TE_NONE, MAIZE, MAIZE, STR_TONS, CC_BULK), /* Wood in temperate and arctic */ - MK( 7, 'WOOD', 84, 16, 5005, 15, 255, true, TE_NONE, - STR_CARGO_PLURAL_WOOD, STR_CARGO_SINGULAR_WOOD, STR_TONS, STR_QUANTITY_WOOD, STR_ABBREV_WOOD, - SPR_CARGO_WOOD, CC_PIECE_GOODS, 0x100), - + MK( 7, 'WOOD', 84, 16, 0x100, 5005, 15, 255, true, TE_NONE, WOOD, WOOD, STR_TONS, CC_PIECE_GOODS), /* Wood in subtropic */ - MK( 7, 'WOOD', 84, 16, 7964, 15, 255, true, TE_NONE, - STR_CARGO_PLURAL_WOOD, STR_CARGO_SINGULAR_WOOD, STR_TONS, STR_QUANTITY_WOOD, STR_ABBREV_WOOD, - SPR_CARGO_WOOD, CC_PIECE_GOODS, 0x100), - - MK( 8, 'IORE', 184, 16, 5120, 9, 255, true, TE_NONE, - STR_CARGO_PLURAL_IRON_ORE, STR_CARGO_SINGULAR_IRON_ORE, STR_TONS, STR_QUANTITY_IRON_ORE, STR_ABBREV_IRON_ORE, - SPR_CARGO_IRON_ORE, CC_BULK, 0x100), - - MK( 9, 'STEL', 10, 16, 5688, 7, 255, true, TE_NONE, - STR_CARGO_PLURAL_STEEL, STR_CARGO_SINGULAR_STEEL, STR_TONS, STR_QUANTITY_STEEL, STR_ABBREV_STEEL, - SPR_CARGO_STEEL, CC_PIECE_GOODS, 0x100), - - MK( 10, 'VALU', 202, 2, 7509, 1, 32, true, TE_NONE, - STR_CARGO_PLURAL_VALUABLES, STR_CARGO_SINGULAR_VALUABLES, STR_BAGS, STR_QUANTITY_VALUABLES, STR_ABBREV_VALUABLES, - SPR_CARGO_VALUES_GOLD, CC_ARMOURED, 0x100), - - MK( 10, 'GOLD', 202, 8, 5802, 10, 40, true, TE_NONE, - STR_CARGO_PLURAL_GOLD, STR_CARGO_SINGULAR_GOLD, STR_BAGS, STR_QUANTITY_GOLD, STR_ABBREV_GOLD, - SPR_CARGO_VALUES_GOLD, CC_ARMOURED, 0x100), - - MK( 10, 'DIAM', 202, 2, 5802, 10, 255, true, TE_NONE, - STR_CARGO_PLURAL_DIAMONDS, STR_CARGO_SINGULAR_DIAMOND, STR_BAGS, STR_QUANTITY_DIAMONDS, STR_ABBREV_DIAMONDS, - SPR_CARGO_DIAMONDS, CC_ARMOURED, 0x100), - - MK( 11, 'PAPR', 10, 16, 5461, 7, 60, true, TE_NONE, - STR_CARGO_PLURAL_PAPER, STR_CARGO_SINGULAR_PAPER, STR_TONS, STR_QUANTITY_PAPER, STR_ABBREV_PAPER, - SPR_CARGO_PAPER, CC_PIECE_GOODS, 0x100), - - MK( 12, 'FOOD', 48, 16, 5688, 0, 30, true, TE_FOOD, - STR_CARGO_PLURAL_FOOD, STR_CARGO_SINGULAR_FOOD, STR_TONS, STR_QUANTITY_FOOD, STR_ABBREV_FOOD, - SPR_CARGO_FOOD, CC_EXPRESS | CC_REFRIGERATED, 0x100), - - MK( 13, 'FRUT', 208, 16, 4209, 0, 15, true, TE_NONE, - STR_CARGO_PLURAL_FRUIT, STR_CARGO_SINGULAR_FRUIT, STR_TONS, STR_QUANTITY_FRUIT, STR_ABBREV_FRUIT, - SPR_CARGO_FRUIT, CC_BULK | CC_REFRIGERATED, 0x100), - - MK( 14, 'CORE', 184, 16, 4892, 12, 255, true, TE_NONE, - STR_CARGO_PLURAL_COPPER_ORE, STR_CARGO_SINGULAR_COPPER_ORE, STR_TONS, STR_QUANTITY_COPPER_ORE, STR_ABBREV_COPPER_ORE, - SPR_CARGO_COPPER_ORE, CC_BULK, 0x100), - - MK( 15, 'WATR', 10, 16, 4664, 20, 80, true, TE_WATER, - STR_CARGO_PLURAL_WATER, STR_CARGO_SINGULAR_WATER, STR_LITERS, STR_QUANTITY_WATER, STR_ABBREV_WATER, - SPR_CARGO_WATERCOLA, CC_LIQUID, 0x100), - - MK( 16, 'RUBR', 6, 16, 4437, 2, 20, true, TE_NONE, - STR_CARGO_PLURAL_RUBBER, STR_CARGO_SINGULAR_RUBBER, STR_LITERS, STR_QUANTITY_RUBBER, STR_ABBREV_RUBBER, - SPR_CARGO_RUBBER, CC_LIQUID, 0x100), - - MK( 17, 'SUGR', 6, 16, 4437, 20, 255, true, TE_NONE, - STR_CARGO_PLURAL_SUGAR, STR_CARGO_SINGULAR_SUGAR, STR_TONS, STR_QUANTITY_SUGAR, STR_ABBREV_SUGAR, - SPR_CARGO_SUGAR, CC_BULK, 0x100), - - MK( 18, 'TOYS', 174, 2, 5574, 25, 255, true, TE_NONE, - STR_CARGO_PLURAL_TOYS, STR_CARGO_SINGULAR_TOY, STR_ITEMS, STR_QUANTITY_TOYS, STR_ABBREV_TOYS, - SPR_CARGO_TOYS, CC_PIECE_GOODS, 0x100), - - MK( 19, 'BATT', 208, 4, 4322, 2, 30, true, TE_NONE, - STR_CARGO_PLURAL_BATTERIES, STR_CARGO_SINGULAR_BATTERY, STR_ITEMS, STR_QUANTITY_BATTERIES, STR_ABBREV_BATTERIES, - SPR_CARGO_BATTERIES, CC_PIECE_GOODS, 0x100), - - MK( 20, 'SWET', 194, 5, 6144, 8, 40, true, TE_GOODS, - STR_CARGO_PLURAL_CANDY, STR_CARGO_SINGULAR_CANDY, STR_BAGS, STR_QUANTITY_SWEETS, STR_ABBREV_SWEETS, - SPR_CARGO_CANDY, CC_EXPRESS, 0x200), - - MK( 21, 'TOFF', 191, 16, 4778, 14, 60, true, TE_NONE, - STR_CARGO_PLURAL_TOFFEE, STR_CARGO_SINGULAR_TOFFEE, STR_TONS, STR_QUANTITY_TOFFEE, STR_ABBREV_TOFFEE, - SPR_CARGO_TOFFEE, CC_BULK, 0x100), - - MK( 22, 'COLA', 84, 16, 4892, 5, 75, true, TE_NONE, - STR_CARGO_PLURAL_COLA, STR_CARGO_SINGULAR_COLA, STR_LITERS, STR_QUANTITY_COLA, STR_ABBREV_COLA, - SPR_CARGO_WATERCOLA, CC_LIQUID, 0x100), - - MK( 23, 'CTCD', 184, 16, 5005, 10, 25, true, TE_NONE, - STR_CARGO_PLURAL_COTTON_CANDY, STR_CARGO_SINGULAR_COTTON_CANDY, STR_TONS, STR_QUANTITY_CANDYFLOSS, STR_ABBREV_CANDYFLOSS, - SPR_CARGO_COTTONCANDY, CC_BULK, 0x100), - - MK( 24, 'BUBL', 10, 1, 5077, 20, 80, true, TE_NONE, - STR_CARGO_PLURAL_BUBBLES, STR_CARGO_SINGULAR_BUBBLE, STR_ITEMS, STR_QUANTITY_BUBBLES, STR_ABBREV_BUBBLES, - SPR_CARGO_BUBBLES, CC_PIECE_GOODS, 0x100), - - MK( 25, 'PLST', 202, 16, 4664, 30, 255, true, TE_NONE, - STR_CARGO_PLURAL_PLASTIC, STR_CARGO_SINGULAR_PLASTIC, STR_LITERS, STR_QUANTITY_PLASTIC, STR_ABBREV_PLASTIC, - SPR_CARGO_PLASTIC, CC_LIQUID, 0x100), - - MK( 26, 'FZDR', 48, 2, 6250, 30, 50, true, TE_FOOD, - STR_CARGO_PLURAL_FIZZY_DRINKS, STR_CARGO_SINGULAR_FIZZY_DRINK, STR_ITEMS, STR_QUANTITY_FIZZY_DRINKS, STR_ABBREV_FIZZY_DRINKS, - SPR_CARGO_FIZZYDRINK, CC_PIECE_GOODS, 0x100), + MK( 7, 'WOOD', 84, 16, 0x100, 7964, 15, 255, true, TE_NONE, WOOD, WOOD, STR_TONS, CC_PIECE_GOODS), + MK( 8, 'IORE', 184, 16, 0x100, 5120, 9, 255, true, TE_NONE, IRON_ORE, IRON_ORE, STR_TONS, CC_BULK), + MK( 9, 'STEL', 10, 16, 0x100, 5688, 7, 255, true, TE_NONE, STEEL, STEEL, STR_TONS, CC_PIECE_GOODS), + MK( 10, 'VALU', 202, 2, 0x100, 7509, 1, 32, true, TE_NONE, VALUABLES, VALUABLES, STR_BAGS, CC_ARMOURED), + MK( 10, 'GOLD', 202, 8, 0x100, 5802, 10, 40, true, TE_NONE, GOLD, GOLD, STR_BAGS, CC_ARMOURED), + MK( 10, 'DIAM', 202, 2, 0x100, 5802, 10, 255, true, TE_NONE, DIAMONDS, DIAMOND, STR_BAGS, CC_ARMOURED), + MK( 11, 'PAPR', 10, 16, 0x100, 5461, 7, 60, true, TE_NONE, PAPER, PAPER, STR_TONS, CC_PIECE_GOODS), + MK( 12, 'FOOD', 48, 16, 0x100, 5688, 0, 30, true, TE_FOOD, FOOD, FOOD, STR_TONS, CC_EXPRESS | CC_REFRIGERATED), + MK( 13, 'FRUT', 208, 16, 0x100, 4209, 0, 15, true, TE_NONE, FRUIT, FRUIT, STR_TONS, CC_BULK | CC_REFRIGERATED), + MK( 14, 'CORE', 184, 16, 0x100, 4892, 12, 255, true, TE_NONE, COPPER_ORE, COPPER_ORE, STR_TONS, CC_BULK), + MK( 15, 'WATR', 10, 16, 0x100, 4664, 20, 80, true, TE_WATER, WATER, WATER, STR_LITERS, CC_LIQUID), + MK( 16, 'RUBR', 6, 16, 0x100, 4437, 2, 20, true, TE_NONE, RUBBER, RUBBER, STR_LITERS, CC_LIQUID), + MK( 17, 'SUGR', 6, 16, 0x100, 4437, 20, 255, true, TE_NONE, SUGAR, SUGAR, STR_TONS, CC_BULK), + MK( 18, 'TOYS', 174, 2, 0x100, 5574, 25, 255, true, TE_NONE, TOYS, TOY, STR_ITEMS, CC_PIECE_GOODS), + MK( 19, 'BATT', 208, 4, 0x100, 4322, 2, 30, true, TE_NONE, BATTERIES, BATTERY, STR_ITEMS, CC_PIECE_GOODS), + MK( 20, 'SWET', 194, 5, 0x200, 6144, 8, 40, true, TE_GOODS, SWEETS, SWEETS, STR_BAGS, CC_EXPRESS), + MK( 21, 'TOFF', 191, 16, 0x100, 4778, 14, 60, true, TE_NONE, TOFFEE, TOFFEE, STR_TONS, CC_BULK), + MK( 22, 'COLA', 84, 16, 0x100, 4892, 5, 75, true, TE_NONE, COLA, COLA, STR_LITERS, CC_LIQUID), + MK( 23, 'CTCD', 184, 16, 0x100, 5005, 10, 25, true, TE_NONE, CANDYFLOSS, CANDYFLOSS, STR_TONS, CC_BULK), + MK( 24, 'BUBL', 10, 1, 0x100, 5077, 20, 80, true, TE_NONE, BUBBLES, BUBBLE, STR_ITEMS, CC_PIECE_GOODS), + MK( 25, 'PLST', 202, 16, 0x100, 4664, 30, 255, true, TE_NONE, PLASTIC, PLASTIC, STR_LITERS, CC_LIQUID), + MK( 26, 'FZDR', 48, 2, 0x100, 6250, 30, 50, true, TE_FOOD, FIZZY_DRINKS, FIZZY_DRINK, STR_ITEMS, CC_PIECE_GOODS), /* Void slot in temperate */ - MK( 0xFF, 0, 1, 0, 5688, 0, 30, true, TE_NONE, - STR_CARGO_PLURAL_NOTHING, STR_CARGO_SINGULAR_NOTHING, STR_TONS, STR_QUANTITY_NOTHING, STR_ABBREV_NOTHING, - SPR_ASCII_SPACE, CC_NOAVAILABLE, 0x100), - + MK(0xFF, 0, 1, 0, 0x100, 5688, 0, 30, true, TE_NONE, NOTHING, NOTHING, STR_TONS, CC_NOAVAILABLE), /* Void slot in arctic */ - MK( 0xFF, 0, 184, 0, 5120, 9, 255, true, TE_NONE, - STR_CARGO_PLURAL_NOTHING, STR_CARGO_SINGULAR_NOTHING, STR_TONS, STR_QUANTITY_NOTHING, STR_ABBREV_NOTHING, - SPR_ASCII_SPACE, CC_NOAVAILABLE, 0x100), - + MK(0xFF, 0, 184, 0, 0x100, 5120, 9, 255, true, TE_NONE, NOTHING, NOTHING, STR_TONS, CC_NOAVAILABLE), }; diff --git a/src/table/sprites.h b/src/table/sprites.h index 5df55b8ae4..64f628e5d1 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -1139,33 +1139,38 @@ static const SpriteID SPR_IT_TOY_FACTORY_ROBOT = 4720; static const SpriteID SPR_IT_POWER_PLANT_TRANSFORMERS = 2054; /* small icons of cargo available in station waiting*/ -static const SpriteID SPR_CARGO_PASSENGER = 4297; +static const SpriteID SPR_CARGO_PASSENGERS = 4297; static const SpriteID SPR_CARGO_COAL = 4298; static const SpriteID SPR_CARGO_MAIL = 4299; static const SpriteID SPR_CARGO_OIL = 4300; static const SpriteID SPR_CARGO_LIVESTOCK = 4301; static const SpriteID SPR_CARGO_GOODS = 4302; -static const SpriteID SPR_CARGO_GRAIN = 4303; +static const SpriteID SPR_CARGO_GRAIN = 4303; // shared sprite with SPR_CARGO_WHEAT, SPR_CARGO_MAIZE +static const SpriteID SPR_CARGO_WHEAT = 4303; // shared sprite with SPR_CARGO_GRAIN, SPR_CARGO_MAIZE +static const SpriteID SPR_CARGO_MAIZE = 4303; // shared sprite with SPR_CARGO_GRAIN, SPR_CARGO_WHEAT static const SpriteID SPR_CARGO_WOOD = 4304; static const SpriteID SPR_CARGO_IRON_ORE = 4305; static const SpriteID SPR_CARGO_STEEL = 4306; -static const SpriteID SPR_CARGO_VALUES_GOLD = 4307; // shared between temperate and arctic +static const SpriteID SPR_CARGO_VALUABLES = 4307; // shared between temperate and arctic ( SPR_CARGO_GOLD ) +static const SpriteID SPR_CARGO_GOLD = 4307; // shared between temperate and arctic ( SPR_CARGO_VALUABLES ) static const SpriteID SPR_CARGO_FRUIT = 4308; static const SpriteID SPR_CARGO_COPPER_ORE = 4309; -static const SpriteID SPR_CARGO_WATERCOLA = 4310; // shared between desert and toyland +static const SpriteID SPR_CARGO_WATER = 4310; // shared between desert and toyland ( SPR_CARGO_COLA ) +static const SpriteID SPR_CARGO_COLA = 4310; // shared between desert and toyland ( SPR_CARGO_WATER ) static const SpriteID SPR_CARGO_DIAMONDS = 4311; static const SpriteID SPR_CARGO_FOOD = 4312; static const SpriteID SPR_CARGO_PAPER = 4313; static const SpriteID SPR_CARGO_RUBBER = 4314; -static const SpriteID SPR_CARGO_CANDY = 4315; +static const SpriteID SPR_CARGO_SWEETS = 4315; static const SpriteID SPR_CARGO_SUGAR = 4316; static const SpriteID SPR_CARGO_TOYS = 4317; -static const SpriteID SPR_CARGO_COTTONCANDY = 4318; -static const SpriteID SPR_CARGO_FIZZYDRINK = 4319; +static const SpriteID SPR_CARGO_CANDYFLOSS = 4318; +static const SpriteID SPR_CARGO_FIZZY_DRINKS = 4319; static const SpriteID SPR_CARGO_TOFFEE = 4320; static const SpriteID SPR_CARGO_BUBBLES = 4321; static const SpriteID SPR_CARGO_PLASTIC = 4322; static const SpriteID SPR_CARGO_BATTERIES = 4323; +static const SpriteID SPR_CARGO_NOTHING = SPR_ASCII_SPACE; // Placeholder for void cargo slots. /* Effect vehicles */ static const SpriteID SPR_BULLDOZER_NE = 1416; From 86e08aa8ef57822e3080b859ffe2802c8996bd9e Mon Sep 17 00:00:00 2001 From: Xaroth Brook Date: Wed, 16 Dec 2020 23:05:43 +0100 Subject: [PATCH 07/38] Update: Apply name changes to all languages. --- src/lang/afrikaans.txt | 8 +++--- src/lang/arabic_egypt.txt | 8 +++--- src/lang/basque.txt | 8 +++--- src/lang/belarusian.txt | 38 +++++++++++++-------------- src/lang/brazilian_portuguese.txt | 8 +++--- src/lang/bulgarian.txt | 8 +++--- src/lang/catalan.txt | 8 +++--- src/lang/croatian.txt | 18 ++++++------- src/lang/czech.txt | 14 +++++----- src/lang/danish.txt | 8 +++--- src/lang/dutch.txt | 8 +++--- src/lang/english_AU.txt | 8 +++--- src/lang/english_US.txt | 8 +++--- src/lang/esperanto.txt | 8 +++--- src/lang/estonian.txt | 10 +++---- src/lang/faroese.txt | 8 +++--- src/lang/finnish.txt | 8 +++--- src/lang/french.txt | 8 +++--- src/lang/gaelic.txt | 26 +++++++++--------- src/lang/galician.txt | 8 +++--- src/lang/german.txt | 8 +++--- src/lang/greek.txt | 14 +++++----- src/lang/hebrew.txt | 10 +++---- src/lang/hungarian.txt | 14 +++++----- src/lang/icelandic.txt | 8 +++--- src/lang/indonesian.txt | 8 +++--- src/lang/irish.txt | 8 +++--- src/lang/italian.txt | 8 +++--- src/lang/japanese.txt | 8 +++--- src/lang/korean.txt | 8 +++--- src/lang/latin.txt | 26 +++++++++--------- src/lang/latvian.txt | 8 +++--- src/lang/lithuanian.txt | 20 +++++++------- src/lang/luxembourgish.txt | 8 +++--- src/lang/malay.txt | 8 +++--- src/lang/norwegian_bokmal.txt | 8 +++--- src/lang/norwegian_nynorsk.txt | 8 +++--- src/lang/polish.txt | 42 +++++++++++++++--------------- src/lang/portuguese.txt | 8 +++--- src/lang/romanian.txt | 8 +++--- src/lang/russian.txt | 20 +++++++------- src/lang/serbian.txt | 26 +++++++++--------- src/lang/simplified_chinese.txt | 8 +++--- src/lang/slovak.txt | 14 +++++----- src/lang/slovenian.txt | 26 +++++++++--------- src/lang/spanish.txt | 8 +++--- src/lang/spanish_MX.txt | 8 +++--- src/lang/swedish.txt | 8 +++--- src/lang/tamil.txt | 8 +++--- src/lang/thai.txt | 8 +++--- src/lang/traditional_chinese.txt | 8 +++--- src/lang/turkish.txt | 8 +++--- src/lang/ukrainian.txt | 20 +++++++------- src/lang/unfinished/chuvash.txt | 8 +++--- src/lang/unfinished/frisian.txt | 8 +++--- src/lang/unfinished/ido.txt | 8 +++--- src/lang/unfinished/macedonian.txt | 8 +++--- src/lang/unfinished/maltese.txt | 8 +++--- src/lang/unfinished/marathi.txt | 8 +++--- src/lang/unfinished/persian.txt | 8 +++--- src/lang/unfinished/urdu.txt | 8 +++--- src/lang/vietnamese.txt | 8 +++--- src/lang/welsh.txt | 8 +++--- 63 files changed, 357 insertions(+), 357 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index abb65269a5..5ac444e61c 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Koring STR_CARGO_PLURAL_RUBBER :Rubber STR_CARGO_PLURAL_SUGAR :Suiker STR_CARGO_PLURAL_TOYS :Speelgoed -STR_CARGO_PLURAL_CANDY :Lekkers +STR_CARGO_PLURAL_SWEETS :Lekkers STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Spookasem +STR_CARGO_PLURAL_CANDYFLOSS :Spookasem STR_CARGO_PLURAL_BUBBLES :Borrels STR_CARGO_PLURAL_TOFFEE :Toffie STR_CARGO_PLURAL_BATTERIES :Batterye @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Koring STR_CARGO_SINGULAR_RUBBER :Rubber STR_CARGO_SINGULAR_SUGAR :Suiker STR_CARGO_SINGULAR_TOY :Speelding -STR_CARGO_SINGULAR_CANDY :Lekker +STR_CARGO_SINGULAR_SWEETS :Lekker STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Spookasem +STR_CARGO_SINGULAR_CANDYFLOSS :Spookasem STR_CARGO_SINGULAR_BUBBLE :Borrel STR_CARGO_SINGULAR_TOFFEE :Toffie STR_CARGO_SINGULAR_BATTERY :Battery diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index c5df571ea2..d86812afb1 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :قمح STR_CARGO_PLURAL_RUBBER :مطاط STR_CARGO_PLURAL_SUGAR :سكر STR_CARGO_PLURAL_TOYS :دُمَي -STR_CARGO_PLURAL_CANDY :حلويات +STR_CARGO_PLURAL_SWEETS :حلويات STR_CARGO_PLURAL_COLA :كولا -STR_CARGO_PLURAL_COTTON_CANDY :سكر نبات +STR_CARGO_PLURAL_CANDYFLOSS :سكر نبات STR_CARGO_PLURAL_BUBBLES :فقاعات STR_CARGO_PLURAL_TOFFEE :توفي STR_CARGO_PLURAL_BATTERIES :بطاريات @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :قمح STR_CARGO_SINGULAR_RUBBER :مطاط STR_CARGO_SINGULAR_SUGAR :سكر STR_CARGO_SINGULAR_TOY :دُمِيه -STR_CARGO_SINGULAR_CANDY :حلويات +STR_CARGO_SINGULAR_SWEETS :حلويات STR_CARGO_SINGULAR_COLA :كولا -STR_CARGO_SINGULAR_COTTON_CANDY :سكر نبات +STR_CARGO_SINGULAR_CANDYFLOSS :سكر نبات STR_CARGO_SINGULAR_BUBBLE :فقاعات STR_CARGO_SINGULAR_TOFFEE :توفي STR_CARGO_SINGULAR_BATTERY :بطاريات diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 088783db8a..3c84f8df62 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Garia STR_CARGO_PLURAL_RUBBER :Goma STR_CARGO_PLURAL_SUGAR :Azukrea STR_CARGO_PLURAL_TOYS :Jostailuak -STR_CARGO_PLURAL_CANDY :Gozokiak +STR_CARGO_PLURAL_SWEETS :Gozokiak STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Kotoiezko Azukrea +STR_CARGO_PLURAL_CANDYFLOSS :Kotoiezko Azukrea STR_CARGO_PLURAL_BUBBLES :Burbuilak STR_CARGO_PLURAL_TOFFEE :Gozoki lehengaia STR_CARGO_PLURAL_BATTERIES :Pilak @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Garia STR_CARGO_SINGULAR_RUBBER :Goma STR_CARGO_SINGULAR_SUGAR :Azukrea STR_CARGO_SINGULAR_TOY :Jostailua -STR_CARGO_SINGULAR_CANDY :Gozoki +STR_CARGO_SINGULAR_SWEETS :Gozoki STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Kotoiezko Azukrea +STR_CARGO_SINGULAR_CANDYFLOSS :Kotoiezko Azukrea STR_CARGO_SINGULAR_BUBBLE :Burbuila STR_CARGO_SINGULAR_TOFFEE :Gozoki lehengaia STR_CARGO_SINGULAR_BATTERY :Pila diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 29df4c3c2a..e295b60282 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -166,7 +166,7 @@ STR_CARGO_PLURAL_TOYS.dat :цацкам STR_CARGO_PLURAL_TOYS.acc :цацкі STR_CARGO_PLURAL_TOYS.abl :цацкамі STR_CARGO_PLURAL_TOYS.pre :цацках -STR_CARGO_PLURAL_CANDY :{G=p}Цукеркi +STR_CARGO_PLURAL_SWEETS :{G=p}Цукеркi STR_CARGO_PLURAL_CANDY.gen :цукерак STR_CARGO_PLURAL_CANDY.dat :цукеркам STR_CARGO_PLURAL_CANDY.acc :цукеркі @@ -178,12 +178,12 @@ STR_CARGO_PLURAL_COLA.dat :коле STR_CARGO_PLURAL_COLA.acc :колу STR_CARGO_PLURAL_COLA.abl :колай STR_CARGO_PLURAL_COLA.pre :коле -STR_CARGO_PLURAL_COTTON_CANDY :{G=f}Цукровая баўна -STR_CARGO_PLURAL_COTTON_CANDY.gen :цукровай баўны -STR_CARGO_PLURAL_COTTON_CANDY.dat :цукровай баўне -STR_CARGO_PLURAL_COTTON_CANDY.acc :цукровую баўну -STR_CARGO_PLURAL_COTTON_CANDY.abl :цукровай баўнай -STR_CARGO_PLURAL_COTTON_CANDY.pre :цукровай баўне +STR_CARGO_PLURAL_CANDYFLOSS :{G=f}Цукровая баўна +STR_CARGO_PLURAL_CANDYFLOSS.gen :цукровай баўны +STR_CARGO_PLURAL_CANDYFLOSS.dat :цукровай баўне +STR_CARGO_PLURAL_CANDYFLOSS.acc :цукровую баўну +STR_CARGO_PLURAL_CANDYFLOSS.abl :цукровай баўнай +STR_CARGO_PLURAL_CANDYFLOSS.pre :цукровай баўне STR_CARGO_PLURAL_BUBBLES :{G=p}Бурбалкi STR_CARGO_PLURAL_BUBBLES.gen :бурбалак STR_CARGO_PLURAL_BUBBLES.dat :бурбалкам @@ -355,24 +355,24 @@ STR_CARGO_SINGULAR_TOY.dat :цаццы STR_CARGO_SINGULAR_TOY.acc :цацку STR_CARGO_SINGULAR_TOY.abl :цацкай STR_CARGO_SINGULAR_TOY.pre :цаццы -STR_CARGO_SINGULAR_CANDY :{G=f}Цукерка -STR_CARGO_SINGULAR_CANDY.gen :цукеркі -STR_CARGO_SINGULAR_CANDY.dat :цукерцы -STR_CARGO_SINGULAR_CANDY.acc :цукерку -STR_CARGO_SINGULAR_CANDY.abl :цукеркай -STR_CARGO_SINGULAR_CANDY.pre :цукерцы +STR_CARGO_SINGULAR_SWEETS :{G=f}Цукерка +STR_CARGO_SINGULAR_SWEETS.gen :цукеркі +STR_CARGO_SINGULAR_SWEETS.dat :цукерцы +STR_CARGO_SINGULAR_SWEETS.acc :цукерку +STR_CARGO_SINGULAR_SWEETS.abl :цукеркай +STR_CARGO_SINGULAR_SWEETS.pre :цукерцы STR_CARGO_SINGULAR_COLA :{G=f}Кола STR_CARGO_SINGULAR_COLA.gen :колы STR_CARGO_SINGULAR_COLA.dat :коле STR_CARGO_SINGULAR_COLA.acc :колу STR_CARGO_SINGULAR_COLA.abl :колай STR_CARGO_SINGULAR_COLA.pre :коле -STR_CARGO_SINGULAR_COTTON_CANDY :{G=f}Цукровая баўна -STR_CARGO_SINGULAR_COTTON_CANDY.gen :цукровай баўны -STR_CARGO_SINGULAR_COTTON_CANDY.dat :цукровай баўне -STR_CARGO_SINGULAR_COTTON_CANDY.acc :цукровую баўну -STR_CARGO_SINGULAR_COTTON_CANDY.abl :цукровай баўнай -STR_CARGO_SINGULAR_COTTON_CANDY.pre :цукровай баўне +STR_CARGO_SINGULAR_CANDYFLOSS :{G=f}Цукровая баўна +STR_CARGO_SINGULAR_CANDYFLOSS.gen :цукровай баўны +STR_CARGO_SINGULAR_CANDYFLOSS.dat :цукровай баўне +STR_CARGO_SINGULAR_CANDYFLOSS.acc :цукровую баўну +STR_CARGO_SINGULAR_CANDYFLOSS.abl :цукровай баўнай +STR_CARGO_SINGULAR_CANDYFLOSS.pre :цукровай баўне STR_CARGO_SINGULAR_BUBBLE :{G=f}Бурбалка STR_CARGO_SINGULAR_BUBBLE.gen :бурбалкі STR_CARGO_SINGULAR_BUBBLE.dat :бурбалцы diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 040a6e0499..49d34f5bfe 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo STR_CARGO_PLURAL_RUBBER :{G=f}Borracha STR_CARGO_PLURAL_SUGAR :{G=m}Açúcar STR_CARGO_PLURAL_TOYS :{G=m}Brinquedos -STR_CARGO_PLURAL_CANDY :{G=m}Doces +STR_CARGO_PLURAL_SWEETS :{G=m}Doces STR_CARGO_PLURAL_COLA :{G=f}Cola -STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodão Doce +STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Algodão Doce STR_CARGO_PLURAL_BUBBLES :{G=f}Bolhas STR_CARGO_PLURAL_TOFFEE :{G=m}Caramelo STR_CARGO_PLURAL_BATTERIES :{G=f}Pilhas @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo STR_CARGO_SINGULAR_RUBBER :{G=f}Borracha STR_CARGO_SINGULAR_SUGAR :{G=m}Açúcar STR_CARGO_SINGULAR_TOY :{G=m}Brinquedo -STR_CARGO_SINGULAR_CANDY :{G=m}Doce +STR_CARGO_SINGULAR_SWEETS :{G=m}Doce STR_CARGO_SINGULAR_COLA :{G=m}Cola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodão doce +STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Algodão doce STR_CARGO_SINGULAR_BUBBLE :{G=f}Bolha STR_CARGO_SINGULAR_TOFFEE :{G=m}Caramelo STR_CARGO_SINGULAR_BATTERY :{G=f}Pilha diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 37ead463bd..c5a645caf8 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Пшеница STR_CARGO_PLURAL_RUBBER :Каучук STR_CARGO_PLURAL_SUGAR :Захар STR_CARGO_PLURAL_TOYS :Играчки -STR_CARGO_PLURAL_CANDY :Сладки +STR_CARGO_PLURAL_SWEETS :Сладки STR_CARGO_PLURAL_COLA :Кола -STR_CARGO_PLURAL_COTTON_CANDY :Захарен памук +STR_CARGO_PLURAL_CANDYFLOSS :Захарен памук STR_CARGO_PLURAL_BUBBLES :Балони STR_CARGO_PLURAL_TOFFEE :Карамел STR_CARGO_PLURAL_BATTERIES :Батерии @@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Пшеница STR_CARGO_SINGULAR_RUBBER :Каучук STR_CARGO_SINGULAR_SUGAR :Захар STR_CARGO_SINGULAR_TOY :Играчки -STR_CARGO_SINGULAR_CANDY :Сладки +STR_CARGO_SINGULAR_SWEETS :Сладки STR_CARGO_SINGULAR_COLA :Кола -STR_CARGO_SINGULAR_COTTON_CANDY :Захарен памук +STR_CARGO_SINGULAR_CANDYFLOSS :Захарен памук STR_CARGO_SINGULAR_BUBBLE :Балони STR_CARGO_SINGULAR_TOFFEE :Карамел STR_CARGO_SINGULAR_BATTERY :Батерии diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 958632690b..e2b4561029 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=Masculin}Bla STR_CARGO_PLURAL_RUBBER :{G=Masculin}Cautxú STR_CARGO_PLURAL_SUGAR :{G=Masculin}Sucre STR_CARGO_PLURAL_TOYS :{G=Femenin}Joguines -STR_CARGO_PLURAL_CANDY :{G=Masculin}Dolços +STR_CARGO_PLURAL_SWEETS :{G=Masculin}Dolços STR_CARGO_PLURAL_COLA :{G=Masculin}Refrescos -STR_CARGO_PLURAL_COTTON_CANDY :{G=Masculin}Cotó de sucre +STR_CARGO_PLURAL_CANDYFLOSS :{G=Masculin}Cotó de sucre STR_CARGO_PLURAL_BUBBLES :{G=Femenin}Bombolles STR_CARGO_PLURAL_TOFFEE :{G=Masculin}Caramels STR_CARGO_PLURAL_BATTERIES :{G=Femenin}Piles @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=Masculin}Bla STR_CARGO_SINGULAR_RUBBER :{G=Masculin}Cautxú STR_CARGO_SINGULAR_SUGAR :{G=Masculin}Sucre STR_CARGO_SINGULAR_TOY :{G=Femenin}Joguina -STR_CARGO_SINGULAR_CANDY :{G=Masculin}Dolç +STR_CARGO_SINGULAR_SWEETS :{G=Masculin}Dolç STR_CARGO_SINGULAR_COLA :{G=Masculin}Refresc -STR_CARGO_SINGULAR_COTTON_CANDY :{G=Masculin}Cotó de sucre +STR_CARGO_SINGULAR_CANDYFLOSS :{G=Masculin}Cotó de sucre STR_CARGO_SINGULAR_BUBBLE :{G=Femenin}Bombolla STR_CARGO_SINGULAR_TOFFEE :{G=Masculin}Caramel STR_CARGO_SINGULAR_BATTERY :{G=Femenin}Pila diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 8b44a0aea0..3566934e5b 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -73,12 +73,12 @@ STR_CARGO_PLURAL_SUGAR :Šećer STR_CARGO_PLURAL_SUGAR.gen :šećera STR_CARGO_PLURAL_TOYS :Igračke STR_CARGO_PLURAL_TOYS.gen :igračaka -STR_CARGO_PLURAL_CANDY :Slatkiši +STR_CARGO_PLURAL_SWEETS :Slatkiši STR_CARGO_PLURAL_CANDY.gen :slatkiša STR_CARGO_PLURAL_COLA :Cola STR_CARGO_PLURAL_COLA.gen :cole -STR_CARGO_PLURAL_COTTON_CANDY :Šećerna vuna -STR_CARGO_PLURAL_COTTON_CANDY.gen :šećerne vune +STR_CARGO_PLURAL_CANDYFLOSS :Šećerna vuna +STR_CARGO_PLURAL_CANDYFLOSS.gen :šećerne vune STR_CARGO_PLURAL_BUBBLES :Baloni STR_CARGO_PLURAL_BUBBLES.gen :balona STR_CARGO_PLURAL_TOFFEE :Mliječne karamele @@ -161,15 +161,15 @@ STR_CARGO_SINGULAR_SUGAR.aku :šećer STR_CARGO_SINGULAR_TOY :Igračka STR_CARGO_SINGULAR_TOY.gen :igračaka STR_CARGO_SINGULAR_TOY.aku :igračku -STR_CARGO_SINGULAR_CANDY :Slatkiš -STR_CARGO_SINGULAR_CANDY.gen :slatkiša -STR_CARGO_SINGULAR_CANDY.aku :slatkiš +STR_CARGO_SINGULAR_SWEETS :Slatkiš +STR_CARGO_SINGULAR_SWEETS.gen :slatkiša +STR_CARGO_SINGULAR_SWEETS.aku :slatkiš STR_CARGO_SINGULAR_COLA :Cola STR_CARGO_SINGULAR_COLA.gen :cole STR_CARGO_SINGULAR_COLA.aku :colu -STR_CARGO_SINGULAR_COTTON_CANDY :Šećerna vuna -STR_CARGO_SINGULAR_COTTON_CANDY.gen :šećerne vune -STR_CARGO_SINGULAR_COTTON_CANDY.aku :šećernu vunu +STR_CARGO_SINGULAR_CANDYFLOSS :Šećerna vuna +STR_CARGO_SINGULAR_CANDYFLOSS.gen :šećerne vune +STR_CARGO_SINGULAR_CANDYFLOSS.aku :šećernu vunu STR_CARGO_SINGULAR_BUBBLE :Balon STR_CARGO_SINGULAR_BUBBLE.gen :balona STR_CARGO_SINGULAR_BUBBLE.aku :balon diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 4f03a803d0..0d0b8772d9 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -102,17 +102,17 @@ STR_CARGO_PLURAL_SUGAR.big :Cukr STR_CARGO_PLURAL_TOYS :hračky STR_CARGO_PLURAL_TOYS.gen :hraček STR_CARGO_PLURAL_TOYS.big :Hračky -STR_CARGO_PLURAL_CANDY :bonbony +STR_CARGO_PLURAL_SWEETS :bonbony STR_CARGO_PLURAL_CANDY.gen :bonbonů STR_CARGO_PLURAL_CANDY.big :Bonbony STR_CARGO_PLURAL_COLA :kola STR_CARGO_PLURAL_COLA.gen :koly STR_CARGO_PLURAL_COLA.acc :kolu STR_CARGO_PLURAL_COLA.big :Kola -STR_CARGO_PLURAL_COTTON_CANDY :cukrová vata -STR_CARGO_PLURAL_COTTON_CANDY.gen :cukrové vaty -STR_CARGO_PLURAL_COTTON_CANDY.acc :cukrovou vatu -STR_CARGO_PLURAL_COTTON_CANDY.big :Cukrová vata +STR_CARGO_PLURAL_CANDYFLOSS :cukrová vata +STR_CARGO_PLURAL_CANDYFLOSS.gen :cukrové vaty +STR_CARGO_PLURAL_CANDYFLOSS.acc :cukrovou vatu +STR_CARGO_PLURAL_CANDYFLOSS.big :Cukrová vata STR_CARGO_PLURAL_BUBBLES :bubliny STR_CARGO_PLURAL_BUBBLES.gen :bublin STR_CARGO_PLURAL_BUBBLES.big :Bubliny @@ -157,9 +157,9 @@ STR_CARGO_SINGULAR_WHEAT :pšenice STR_CARGO_SINGULAR_RUBBER :kaučuku STR_CARGO_SINGULAR_SUGAR :cukru STR_CARGO_SINGULAR_TOY :hraček -STR_CARGO_SINGULAR_CANDY :bonbonů +STR_CARGO_SINGULAR_SWEETS :bonbonů STR_CARGO_SINGULAR_COLA :koly -STR_CARGO_SINGULAR_COTTON_CANDY :cukrové vaty +STR_CARGO_SINGULAR_CANDYFLOSS :cukrové vaty STR_CARGO_SINGULAR_BUBBLE :bublin STR_CARGO_SINGULAR_TOFFEE :karamelu STR_CARGO_SINGULAR_BATTERY :baterií diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 10852b899f..95d65615ee 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Hvede STR_CARGO_PLURAL_RUBBER :Gummi STR_CARGO_PLURAL_SUGAR :Sukker STR_CARGO_PLURAL_TOYS :Legetøj -STR_CARGO_PLURAL_CANDY :Slik +STR_CARGO_PLURAL_SWEETS :Slik STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Candyfloss +STR_CARGO_PLURAL_CANDYFLOSS :Candyfloss STR_CARGO_PLURAL_BUBBLES :Bobler STR_CARGO_PLURAL_TOFFEE :Karamel STR_CARGO_PLURAL_BATTERIES :Batterier @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Hvede STR_CARGO_SINGULAR_RUBBER :Gummi STR_CARGO_SINGULAR_SUGAR :Sukker STR_CARGO_SINGULAR_TOY :Legetøj -STR_CARGO_SINGULAR_CANDY :Slik +STR_CARGO_SINGULAR_SWEETS :Slik STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Candyfloss +STR_CARGO_SINGULAR_CANDYFLOSS :Candyfloss STR_CARGO_SINGULAR_BUBBLE :Boble STR_CARGO_SINGULAR_TOFFEE :Karamel STR_CARGO_SINGULAR_BATTERY :Batteri diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index e7d28ce112..4f3e3c3ac5 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Tarwe STR_CARGO_PLURAL_RUBBER :Rubber STR_CARGO_PLURAL_SUGAR :Suiker STR_CARGO_PLURAL_TOYS :Speelgoed -STR_CARGO_PLURAL_CANDY :Snoep +STR_CARGO_PLURAL_SWEETS :Snoep STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Suikerspin +STR_CARGO_PLURAL_CANDYFLOSS :Suikerspin STR_CARGO_PLURAL_BUBBLES :Bellen STR_CARGO_PLURAL_TOFFEE :Toffee STR_CARGO_PLURAL_BATTERIES :Batterijen @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Tarwe STR_CARGO_SINGULAR_RUBBER :Rubber STR_CARGO_SINGULAR_SUGAR :Suiker STR_CARGO_SINGULAR_TOY :Speelgoed -STR_CARGO_SINGULAR_CANDY :Snoep +STR_CARGO_SINGULAR_SWEETS :Snoep STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Suikerspin +STR_CARGO_SINGULAR_CANDYFLOSS :Suikerspin STR_CARGO_SINGULAR_BUBBLE :Bubbel STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Batterij diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 177c9eb2b2..a4a2b405de 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Wheat STR_CARGO_PLURAL_RUBBER :Rubber STR_CARGO_PLURAL_SUGAR :Sugar STR_CARGO_PLURAL_TOYS :Toys -STR_CARGO_PLURAL_CANDY :Lollies +STR_CARGO_PLURAL_SWEETS :Lollies STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Fairy Floss +STR_CARGO_PLURAL_CANDYFLOSS :Fairy Floss STR_CARGO_PLURAL_BUBBLES :Bubbles STR_CARGO_PLURAL_TOFFEE :Toffee STR_CARGO_PLURAL_BATTERIES :Batteries @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Wheat STR_CARGO_SINGULAR_RUBBER :Rubber STR_CARGO_SINGULAR_SUGAR :Sugar STR_CARGO_SINGULAR_TOY :Toy -STR_CARGO_SINGULAR_CANDY :lollies +STR_CARGO_SINGULAR_SWEETS :lollies STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Fairy Floss +STR_CARGO_SINGULAR_CANDYFLOSS :Fairy Floss STR_CARGO_SINGULAR_BUBBLE :Bubble STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Battery diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index b633514294..73b1bf42b1 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Wheat STR_CARGO_PLURAL_RUBBER :Rubber STR_CARGO_PLURAL_SUGAR :Sugar STR_CARGO_PLURAL_TOYS :Toys -STR_CARGO_PLURAL_CANDY :Candy +STR_CARGO_PLURAL_SWEETS :Candy STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Cotton Candy +STR_CARGO_PLURAL_CANDYFLOSS :Cotton Candy STR_CARGO_PLURAL_BUBBLES :Bubbles STR_CARGO_PLURAL_TOFFEE :Toffee STR_CARGO_PLURAL_BATTERIES :Batteries @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Wheat STR_CARGO_SINGULAR_RUBBER :Rubber STR_CARGO_SINGULAR_SUGAR :Sugar STR_CARGO_SINGULAR_TOY :Toy -STR_CARGO_SINGULAR_CANDY :Candy +STR_CARGO_SINGULAR_SWEETS :Candy STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Cotton Candy +STR_CARGO_SINGULAR_CANDYFLOSS :Cotton Candy STR_CARGO_SINGULAR_BUBBLE :Bubble STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Battery diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 6a03087e33..676314aa61 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Tritiko STR_CARGO_PLURAL_RUBBER :Kaŭĉuko STR_CARGO_PLURAL_SUGAR :Sukero STR_CARGO_PLURAL_TOYS :Ludiloj -STR_CARGO_PLURAL_CANDY :Dolĉaĵoj +STR_CARGO_PLURAL_SWEETS :Dolĉaĵoj STR_CARGO_PLURAL_COLA :Kolao -STR_CARGO_PLURAL_COTTON_CANDY :Sukerŝpinaĵoj +STR_CARGO_PLURAL_CANDYFLOSS :Sukerŝpinaĵoj STR_CARGO_PLURAL_BUBBLES :Vezikoj STR_CARGO_PLURAL_TOFFEE :Tofeoj STR_CARGO_PLURAL_BATTERIES :Baterioj @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Tritiko STR_CARGO_SINGULAR_RUBBER :Kaŭĉuko STR_CARGO_SINGULAR_SUGAR :Sukero STR_CARGO_SINGULAR_TOY :Ludilo -STR_CARGO_SINGULAR_CANDY :Dolĉaĵo +STR_CARGO_SINGULAR_SWEETS :Dolĉaĵo STR_CARGO_SINGULAR_COLA :Kolao -STR_CARGO_SINGULAR_COTTON_CANDY :Sukerŝpinaĵo +STR_CARGO_SINGULAR_CANDYFLOSS :Sukerŝpinaĵo STR_CARGO_SINGULAR_BUBBLE :Veziko STR_CARGO_SINGULAR_TOFFEE :Tofeo STR_CARGO_SINGULAR_BATTERY :Baterio diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 383357dbc2..eab1f86e34 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR :Suhkur STR_CARGO_PLURAL_SUGAR.g :Suhkru STR_CARGO_PLURAL_TOYS :Mänguasjad STR_CARGO_PLURAL_TOYS.g :Mänguasjade -STR_CARGO_PLURAL_CANDY :Maiustused +STR_CARGO_PLURAL_SWEETS :Maiustused STR_CARGO_PLURAL_CANDY.g :Maiustuste STR_CARGO_PLURAL_COLA :Koola STR_CARGO_PLURAL_COLA.g :Koola -STR_CARGO_PLURAL_COTTON_CANDY :Suhkruvatt -STR_CARGO_PLURAL_COTTON_CANDY.g :Suhkruvati +STR_CARGO_PLURAL_CANDYFLOSS :Suhkruvatt +STR_CARGO_PLURAL_CANDYFLOSS.g :Suhkruvati STR_CARGO_PLURAL_BUBBLES :Mullid STR_CARGO_PLURAL_BUBBLES.g :Mullide STR_CARGO_PLURAL_TOFFEE :Iiris @@ -137,9 +137,9 @@ STR_CARGO_SINGULAR_SUGAR :Suhkur STR_CARGO_SINGULAR_SUGAR.g :Suhkru STR_CARGO_SINGULAR_TOY :Mänguasjad STR_CARGO_SINGULAR_TOY.g :Mänguasjade -STR_CARGO_SINGULAR_CANDY :Maiustus +STR_CARGO_SINGULAR_SWEETS :Maiustus STR_CARGO_SINGULAR_COLA :Koola -STR_CARGO_SINGULAR_COTTON_CANDY :Suhkruvatt +STR_CARGO_SINGULAR_CANDYFLOSS :Suhkruvatt STR_CARGO_SINGULAR_BUBBLE :Mullid STR_CARGO_SINGULAR_TOFFEE :Iiris STR_CARGO_SINGULAR_TOFFEE.g :Iirise diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 4f9592eb60..66ed873d64 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=n}Hveiti STR_CARGO_PLURAL_RUBBER :{G=n}Gummi STR_CARGO_PLURAL_SUGAR :{G=n}Sukur STR_CARGO_PLURAL_TOYS :{G=n}Leikutoy -STR_CARGO_PLURAL_CANDY :{G=n}Góðgæti +STR_CARGO_PLURAL_SWEETS :{G=n}Góðgæti STR_CARGO_PLURAL_COLA :{G=n}Kola -STR_CARGO_PLURAL_COTTON_CANDY :{G=n}Kandifloss +STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Kandifloss STR_CARGO_PLURAL_BUBBLES :{G=f}Sápiblørir STR_CARGO_PLURAL_TOFFEE :{G=n}Toffee STR_CARGO_PLURAL_BATTERIES :{G=n}Battarí @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=n}Hveiti STR_CARGO_SINGULAR_RUBBER :{G=n}Gummi STR_CARGO_SINGULAR_SUGAR :{G=n}Sukur STR_CARGO_SINGULAR_TOY :{G=n}Leikutoy -STR_CARGO_SINGULAR_CANDY :{G=n}Góðgæti +STR_CARGO_SINGULAR_SWEETS :{G=n}Góðgæti STR_CARGO_SINGULAR_COLA :{G=n}Kola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=n}Kandifloss +STR_CARGO_SINGULAR_CANDYFLOSS :{G=n}Kandifloss STR_CARGO_SINGULAR_BUBBLE :{G=f}Sápibløra STR_CARGO_SINGULAR_TOFFEE :{G=n}Toffee STR_CARGO_SINGULAR_BATTERY :{G=n}Battarí diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index c0dc8553c4..b756e299c3 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Vehnää STR_CARGO_PLURAL_RUBBER :Kumia STR_CARGO_PLURAL_SUGAR :Sokeria STR_CARGO_PLURAL_TOYS :Leluja -STR_CARGO_PLURAL_CANDY :Karkkia +STR_CARGO_PLURAL_SWEETS :Karkkia STR_CARGO_PLURAL_COLA :Limsaa -STR_CARGO_PLURAL_COTTON_CANDY :Hattaraa +STR_CARGO_PLURAL_CANDYFLOSS :Hattaraa STR_CARGO_PLURAL_BUBBLES :Kuplia STR_CARGO_PLURAL_TOFFEE :Toffeeta STR_CARGO_PLURAL_BATTERIES :Paristoja @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Vehnä STR_CARGO_SINGULAR_RUBBER :Kumi STR_CARGO_SINGULAR_SUGAR :Sokeri STR_CARGO_SINGULAR_TOY :Lelu -STR_CARGO_SINGULAR_CANDY :Karkki +STR_CARGO_SINGULAR_SWEETS :Karkki STR_CARGO_SINGULAR_COLA :Limsa -STR_CARGO_SINGULAR_COTTON_CANDY :Hattara +STR_CARGO_SINGULAR_CANDYFLOSS :Hattara STR_CARGO_SINGULAR_BUBBLE :Kupla STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Paristo diff --git a/src/lang/french.txt b/src/lang/french.txt index d885db2ac1..fba699ebb3 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Blé STR_CARGO_PLURAL_RUBBER :Caoutchouc STR_CARGO_PLURAL_SUGAR :Sucre STR_CARGO_PLURAL_TOYS :Jouets -STR_CARGO_PLURAL_CANDY :Bonbons +STR_CARGO_PLURAL_SWEETS :Bonbons STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Barbe à papa +STR_CARGO_PLURAL_CANDYFLOSS :Barbe à papa STR_CARGO_PLURAL_BUBBLES :Bulles STR_CARGO_PLURAL_TOFFEE :Caramel STR_CARGO_PLURAL_BATTERIES :Batteries @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Blé STR_CARGO_SINGULAR_RUBBER :Caoutchouc STR_CARGO_SINGULAR_SUGAR :Sucre STR_CARGO_SINGULAR_TOY :Jouet -STR_CARGO_SINGULAR_CANDY :Bonbon +STR_CARGO_SINGULAR_SWEETS :Bonbon STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Barbe à papa +STR_CARGO_SINGULAR_CANDYFLOSS :Barbe à papa STR_CARGO_SINGULAR_BUBBLE :Bulle STR_CARGO_SINGULAR_TOFFEE :Caramel STR_CARGO_SINGULAR_BATTERY :Batterie diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 37f180cce3..852ebee8fa 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -119,7 +119,7 @@ STR_CARGO_PLURAL_TOYS :{G=f}Dèideagan STR_CARGO_PLURAL_TOYS.nom :Dèideagan STR_CARGO_PLURAL_TOYS.gen :Dhèideagan STR_CARGO_PLURAL_TOYS.dat :Dèideagan -STR_CARGO_PLURAL_CANDY :{G=m}Mìlseanan +STR_CARGO_PLURAL_SWEETS :{G=m}Mìlseanan STR_CARGO_PLURAL_CANDY.nom :Mìlseanan STR_CARGO_PLURAL_CANDY.gen :Mhìlseanan STR_CARGO_PLURAL_CANDY.dat :Mìlseanan @@ -127,10 +127,10 @@ STR_CARGO_PLURAL_COLA :{G=m}Cola STR_CARGO_PLURAL_COLA.nom :Cola STR_CARGO_PLURAL_COLA.gen :Cola STR_CARGO_PLURAL_COLA.dat :Cola -STR_CARGO_PLURAL_COTTON_CANDY :{G=f}Canach-shiùcair -STR_CARGO_PLURAL_COTTON_CANDY.nom :Canach-shiùcair -STR_CARGO_PLURAL_COTTON_CANDY.gen :Canaich-siùcair -STR_CARGO_PLURAL_COTTON_CANDY.dat :Canach-shiùcair +STR_CARGO_PLURAL_CANDYFLOSS :{G=f}Canach-shiùcair +STR_CARGO_PLURAL_CANDYFLOSS.nom :Canach-shiùcair +STR_CARGO_PLURAL_CANDYFLOSS.gen :Canaich-siùcair +STR_CARGO_PLURAL_CANDYFLOSS.dat :Canach-shiùcair STR_CARGO_PLURAL_BUBBLES :{G=m}Builgeanan STR_CARGO_PLURAL_BUBBLES.nom :Builgeanan STR_CARGO_PLURAL_BUBBLES.gen :Bhuilgeanan @@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY :{G=f}Dèideag STR_CARGO_SINGULAR_TOY.nom :Dèideag STR_CARGO_SINGULAR_TOY.gen :Dèideig STR_CARGO_SINGULAR_TOY.dat :Dèideag -STR_CARGO_SINGULAR_CANDY :{G=m}Mìlsean -STR_CARGO_SINGULAR_CANDY.nom :Mìlsean -STR_CARGO_SINGULAR_CANDY.gen :Mìlsein -STR_CARGO_SINGULAR_CANDY.dat :Mìlsean +STR_CARGO_SINGULAR_SWEETS :{G=m}Mìlsean +STR_CARGO_SINGULAR_SWEETS.nom :Mìlsean +STR_CARGO_SINGULAR_SWEETS.gen :Mìlsein +STR_CARGO_SINGULAR_SWEETS.dat :Mìlsean STR_CARGO_SINGULAR_COLA :{G=m}Cola STR_CARGO_SINGULAR_COLA.nom :Cola STR_CARGO_SINGULAR_COLA.gen :Cola STR_CARGO_SINGULAR_COLA.dat :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=f}Canach-shiùcair -STR_CARGO_SINGULAR_COTTON_CANDY.nom :Canach-shiùcair -STR_CARGO_SINGULAR_COTTON_CANDY.gen :Canaich-siùcair -STR_CARGO_SINGULAR_COTTON_CANDY.dat :Canach-shiùcair +STR_CARGO_SINGULAR_CANDYFLOSS :{G=f}Canach-shiùcair +STR_CARGO_SINGULAR_CANDYFLOSS.nom :Canach-shiùcair +STR_CARGO_SINGULAR_CANDYFLOSS.gen :Canaich-siùcair +STR_CARGO_SINGULAR_CANDYFLOSS.dat :Canach-shiùcair STR_CARGO_SINGULAR_BUBBLE :{G=m}Builgean STR_CARGO_SINGULAR_BUBBLE.nom :Builgean STR_CARGO_SINGULAR_BUBBLE.gen :Builgein diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 577789b6b3..5834e93d55 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Trigo STR_CARGO_PLURAL_RUBBER :Caucho STR_CARGO_PLURAL_SUGAR :Azucre STR_CARGO_PLURAL_TOYS :Xoguetes -STR_CARGO_PLURAL_CANDY :Lambetadas +STR_CARGO_PLURAL_SWEETS :Lambetadas STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Algodón de azucre +STR_CARGO_PLURAL_CANDYFLOSS :Algodón de azucre STR_CARGO_PLURAL_BUBBLES :Burbullas STR_CARGO_PLURAL_TOFFEE :Toffee STR_CARGO_PLURAL_BATTERIES :Pilas @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Trigo STR_CARGO_SINGULAR_RUBBER :Caucho STR_CARGO_SINGULAR_SUGAR :Azucre STR_CARGO_SINGULAR_TOY :Xoguete -STR_CARGO_SINGULAR_CANDY :Lambetada +STR_CARGO_SINGULAR_SWEETS :Lambetada STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Algodón de azucre +STR_CARGO_SINGULAR_CANDYFLOSS :Algodón de azucre STR_CARGO_SINGULAR_BUBBLE :Burbulla STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Pila diff --git a/src/lang/german.txt b/src/lang/german.txt index 2d1ea45741..2cad372f9b 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Weizen STR_CARGO_PLURAL_RUBBER :{G=m}Kautschuk STR_CARGO_PLURAL_SUGAR :{G=m}Zucker STR_CARGO_PLURAL_TOYS :{G=p}Spielzeuge -STR_CARGO_PLURAL_CANDY :{G=p}Bonbons +STR_CARGO_PLURAL_SWEETS :{G=p}Bonbons STR_CARGO_PLURAL_COLA :{G=w}Cola -STR_CARGO_PLURAL_COTTON_CANDY :{G=w}Zuckerwatte +STR_CARGO_PLURAL_CANDYFLOSS :{G=w}Zuckerwatte STR_CARGO_PLURAL_BUBBLES :{G=p}Luftblasen STR_CARGO_PLURAL_TOFFEE :{G=n}Karamell STR_CARGO_PLURAL_BATTERIES :{G=p}Batterien @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=n}Weizen STR_CARGO_SINGULAR_RUBBER :{G=m}Kautschuk STR_CARGO_SINGULAR_SUGAR :{G=m}Zucker STR_CARGO_SINGULAR_TOY :{G=n}Spielzeug -STR_CARGO_SINGULAR_CANDY :{G=m}Bonbon +STR_CARGO_SINGULAR_SWEETS :{G=m}Bonbon STR_CARGO_SINGULAR_COLA :{G=w}Cola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=w}Zuckerwatte +STR_CARGO_SINGULAR_CANDYFLOSS :{G=w}Zuckerwatte STR_CARGO_SINGULAR_BUBBLE :{G=w}Luftblase STR_CARGO_SINGULAR_TOFFEE :{G=n}Karamell STR_CARGO_SINGULAR_BATTERY :{G=w}Batterie diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 65e565e3e8..c09aa806fe 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR :{G=f}Ζάχαρ STR_CARGO_PLURAL_SUGAR.geniki :Ζάχαρης STR_CARGO_PLURAL_TOYS :{G=n}Παιχνίδια STR_CARGO_PLURAL_TOYS.geniki :Παιχνιδιών -STR_CARGO_PLURAL_CANDY :{G=n}Γλυκίσματα +STR_CARGO_PLURAL_SWEETS :{G=n}Γλυκίσματα STR_CARGO_PLURAL_CANDY.geniki :Γλυκισμάτων STR_CARGO_PLURAL_COLA :{G=f}Κόλα STR_CARGO_PLURAL_COLA.geniki :Κόλας -STR_CARGO_PLURAL_COTTON_CANDY :{G=n}Μαλλιά της γριάς -STR_CARGO_PLURAL_COTTON_CANDY.geniki :Μαλλιών της γριάς +STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Μαλλιά της γριάς +STR_CARGO_PLURAL_CANDYFLOSS.geniki :Μαλλιών της γριάς STR_CARGO_PLURAL_BUBBLES :{G=f}Φυσαλίδες STR_CARGO_PLURAL_BUBBLES.geniki :Φυσαλίδων STR_CARGO_PLURAL_TOFFEE :{G=n}Καραμέλες βουτύρου @@ -136,11 +136,11 @@ STR_CARGO_SINGULAR_SUGAR :{G=f}Ζάχαρ STR_CARGO_SINGULAR_SUGAR.subs :Ζάχαρες STR_CARGO_SINGULAR_TOY :{G=n}Παιχνίδι STR_CARGO_SINGULAR_TOY.subs :Παιχνίδια -STR_CARGO_SINGULAR_CANDY :{G=n}Γλυκό -STR_CARGO_SINGULAR_CANDY.subs :Γλυκα +STR_CARGO_SINGULAR_SWEETS :{G=n}Γλυκό +STR_CARGO_SINGULAR_SWEETS.subs :Γλυκα STR_CARGO_SINGULAR_COLA :{G=f}Κόλα -STR_CARGO_SINGULAR_COTTON_CANDY :{G=n}Μαλλί της γριάς -STR_CARGO_SINGULAR_COTTON_CANDY.subs :Μαλλί της γριάς +STR_CARGO_SINGULAR_CANDYFLOSS :{G=n}Μαλλί της γριάς +STR_CARGO_SINGULAR_CANDYFLOSS.subs :Μαλλί της γριάς STR_CARGO_SINGULAR_BUBBLE :{G=f}Φυσαλίδα STR_CARGO_SINGULAR_BUBBLE.subs :Φυσαλίδες STR_CARGO_SINGULAR_TOFFEE :{G=n}Καραμέλα βουτύρου diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 2bdba01d9d..5a8f15312e 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :חיטה STR_CARGO_PLURAL_RUBBER :גומי STR_CARGO_PLURAL_SUGAR :סוכר STR_CARGO_PLURAL_TOYS :צעצועים -STR_CARGO_PLURAL_CANDY :ממתקים +STR_CARGO_PLURAL_SWEETS :ממתקים STR_CARGO_PLURAL_COLA :קולה -STR_CARGO_PLURAL_COTTON_CANDY :שערות סבתא +STR_CARGO_PLURAL_CANDYFLOSS :שערות סבתא STR_CARGO_PLURAL_BUBBLES :בועות STR_CARGO_PLURAL_TOFFEE :טופי STR_CARGO_PLURAL_BATTERIES :סוללות @@ -92,10 +92,10 @@ STR_CARGO_SINGULAR_RUBBER :גומי STR_CARGO_SINGULAR_SUGAR :סוכר STR_CARGO_SINGULAR_TOY :צעצוע STR_CARGO_SINGULAR_TOY.plural :צעצועים -STR_CARGO_SINGULAR_CANDY :ממתק -STR_CARGO_SINGULAR_CANDY.plural :ממתקים +STR_CARGO_SINGULAR_SWEETS :ממתק +STR_CARGO_SINGULAR_SWEETS.plural :ממתקים STR_CARGO_SINGULAR_COLA :קולה -STR_CARGO_SINGULAR_COTTON_CANDY :צמר גפן מתוק +STR_CARGO_SINGULAR_CANDYFLOSS :צמר גפן מתוק STR_CARGO_SINGULAR_BUBBLE :בועה STR_CARGO_SINGULAR_BUBBLE.plural :בועות STR_CARGO_SINGULAR_TOFFEE :טופי diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 8520f8fead..c3ed93acc1 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR :Cukor STR_CARGO_PLURAL_SUGAR.t :cukrot STR_CARGO_PLURAL_TOYS :Játék STR_CARGO_PLURAL_TOYS.t :játékot -STR_CARGO_PLURAL_CANDY :Cukorka +STR_CARGO_PLURAL_SWEETS :Cukorka STR_CARGO_PLURAL_CANDY.t :cukorkát STR_CARGO_PLURAL_COLA :Kóla STR_CARGO_PLURAL_COLA.t :kólát -STR_CARGO_PLURAL_COTTON_CANDY :Vattacukor -STR_CARGO_PLURAL_COTTON_CANDY.t :vattacukrot +STR_CARGO_PLURAL_CANDYFLOSS :Vattacukor +STR_CARGO_PLURAL_CANDYFLOSS.t :vattacukrot STR_CARGO_PLURAL_BUBBLES :Buborék STR_CARGO_PLURAL_BUBBLES.t :buborékot STR_CARGO_PLURAL_TOFFEE :Tejkaramella @@ -137,12 +137,12 @@ STR_CARGO_SINGULAR_SUGAR :cukor STR_CARGO_SINGULAR_SUGAR.t :cukrot STR_CARGO_SINGULAR_TOY :játék STR_CARGO_SINGULAR_TOY.t :játékot -STR_CARGO_SINGULAR_CANDY :cukorka -STR_CARGO_SINGULAR_CANDY.t :cukorkát +STR_CARGO_SINGULAR_SWEETS :cukorka +STR_CARGO_SINGULAR_SWEETS.t :cukorkát STR_CARGO_SINGULAR_COLA :kóla STR_CARGO_SINGULAR_COLA.t :kólát -STR_CARGO_SINGULAR_COTTON_CANDY :vattacukor -STR_CARGO_SINGULAR_COTTON_CANDY.t :vattacukrot +STR_CARGO_SINGULAR_CANDYFLOSS :vattacukor +STR_CARGO_SINGULAR_CANDYFLOSS.t :vattacukrot STR_CARGO_SINGULAR_BUBBLE :buborék STR_CARGO_SINGULAR_BUBBLE.t :buborékot STR_CARGO_SINGULAR_TOFFEE :tejkaramella diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index f25b2d3154..eca04147e6 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Hveiti STR_CARGO_PLURAL_RUBBER :Gúmmí STR_CARGO_PLURAL_SUGAR :Sykur STR_CARGO_PLURAL_TOYS :Leikföng -STR_CARGO_PLURAL_CANDY :Sælgæti +STR_CARGO_PLURAL_SWEETS :Sælgæti STR_CARGO_PLURAL_COLA :Kóladrykkir -STR_CARGO_PLURAL_COTTON_CANDY :Sykurfrauð +STR_CARGO_PLURAL_CANDYFLOSS :Sykurfrauð STR_CARGO_PLURAL_BUBBLES :Kúlur STR_CARGO_PLURAL_TOFFEE :Toffý STR_CARGO_PLURAL_BATTERIES :Rafhlöður @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Hveitis STR_CARGO_SINGULAR_RUBBER :Gúmmí STR_CARGO_SINGULAR_SUGAR :Sykur STR_CARGO_SINGULAR_TOY :Leikfanga -STR_CARGO_SINGULAR_CANDY :Sælgætis +STR_CARGO_SINGULAR_SWEETS :Sælgætis STR_CARGO_SINGULAR_COLA :Kóladrykkja -STR_CARGO_SINGULAR_COTTON_CANDY :Sykurfrauðs +STR_CARGO_SINGULAR_CANDYFLOSS :Sykurfrauðs STR_CARGO_SINGULAR_BUBBLE :Kúlu STR_CARGO_SINGULAR_TOFFEE :Toffý STR_CARGO_SINGULAR_BATTERY :Rafhlöðu diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 70a240208e..dc1a20878f 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Gandum STR_CARGO_PLURAL_RUBBER :Karet STR_CARGO_PLURAL_SUGAR :Gula STR_CARGO_PLURAL_TOYS :Mainan -STR_CARGO_PLURAL_CANDY :Manisan +STR_CARGO_PLURAL_SWEETS :Manisan STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Arum Manis +STR_CARGO_PLURAL_CANDYFLOSS :Arum Manis STR_CARGO_PLURAL_BUBBLES :Gelembung STR_CARGO_PLURAL_TOFFEE :Gula-gula STR_CARGO_PLURAL_BATTERIES :Baterai @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Gandum STR_CARGO_SINGULAR_RUBBER :Karet STR_CARGO_SINGULAR_SUGAR :Gula STR_CARGO_SINGULAR_TOY :Mainan -STR_CARGO_SINGULAR_CANDY :Manisan +STR_CARGO_SINGULAR_SWEETS :Manisan STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Arum Manis +STR_CARGO_SINGULAR_CANDYFLOSS :Arum Manis STR_CARGO_SINGULAR_BUBBLE :Gelembung STR_CARGO_SINGULAR_TOFFEE :Gula-gula STR_CARGO_SINGULAR_BATTERY :Baterai diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 527daebf1b..0658941a7d 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Cruinneacht STR_CARGO_PLURAL_RUBBER :Rubar STR_CARGO_PLURAL_SUGAR :Siúcra STR_CARGO_PLURAL_TOYS :Bréagáin -STR_CARGO_PLURAL_CANDY :Milseáin +STR_CARGO_PLURAL_SWEETS :Milseáin STR_CARGO_PLURAL_COLA :Cóla -STR_CARGO_PLURAL_COTTON_CANDY :Scamall siúcra +STR_CARGO_PLURAL_CANDYFLOSS :Scamall siúcra STR_CARGO_PLURAL_BUBBLES :Súilíní STR_CARGO_PLURAL_TOFFEE :Taifí STR_CARGO_PLURAL_BATTERIES :Cadhnraí @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Cruithneacht STR_CARGO_SINGULAR_RUBBER :Rubar STR_CARGO_SINGULAR_SUGAR :Siúcra STR_CARGO_SINGULAR_TOY :Bréagán -STR_CARGO_SINGULAR_CANDY :Milseán +STR_CARGO_SINGULAR_SWEETS :Milseán STR_CARGO_SINGULAR_COLA :Cóla -STR_CARGO_SINGULAR_COTTON_CANDY :Scamall siúcra +STR_CARGO_SINGULAR_CANDYFLOSS :Scamall siúcra STR_CARGO_SINGULAR_BUBBLE :Súilín STR_CARGO_SINGULAR_TOFFEE :Taifí STR_CARGO_SINGULAR_BATTERY :Ceallra diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 94784dc454..770ddc41a0 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Frumento STR_CARGO_PLURAL_RUBBER :{G=f}Gomma STR_CARGO_PLURAL_SUGAR :{G=m}Zucchero STR_CARGO_PLURAL_TOYS :{G=m}Giocattoli -STR_CARGO_PLURAL_CANDY :{G=f}Caramelle +STR_CARGO_PLURAL_SWEETS :{G=f}Caramelle STR_CARGO_PLURAL_COLA :{G=f}Cola -STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Zucchero filato +STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Zucchero filato STR_CARGO_PLURAL_BUBBLES :{G=f}Bollicine STR_CARGO_PLURAL_TOFFEE :{G=m}Toffee STR_CARGO_PLURAL_BATTERIES :{G=f}Batterie @@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Frumento STR_CARGO_SINGULAR_RUBBER :{G=f}Gomma STR_CARGO_SINGULAR_SUGAR :{G=m}Zucchero STR_CARGO_SINGULAR_TOY :{G=m}Giocattolo -STR_CARGO_SINGULAR_CANDY :{G=f}Caramella +STR_CARGO_SINGULAR_SWEETS :{G=f}Caramella STR_CARGO_SINGULAR_COLA :{G=f}Cola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Zucchero filato +STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Zucchero filato STR_CARGO_SINGULAR_BUBBLE :{G=f}Bollicine STR_CARGO_SINGULAR_TOFFEE :{G=m}Toffee STR_CARGO_SINGULAR_BATTERY :{G=f}Batterie diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 5a157e91df..203a33ab38 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :小麦 STR_CARGO_PLURAL_RUBBER :ゴム STR_CARGO_PLURAL_SUGAR :砂糖 STR_CARGO_PLURAL_TOYS :おもちゃ -STR_CARGO_PLURAL_CANDY :お菓子 +STR_CARGO_PLURAL_SWEETS :お菓子 STR_CARGO_PLURAL_COLA :コーラ -STR_CARGO_PLURAL_COTTON_CANDY :わたあめ +STR_CARGO_PLURAL_CANDYFLOSS :わたあめ STR_CARGO_PLURAL_BUBBLES :泡 STR_CARGO_PLURAL_TOFFEE :タフィー STR_CARGO_PLURAL_BATTERIES :電池 @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :小麦 STR_CARGO_SINGULAR_RUBBER :ゴム STR_CARGO_SINGULAR_SUGAR :砂糖 STR_CARGO_SINGULAR_TOY :おもちゃ -STR_CARGO_SINGULAR_CANDY :お菓子 +STR_CARGO_SINGULAR_SWEETS :お菓子 STR_CARGO_SINGULAR_COLA :コーラ -STR_CARGO_SINGULAR_COTTON_CANDY :わたあめ +STR_CARGO_SINGULAR_CANDYFLOSS :わたあめ STR_CARGO_SINGULAR_BUBBLE :泡 STR_CARGO_SINGULAR_TOFFEE :タフィー STR_CARGO_SINGULAR_BATTERY :電池 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 68d66b1bd0..dfd20b2d5f 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}밀 STR_CARGO_PLURAL_RUBBER :{G=f}고무 STR_CARGO_PLURAL_SUGAR :{G=m}설탕 STR_CARGO_PLURAL_TOYS :{G=m}장난감 -STR_CARGO_PLURAL_CANDY :{G=m}사탕 +STR_CARGO_PLURAL_SWEETS :{G=m}사탕 STR_CARGO_PLURAL_COLA :{G=f}콜라 -STR_CARGO_PLURAL_COTTON_CANDY :{G=m}솜사탕 +STR_CARGO_PLURAL_CANDYFLOSS :{G=m}솜사탕 STR_CARGO_PLURAL_BUBBLES :{G=m}거품 STR_CARGO_PLURAL_TOFFEE :{G=f}토피 STR_CARGO_PLURAL_BATTERIES :{G=f}건전지 @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}밀 STR_CARGO_SINGULAR_RUBBER :{G=f}고무 STR_CARGO_SINGULAR_SUGAR :{G=m}설탕 STR_CARGO_SINGULAR_TOY :{G=m}장난감 -STR_CARGO_SINGULAR_CANDY :{G=m}사탕 +STR_CARGO_SINGULAR_SWEETS :{G=m}사탕 STR_CARGO_SINGULAR_COLA :{G=f}콜라 -STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}솜사탕 +STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}솜사탕 STR_CARGO_SINGULAR_BUBBLE :{G=m}거품 STR_CARGO_SINGULAR_TOFFEE :{G=f}토피 STR_CARGO_SINGULAR_BATTERY :{G=f}건전지 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 3fe5a1129b..a61630ede3 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -119,7 +119,7 @@ STR_CARGO_PLURAL_TOYS :{G=np}Ludicra STR_CARGO_PLURAL_TOYS.gen :ludicrorum STR_CARGO_PLURAL_TOYS.acc :Ludicra STR_CARGO_PLURAL_TOYS.dat :Ludicris -STR_CARGO_PLURAL_CANDY :{G=np}Bellaria +STR_CARGO_PLURAL_SWEETS :{G=np}Bellaria STR_CARGO_PLURAL_CANDY.gen :bellariorum STR_CARGO_PLURAL_CANDY.acc :Bellaria STR_CARGO_PLURAL_CANDY.dat :Bellariis @@ -127,10 +127,10 @@ STR_CARGO_PLURAL_COLA :{G=f}Cola STR_CARGO_PLURAL_COLA.gen :colae STR_CARGO_PLURAL_COLA.acc :Colam STR_CARGO_PLURAL_COLA.dat :Colae -STR_CARGO_PLURAL_COTTON_CANDY :{G=n}Sacchari Xylinum -STR_CARGO_PLURAL_COTTON_CANDY.gen :sacchari xylini -STR_CARGO_PLURAL_COTTON_CANDY.acc :Sacchari Xylinum -STR_CARGO_PLURAL_COTTON_CANDY.dat :Sacchari Xylino +STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Sacchari Xylinum +STR_CARGO_PLURAL_CANDYFLOSS.gen :sacchari xylini +STR_CARGO_PLURAL_CANDYFLOSS.acc :Sacchari Xylinum +STR_CARGO_PLURAL_CANDYFLOSS.dat :Sacchari Xylino STR_CARGO_PLURAL_BUBBLES :{G=fp}Bullae STR_CARGO_PLURAL_BUBBLES.gen :bullarum STR_CARGO_PLURAL_BUBBLES.acc :Bullas @@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY :{G=np}Ludicra STR_CARGO_SINGULAR_TOY.gen :ludicrorum STR_CARGO_SINGULAR_TOY.acc :Ludicra STR_CARGO_SINGULAR_TOY.dat :Ludicris -STR_CARGO_SINGULAR_CANDY :{G=np}Bellaria -STR_CARGO_SINGULAR_CANDY.gen :bellariorum -STR_CARGO_SINGULAR_CANDY.acc :Bellaria -STR_CARGO_SINGULAR_CANDY.dat :Bellariis +STR_CARGO_SINGULAR_SWEETS :{G=np}Bellaria +STR_CARGO_SINGULAR_SWEETS.gen :bellariorum +STR_CARGO_SINGULAR_SWEETS.acc :Bellaria +STR_CARGO_SINGULAR_SWEETS.dat :Bellariis STR_CARGO_SINGULAR_COLA :{G=f}Cola STR_CARGO_SINGULAR_COLA.gen :colae STR_CARGO_SINGULAR_COLA.acc :Colam STR_CARGO_SINGULAR_COLA.dat :Colae -STR_CARGO_SINGULAR_COTTON_CANDY :{G=n}Sacchari Xylinum -STR_CARGO_SINGULAR_COTTON_CANDY.gen :sacchari xylini -STR_CARGO_SINGULAR_COTTON_CANDY.acc :Sacchari Xylinum -STR_CARGO_SINGULAR_COTTON_CANDY.dat :Sacchari Xylino +STR_CARGO_SINGULAR_CANDYFLOSS :{G=n}Sacchari Xylinum +STR_CARGO_SINGULAR_CANDYFLOSS.gen :sacchari xylini +STR_CARGO_SINGULAR_CANDYFLOSS.acc :Sacchari Xylinum +STR_CARGO_SINGULAR_CANDYFLOSS.dat :Sacchari Xylino STR_CARGO_SINGULAR_BUBBLE :{G=fp}Bullae STR_CARGO_SINGULAR_BUBBLE.gen :bullarum STR_CARGO_SINGULAR_BUBBLE.acc :Bullas diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index b4811bb901..e14040c1a4 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Kvieši STR_CARGO_PLURAL_RUBBER :Kaučuks STR_CARGO_PLURAL_SUGAR :Cukurs STR_CARGO_PLURAL_TOYS :Rotaļlietas -STR_CARGO_PLURAL_CANDY :Saldumi +STR_CARGO_PLURAL_SWEETS :Saldumi STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Cukurvate +STR_CARGO_PLURAL_CANDYFLOSS :Cukurvate STR_CARGO_PLURAL_BUBBLES :Burbuļi STR_CARGO_PLURAL_TOFFEE :Īriss STR_CARGO_PLURAL_BATTERIES :Baterijas @@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Kvieši STR_CARGO_SINGULAR_RUBBER :Kaučuks STR_CARGO_SINGULAR_SUGAR :Cukurs STR_CARGO_SINGULAR_TOY :Rotaļlieta -STR_CARGO_SINGULAR_CANDY :Saldumi +STR_CARGO_SINGULAR_SWEETS :Saldumi STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Cukurvate +STR_CARGO_SINGULAR_CANDYFLOSS :Cukurvate STR_CARGO_SINGULAR_BUBBLE :Burbuļi STR_CARGO_SINGULAR_TOFFEE :Īriss STR_CARGO_SINGULAR_BATTERY :Baterijas diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 1e052710a1..8e78fb11d4 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -194,7 +194,7 @@ STR_CARGO_PLURAL_TOYS.kam :žaislams STR_CARGO_PLURAL_TOYS.ka :žaislus STR_CARGO_PLURAL_TOYS.kuo :žaislais STR_CARGO_PLURAL_TOYS.kur :žaisluose -STR_CARGO_PLURAL_CANDY :Saldumynai +STR_CARGO_PLURAL_SWEETS :Saldumynai STR_CARGO_PLURAL_CANDY.kas :saldumynai STR_CARGO_PLURAL_CANDY.ko :saldumynų STR_CARGO_PLURAL_CANDY.kam :saldumynams @@ -208,13 +208,13 @@ STR_CARGO_PLURAL_COLA.kam :kolai STR_CARGO_PLURAL_COLA.ka :kolą STR_CARGO_PLURAL_COLA.kuo :kola STR_CARGO_PLURAL_COLA.kur :koloje -STR_CARGO_PLURAL_COTTON_CANDY :Cukraus vata -STR_CARGO_PLURAL_COTTON_CANDY.kas :cukraus vata -STR_CARGO_PLURAL_COTTON_CANDY.ko :cukraus vatos -STR_CARGO_PLURAL_COTTON_CANDY.kam :cukraus vatai -STR_CARGO_PLURAL_COTTON_CANDY.ka :cukraus vatą -STR_CARGO_PLURAL_COTTON_CANDY.kuo :cukraus vata -STR_CARGO_PLURAL_COTTON_CANDY.kur :cukraus vatoje +STR_CARGO_PLURAL_CANDYFLOSS :Cukraus vata +STR_CARGO_PLURAL_CANDYFLOSS.kas :cukraus vata +STR_CARGO_PLURAL_CANDYFLOSS.ko :cukraus vatos +STR_CARGO_PLURAL_CANDYFLOSS.kam :cukraus vatai +STR_CARGO_PLURAL_CANDYFLOSS.ka :cukraus vatą +STR_CARGO_PLURAL_CANDYFLOSS.kuo :cukraus vata +STR_CARGO_PLURAL_CANDYFLOSS.kur :cukraus vatoje STR_CARGO_PLURAL_BUBBLES :Burbulai STR_CARGO_PLURAL_BUBBLES.kas :burbulai STR_CARGO_PLURAL_BUBBLES.ko :burbulų @@ -276,9 +276,9 @@ STR_CARGO_SINGULAR_WHEAT :Kviečių STR_CARGO_SINGULAR_RUBBER :Kaučiuko STR_CARGO_SINGULAR_SUGAR :Cukraus STR_CARGO_SINGULAR_TOY :Žaislų -STR_CARGO_SINGULAR_CANDY :Saldumynų +STR_CARGO_SINGULAR_SWEETS :Saldumynų STR_CARGO_SINGULAR_COLA :Kolos -STR_CARGO_SINGULAR_COTTON_CANDY :Cukraus vatos +STR_CARGO_SINGULAR_CANDYFLOSS :Cukraus vatos STR_CARGO_SINGULAR_BUBBLE :Burbulų STR_CARGO_SINGULAR_TOFFEE :Karamelės STR_CARGO_SINGULAR_BATTERY :Baterijų diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index d1fc27a6bc..f73c886e49 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Weess STR_CARGO_PLURAL_RUBBER :Kautschuk STR_CARGO_PLURAL_SUGAR :Zocker STR_CARGO_PLURAL_TOYS :Spillsaachen -STR_CARGO_PLURAL_CANDY :Séissegkeeten +STR_CARGO_PLURAL_SWEETS :Séissegkeeten STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Zockerwatt +STR_CARGO_PLURAL_CANDYFLOSS :Zockerwatt STR_CARGO_PLURAL_BUBBLES :Blosen STR_CARGO_PLURAL_TOFFEE :Karamell STR_CARGO_PLURAL_BATTERIES :Batterien @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Weess STR_CARGO_SINGULAR_RUBBER :Kautschuck STR_CARGO_SINGULAR_SUGAR :Zocker STR_CARGO_SINGULAR_TOY :Spillsaach -STR_CARGO_SINGULAR_CANDY :Séissegkeet +STR_CARGO_SINGULAR_SWEETS :Séissegkeet STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Zockerwatt +STR_CARGO_SINGULAR_CANDYFLOSS :Zockerwatt STR_CARGO_SINGULAR_BUBBLE :Blos STR_CARGO_SINGULAR_TOFFEE :Karamell STR_CARGO_SINGULAR_BATTERY :Batterie diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 051bb4f3b9..9cfa8578f7 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Gandum STR_CARGO_PLURAL_RUBBER :Getah STR_CARGO_PLURAL_SUGAR :Gula STR_CARGO_PLURAL_TOYS :Mainan -STR_CARGO_PLURAL_CANDY :Gula-gula +STR_CARGO_PLURAL_SWEETS :Gula-gula STR_CARGO_PLURAL_COLA :Minuman cola -STR_CARGO_PLURAL_COTTON_CANDY :Gula kapas +STR_CARGO_PLURAL_CANDYFLOSS :Gula kapas STR_CARGO_PLURAL_BUBBLES :Buih STR_CARGO_PLURAL_TOFFEE :Tofi STR_CARGO_PLURAL_BATTERIES :Bateri @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Gandum STR_CARGO_SINGULAR_RUBBER :Getah STR_CARGO_SINGULAR_SUGAR :Gula STR_CARGO_SINGULAR_TOY :Mainan -STR_CARGO_SINGULAR_CANDY :Manisan +STR_CARGO_SINGULAR_SWEETS :Manisan STR_CARGO_SINGULAR_COLA :Minuman cola -STR_CARGO_SINGULAR_COTTON_CANDY :Gula kapas +STR_CARGO_SINGULAR_CANDYFLOSS :Gula kapas STR_CARGO_SINGULAR_BUBBLE :Buih STR_CARGO_SINGULAR_TOFFEE :Tofi STR_CARGO_SINGULAR_BATTERY :Bateri diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 474d6c2b64..f51737db28 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Hvete STR_CARGO_PLURAL_RUBBER :Gummi STR_CARGO_PLURAL_SUGAR :Sukker STR_CARGO_PLURAL_TOYS :Leketøy -STR_CARGO_PLURAL_CANDY :Godteri +STR_CARGO_PLURAL_SWEETS :Godteri STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Sukkerspinn +STR_CARGO_PLURAL_CANDYFLOSS :Sukkerspinn STR_CARGO_PLURAL_BUBBLES :Bobler STR_CARGO_PLURAL_TOFFEE :Karamell STR_CARGO_PLURAL_BATTERIES :Batterier @@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Hvete STR_CARGO_SINGULAR_RUBBER :Gummi STR_CARGO_SINGULAR_SUGAR :Sukker STR_CARGO_SINGULAR_TOY :Leketøy -STR_CARGO_SINGULAR_CANDY :Godteri +STR_CARGO_SINGULAR_SWEETS :Godteri STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Sukkerspinn +STR_CARGO_SINGULAR_CANDYFLOSS :Sukkerspinn STR_CARGO_SINGULAR_BUBBLE :Boble STR_CARGO_SINGULAR_TOFFEE :Karamell STR_CARGO_SINGULAR_BATTERY :Batteri diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 36db98b654..adf49f5051 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT :Kveite STR_CARGO_PLURAL_RUBBER :Gummi STR_CARGO_PLURAL_SUGAR :Sukker STR_CARGO_PLURAL_TOYS :Leiketøy -STR_CARGO_PLURAL_CANDY :Godteri +STR_CARGO_PLURAL_SWEETS :Godteri STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Sukkerspinn +STR_CARGO_PLURAL_CANDYFLOSS :Sukkerspinn STR_CARGO_PLURAL_BUBBLES :Bobler STR_CARGO_PLURAL_TOFFEE :Karamell STR_CARGO_PLURAL_BATTERIES :Batteri @@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT :Kveite STR_CARGO_SINGULAR_RUBBER :Gummi STR_CARGO_SINGULAR_SUGAR :Sukker STR_CARGO_SINGULAR_TOY :Leiketøy -STR_CARGO_SINGULAR_CANDY :Godteri +STR_CARGO_SINGULAR_SWEETS :Godteri STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Sukkerspinn +STR_CARGO_SINGULAR_CANDYFLOSS :Sukkerspinn STR_CARGO_SINGULAR_BUBBLE :Boble STR_CARGO_SINGULAR_TOFFEE :Karamell STR_CARGO_SINGULAR_BATTERY :Batteri diff --git a/src/lang/polish.txt b/src/lang/polish.txt index c39f1b0c38..b7759eb719 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -188,7 +188,7 @@ STR_CARGO_PLURAL_TOYS.b :zabawki STR_CARGO_PLURAL_TOYS.n :zabawkami STR_CARGO_PLURAL_TOYS.m :zabawkach STR_CARGO_PLURAL_TOYS.w :zabawki -STR_CARGO_PLURAL_CANDY :Słodycze +STR_CARGO_PLURAL_SWEETS :Słodycze STR_CARGO_PLURAL_CANDY.d :słodyczy STR_CARGO_PLURAL_CANDY.c :słodyczom STR_CARGO_PLURAL_CANDY.b :słodycze @@ -202,13 +202,13 @@ STR_CARGO_PLURAL_COLA.b :colę STR_CARGO_PLURAL_COLA.n :colą STR_CARGO_PLURAL_COLA.m :coli STR_CARGO_PLURAL_COLA.w :colo -STR_CARGO_PLURAL_COTTON_CANDY :Wata cukrowa -STR_CARGO_PLURAL_COTTON_CANDY.d :waty cukrowej -STR_CARGO_PLURAL_COTTON_CANDY.c :wacie cukrowej -STR_CARGO_PLURAL_COTTON_CANDY.b :watę cukrową -STR_CARGO_PLURAL_COTTON_CANDY.n :watą cukrową -STR_CARGO_PLURAL_COTTON_CANDY.m :wacie cukrowej -STR_CARGO_PLURAL_COTTON_CANDY.w :wato cukrowa +STR_CARGO_PLURAL_CANDYFLOSS :Wata cukrowa +STR_CARGO_PLURAL_CANDYFLOSS.d :waty cukrowej +STR_CARGO_PLURAL_CANDYFLOSS.c :wacie cukrowej +STR_CARGO_PLURAL_CANDYFLOSS.b :watę cukrową +STR_CARGO_PLURAL_CANDYFLOSS.n :watą cukrową +STR_CARGO_PLURAL_CANDYFLOSS.m :wacie cukrowej +STR_CARGO_PLURAL_CANDYFLOSS.w :wato cukrowa STR_CARGO_PLURAL_BUBBLES :Bąbelki STR_CARGO_PLURAL_BUBBLES.d :bąbelków STR_CARGO_PLURAL_BUBBLES.c :bąbelkom @@ -408,12 +408,12 @@ STR_CARGO_SINGULAR_TOY.b :zabawkę STR_CARGO_SINGULAR_TOY.n :zabawką STR_CARGO_SINGULAR_TOY.m :zabawce STR_CARGO_SINGULAR_TOY.w :zabawko -STR_CARGO_SINGULAR_CANDY :Słodycz -STR_CARGO_SINGULAR_CANDY.d :słodyczy -STR_CARGO_SINGULAR_CANDY.c :słodyczy -STR_CARGO_SINGULAR_CANDY.b :słodycz -STR_CARGO_SINGULAR_CANDY.n :słodyczą -STR_CARGO_SINGULAR_CANDY.m :słodyczy +STR_CARGO_SINGULAR_SWEETS :Słodycz +STR_CARGO_SINGULAR_SWEETS.d :słodyczy +STR_CARGO_SINGULAR_SWEETS.c :słodyczy +STR_CARGO_SINGULAR_SWEETS.b :słodycz +STR_CARGO_SINGULAR_SWEETS.n :słodyczą +STR_CARGO_SINGULAR_SWEETS.m :słodyczy STR_CARGO_SINGULAR_COLA :Cola STR_CARGO_SINGULAR_COLA.d :coli STR_CARGO_SINGULAR_COLA.c :coli @@ -421,13 +421,13 @@ STR_CARGO_SINGULAR_COLA.b :colę STR_CARGO_SINGULAR_COLA.n :colą STR_CARGO_SINGULAR_COLA.m :coli STR_CARGO_SINGULAR_COLA.w :colo -STR_CARGO_SINGULAR_COTTON_CANDY :Wata cukrowa -STR_CARGO_SINGULAR_COTTON_CANDY.d :waty cukrowej -STR_CARGO_SINGULAR_COTTON_CANDY.c :wacie cukrowej -STR_CARGO_SINGULAR_COTTON_CANDY.b :watę cukrową -STR_CARGO_SINGULAR_COTTON_CANDY.n :watą cukrową -STR_CARGO_SINGULAR_COTTON_CANDY.m :wacie cukrowej -STR_CARGO_SINGULAR_COTTON_CANDY.w :wato cukrowa +STR_CARGO_SINGULAR_CANDYFLOSS :Wata cukrowa +STR_CARGO_SINGULAR_CANDYFLOSS.d :waty cukrowej +STR_CARGO_SINGULAR_CANDYFLOSS.c :wacie cukrowej +STR_CARGO_SINGULAR_CANDYFLOSS.b :watę cukrową +STR_CARGO_SINGULAR_CANDYFLOSS.n :watą cukrową +STR_CARGO_SINGULAR_CANDYFLOSS.m :wacie cukrowej +STR_CARGO_SINGULAR_CANDYFLOSS.w :wato cukrowa STR_CARGO_SINGULAR_BUBBLE :Bąbelek STR_CARGO_SINGULAR_BUBBLE.d :bąbelka STR_CARGO_SINGULAR_BUBBLE.c :bąbelkowi diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 342aa839db..a98e24b917 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Trigo STR_CARGO_PLURAL_RUBBER :Borracha STR_CARGO_PLURAL_SUGAR :Açúcar STR_CARGO_PLURAL_TOYS :Brinquedos -STR_CARGO_PLURAL_CANDY :Doces +STR_CARGO_PLURAL_SWEETS :Doces STR_CARGO_PLURAL_COLA :Bebida de cola -STR_CARGO_PLURAL_COTTON_CANDY :Algodão Doce +STR_CARGO_PLURAL_CANDYFLOSS :Algodão Doce STR_CARGO_PLURAL_BUBBLES :Bolhas STR_CARGO_PLURAL_TOFFEE :Caramelo STR_CARGO_PLURAL_BATTERIES :Baterias @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Trigo STR_CARGO_SINGULAR_RUBBER :Borracha STR_CARGO_SINGULAR_SUGAR :Açúcar STR_CARGO_SINGULAR_TOY :Brinquedos -STR_CARGO_SINGULAR_CANDY :Doces +STR_CARGO_SINGULAR_SWEETS :Doces STR_CARGO_SINGULAR_COLA :Bebida de cola -STR_CARGO_SINGULAR_COTTON_CANDY :Algodão Doce +STR_CARGO_SINGULAR_CANDYFLOSS :Algodão Doce STR_CARGO_SINGULAR_BUBBLE :Bolhas STR_CARGO_SINGULAR_TOFFEE :Caramelo STR_CARGO_SINGULAR_BATTERY :Baterias diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index eecd07d703..c79feefab0 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Grâu STR_CARGO_PLURAL_RUBBER :Cauciuc STR_CARGO_PLURAL_SUGAR :Zahăr STR_CARGO_PLURAL_TOYS :Jucării -STR_CARGO_PLURAL_CANDY :Dulciuri +STR_CARGO_PLURAL_SWEETS :Dulciuri STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Vată de zahăr +STR_CARGO_PLURAL_CANDYFLOSS :Vată de zahăr STR_CARGO_PLURAL_BUBBLES :Balonașe STR_CARGO_PLURAL_TOFFEE :Caramele STR_CARGO_PLURAL_BATTERIES :Baterii @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Grâu STR_CARGO_SINGULAR_RUBBER :Cauciuc STR_CARGO_SINGULAR_SUGAR :Zahăr STR_CARGO_SINGULAR_TOY :Jucărie -STR_CARGO_SINGULAR_CANDY :Dulciuri +STR_CARGO_SINGULAR_SWEETS :Dulciuri STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Vată de zahăr +STR_CARGO_SINGULAR_CANDYFLOSS :Vată de zahăr STR_CARGO_SINGULAR_BUBBLE :Balonaș STR_CARGO_SINGULAR_TOFFEE :Caramea STR_CARGO_SINGULAR_BATTERY :Baterie diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 650b21d6a8..24eef4e9ad 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -96,15 +96,15 @@ STR_CARGO_PLURAL_SUGAR.acc :сахар STR_CARGO_PLURAL_TOYS :{G=p}Игрушки STR_CARGO_PLURAL_TOYS.gen :игрушек STR_CARGO_PLURAL_TOYS.acc :игрушки -STR_CARGO_PLURAL_CANDY :{G=p}Конфеты +STR_CARGO_PLURAL_SWEETS :{G=p}Конфеты STR_CARGO_PLURAL_CANDY.gen :конфет STR_CARGO_PLURAL_CANDY.acc :конфеты STR_CARGO_PLURAL_COLA :{G=f}Кола STR_CARGO_PLURAL_COLA.gen :колы STR_CARGO_PLURAL_COLA.acc :колу -STR_CARGO_PLURAL_COTTON_CANDY :{G=f}Сахарная вата -STR_CARGO_PLURAL_COTTON_CANDY.gen :сахарной ваты -STR_CARGO_PLURAL_COTTON_CANDY.acc :сахарную вату +STR_CARGO_PLURAL_CANDYFLOSS :{G=f}Сахарная вата +STR_CARGO_PLURAL_CANDYFLOSS.gen :сахарной ваты +STR_CARGO_PLURAL_CANDYFLOSS.acc :сахарную вату STR_CARGO_PLURAL_BUBBLES :{G=p}Пузырьки STR_CARGO_PLURAL_BUBBLES.gen :пузырьков STR_CARGO_PLURAL_BUBBLES.acc :пузырьки @@ -192,15 +192,15 @@ STR_CARGO_SINGULAR_SUGAR.acc :сахар STR_CARGO_SINGULAR_TOY :{G=p}Игрушки STR_CARGO_SINGULAR_TOY.gen :игрушек STR_CARGO_SINGULAR_TOY.acc :игрушки -STR_CARGO_SINGULAR_CANDY :{G=p}Конфеты -STR_CARGO_SINGULAR_CANDY.gen :конфет -STR_CARGO_SINGULAR_CANDY.acc :конфеты +STR_CARGO_SINGULAR_SWEETS :{G=p}Конфеты +STR_CARGO_SINGULAR_SWEETS.gen :конфет +STR_CARGO_SINGULAR_SWEETS.acc :конфеты STR_CARGO_SINGULAR_COLA :{G=f}Кола STR_CARGO_SINGULAR_COLA.gen :колы STR_CARGO_SINGULAR_COLA.acc :колу -STR_CARGO_SINGULAR_COTTON_CANDY :{G=f}Сахарная вата -STR_CARGO_SINGULAR_COTTON_CANDY.gen :сахарной ваты -STR_CARGO_SINGULAR_COTTON_CANDY.acc :сахарную вату +STR_CARGO_SINGULAR_CANDYFLOSS :{G=f}Сахарная вата +STR_CARGO_SINGULAR_CANDYFLOSS.gen :сахарной ваты +STR_CARGO_SINGULAR_CANDYFLOSS.acc :сахарную вату STR_CARGO_SINGULAR_BUBBLE :{G=p}Пузырьки STR_CARGO_SINGULAR_BUBBLE.gen :пузырьков STR_CARGO_SINGULAR_BUBBLE.acc :пузырьки diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 4131acf754..b6ec8e2d6e 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -119,7 +119,7 @@ STR_CARGO_PLURAL_TOYS :igračke STR_CARGO_PLURAL_TOYS.big :Igračke STR_CARGO_PLURAL_TOYS.gen :igračaka STR_CARGO_PLURAL_TOYS.aku :igračke -STR_CARGO_PLURAL_CANDY :slatkiši +STR_CARGO_PLURAL_SWEETS :slatkiši STR_CARGO_PLURAL_CANDY.big :Slatkiši STR_CARGO_PLURAL_CANDY.gen :slatkiša STR_CARGO_PLURAL_CANDY.aku :slatkiše @@ -127,10 +127,10 @@ STR_CARGO_PLURAL_COLA :kola STR_CARGO_PLURAL_COLA.big :Kola STR_CARGO_PLURAL_COLA.gen :kole STR_CARGO_PLURAL_COLA.aku :kolu -STR_CARGO_PLURAL_COTTON_CANDY :šećerna vuna -STR_CARGO_PLURAL_COTTON_CANDY.big :Šećerna vuna -STR_CARGO_PLURAL_COTTON_CANDY.gen :šećerne vune -STR_CARGO_PLURAL_COTTON_CANDY.aku :šećernu vunu +STR_CARGO_PLURAL_CANDYFLOSS :šećerna vuna +STR_CARGO_PLURAL_CANDYFLOSS.big :Šećerna vuna +STR_CARGO_PLURAL_CANDYFLOSS.gen :šećerne vune +STR_CARGO_PLURAL_CANDYFLOSS.aku :šećernu vunu STR_CARGO_PLURAL_BUBBLES :mehurići STR_CARGO_PLURAL_BUBBLES.big :Mehurići STR_CARGO_PLURAL_BUBBLES.gen :mehurića @@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY :igračka STR_CARGO_SINGULAR_TOY.big :Igračka STR_CARGO_SINGULAR_TOY.gen :igračke STR_CARGO_SINGULAR_TOY.aku :igračku -STR_CARGO_SINGULAR_CANDY :slatkiš -STR_CARGO_SINGULAR_CANDY.big :Slatkiš -STR_CARGO_SINGULAR_CANDY.gen :slatkiša -STR_CARGO_SINGULAR_CANDY.aku :slatkiš +STR_CARGO_SINGULAR_SWEETS :slatkiš +STR_CARGO_SINGULAR_SWEETS.big :Slatkiš +STR_CARGO_SINGULAR_SWEETS.gen :slatkiša +STR_CARGO_SINGULAR_SWEETS.aku :slatkiš STR_CARGO_SINGULAR_COLA :kola STR_CARGO_SINGULAR_COLA.big :Kola STR_CARGO_SINGULAR_COLA.gen :kole STR_CARGO_SINGULAR_COLA.aku :kolu -STR_CARGO_SINGULAR_COTTON_CANDY :šećerna vuna -STR_CARGO_SINGULAR_COTTON_CANDY.big :Šećerna vuna -STR_CARGO_SINGULAR_COTTON_CANDY.gen :šećerne vune -STR_CARGO_SINGULAR_COTTON_CANDY.aku :šećernu vunu +STR_CARGO_SINGULAR_CANDYFLOSS :šećerna vuna +STR_CARGO_SINGULAR_CANDYFLOSS.big :Šećerna vuna +STR_CARGO_SINGULAR_CANDYFLOSS.gen :šećerne vune +STR_CARGO_SINGULAR_CANDYFLOSS.aku :šećernu vunu STR_CARGO_SINGULAR_BUBBLE :mehurić STR_CARGO_SINGULAR_BUBBLE.big :Mehurić STR_CARGO_SINGULAR_BUBBLE.gen :mehurića diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 971d405aa8..1b113ac767 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :小麦 STR_CARGO_PLURAL_RUBBER :橡胶 STR_CARGO_PLURAL_SUGAR :蔗糖 STR_CARGO_PLURAL_TOYS :玩具 -STR_CARGO_PLURAL_CANDY :糖果 +STR_CARGO_PLURAL_SWEETS :糖果 STR_CARGO_PLURAL_COLA :可乐 -STR_CARGO_PLURAL_COTTON_CANDY :棉花糖 +STR_CARGO_PLURAL_CANDYFLOSS :棉花糖 STR_CARGO_PLURAL_BUBBLES :泡泡 STR_CARGO_PLURAL_TOFFEE :太妃糖 STR_CARGO_PLURAL_BATTERIES :电池 @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :小麦 STR_CARGO_SINGULAR_RUBBER :橡胶 STR_CARGO_SINGULAR_SUGAR :蔗糖 STR_CARGO_SINGULAR_TOY :玩具 -STR_CARGO_SINGULAR_CANDY :糖果 +STR_CARGO_SINGULAR_SWEETS :糖果 STR_CARGO_SINGULAR_COLA :可乐 -STR_CARGO_SINGULAR_COTTON_CANDY :棉花糖 +STR_CARGO_SINGULAR_CANDYFLOSS :棉花糖 STR_CARGO_SINGULAR_BUBBLE :泡泡 STR_CARGO_SINGULAR_TOFFEE :太妃糖 STR_CARGO_SINGULAR_BATTERY :电池 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 8e7c29f1db..5a333b98c6 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -73,12 +73,12 @@ STR_CARGO_PLURAL_SUGAR :Cukor STR_CARGO_PLURAL_SUGAR.g :cukru STR_CARGO_PLURAL_TOYS :Hračky STR_CARGO_PLURAL_TOYS.g :hračiek -STR_CARGO_PLURAL_CANDY :Cukríky +STR_CARGO_PLURAL_SWEETS :Cukríky STR_CARGO_PLURAL_CANDY.g :cukríkov STR_CARGO_PLURAL_COLA :Kofola STR_CARGO_PLURAL_COLA.g :kofoly -STR_CARGO_PLURAL_COTTON_CANDY :Cukrová vata -STR_CARGO_PLURAL_COTTON_CANDY.g :cukrovej vaty +STR_CARGO_PLURAL_CANDYFLOSS :Cukrová vata +STR_CARGO_PLURAL_CANDYFLOSS.g :cukrovej vaty STR_CARGO_PLURAL_BUBBLES :Bublinky STR_CARGO_PLURAL_BUBBLES.g :bubliniek STR_CARGO_PLURAL_TOFFEE :Karamelky @@ -138,12 +138,12 @@ STR_CARGO_SINGULAR_SUGAR :Cukor STR_CARGO_SINGULAR_SUGAR.g :cukru STR_CARGO_SINGULAR_TOY :Hračka STR_CARGO_SINGULAR_TOY.g :hračky -STR_CARGO_SINGULAR_CANDY :Cukrík -STR_CARGO_SINGULAR_CANDY.g :cukríka +STR_CARGO_SINGULAR_SWEETS :Cukrík +STR_CARGO_SINGULAR_SWEETS.g :cukríka STR_CARGO_SINGULAR_COLA :Kofola STR_CARGO_SINGULAR_COLA.g :kofoly -STR_CARGO_SINGULAR_COTTON_CANDY :Cukrová vata -STR_CARGO_SINGULAR_COTTON_CANDY.g :cukrovej vaty +STR_CARGO_SINGULAR_CANDYFLOSS :Cukrová vata +STR_CARGO_SINGULAR_CANDYFLOSS.g :cukrovej vaty STR_CARGO_SINGULAR_BUBBLE :Bublinka STR_CARGO_SINGULAR_BUBBLE.g :bublinky STR_CARGO_SINGULAR_TOFFEE :Karamel diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 6112a6a823..e90de58c23 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -105,16 +105,16 @@ STR_CARGO_PLURAL_SUGAR.d :Sladkorju STR_CARGO_PLURAL_TOYS :Igrače STR_CARGO_PLURAL_TOYS.r :Igrač STR_CARGO_PLURAL_TOYS.d :Igračam -STR_CARGO_PLURAL_CANDY :Sladkarije +STR_CARGO_PLURAL_SWEETS :Sladkarije STR_CARGO_PLURAL_CANDY.r :Sladkarij STR_CARGO_PLURAL_CANDY.d :Sladkarijam STR_CARGO_PLURAL_COLA :Cockta STR_CARGO_PLURAL_COLA.r :Cockte STR_CARGO_PLURAL_COLA.d :Cockti -STR_CARGO_PLURAL_COTTON_CANDY :Sladkorna pena -STR_CARGO_PLURAL_COTTON_CANDY.r :Sladkorne pene -STR_CARGO_PLURAL_COTTON_CANDY.d :Sladkorni peni -STR_CARGO_PLURAL_COTTON_CANDY.t :Sladkorno peno +STR_CARGO_PLURAL_CANDYFLOSS :Sladkorna pena +STR_CARGO_PLURAL_CANDYFLOSS.r :Sladkorne pene +STR_CARGO_PLURAL_CANDYFLOSS.d :Sladkorni peni +STR_CARGO_PLURAL_CANDYFLOSS.t :Sladkorno peno STR_CARGO_PLURAL_BUBBLES :Mehurčki STR_CARGO_PLURAL_BUBBLES.r :Mehurčkov STR_CARGO_PLURAL_BUBBLES.d :Mehurčkom @@ -212,18 +212,18 @@ STR_CARGO_SINGULAR_TOY :Igrača STR_CARGO_SINGULAR_TOY.r :Igrače STR_CARGO_SINGULAR_TOY.d :Igrači STR_CARGO_SINGULAR_TOY.t :Igračo -STR_CARGO_SINGULAR_CANDY :Sladkarija -STR_CARGO_SINGULAR_CANDY.r :Sladkarije -STR_CARGO_SINGULAR_CANDY.d :Sladkariji -STR_CARGO_SINGULAR_CANDY.t :Sladkarijo +STR_CARGO_SINGULAR_SWEETS :Sladkarija +STR_CARGO_SINGULAR_SWEETS.r :Sladkarije +STR_CARGO_SINGULAR_SWEETS.d :Sladkariji +STR_CARGO_SINGULAR_SWEETS.t :Sladkarijo STR_CARGO_SINGULAR_COLA :Cockta STR_CARGO_SINGULAR_COLA.r :Cockte STR_CARGO_SINGULAR_COLA.d :Cockti STR_CARGO_SINGULAR_COLA.t :Cockto -STR_CARGO_SINGULAR_COTTON_CANDY :Sladkorna pena -STR_CARGO_SINGULAR_COTTON_CANDY.r :Sladkorne pene -STR_CARGO_SINGULAR_COTTON_CANDY.d :Sladkorni peni -STR_CARGO_SINGULAR_COTTON_CANDY.t :Sladkorno peno +STR_CARGO_SINGULAR_CANDYFLOSS :Sladkorna pena +STR_CARGO_SINGULAR_CANDYFLOSS.r :Sladkorne pene +STR_CARGO_SINGULAR_CANDYFLOSS.d :Sladkorni peni +STR_CARGO_SINGULAR_CANDYFLOSS.t :Sladkorno peno STR_CARGO_SINGULAR_BUBBLE :Mehurček STR_CARGO_SINGULAR_BUBBLE.r :Mehurčka STR_CARGO_SINGULAR_BUBBLE.d :Mehurčku diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 0fba4df700..05c2ad5129 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo STR_CARGO_PLURAL_RUBBER :{G=m}Caucho STR_CARGO_PLURAL_SUGAR :{G=m}Azúcar STR_CARGO_PLURAL_TOYS :{G=m}Juguetes -STR_CARGO_PLURAL_CANDY :{G=m}Caramelos +STR_CARGO_PLURAL_SWEETS :{G=m}Caramelos STR_CARGO_PLURAL_COLA :{G=f}Cola -STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón de Azúcar +STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Algodón de Azúcar STR_CARGO_PLURAL_BUBBLES :{G=f}Burbujas STR_CARGO_PLURAL_TOFFEE :{G=m}Tofes STR_CARGO_PLURAL_BATTERIES :{G=f}Pilas @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo STR_CARGO_SINGULAR_RUBBER :{G=m}Caucho STR_CARGO_SINGULAR_SUGAR :{G=m}Azúcar STR_CARGO_SINGULAR_TOY :{G=m}Juguete -STR_CARGO_SINGULAR_CANDY :{G=m}Caramelo +STR_CARGO_SINGULAR_SWEETS :{G=m}Caramelo STR_CARGO_SINGULAR_COLA :{G=f}Cola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón de Azúcar +STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Algodón de Azúcar STR_CARGO_SINGULAR_BUBBLE :{G=f}Burbuja STR_CARGO_SINGULAR_TOFFEE :{G=m}Tofe STR_CARGO_SINGULAR_BATTERY :{G=f}Pila diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 2c4fe437bc..ee9c8ff37e 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo STR_CARGO_PLURAL_RUBBER :{G=m}Caucho STR_CARGO_PLURAL_SUGAR :{G=m}Azúcar STR_CARGO_PLURAL_TOYS :{G=m}Juguetes -STR_CARGO_PLURAL_CANDY :{G=m}Dulces +STR_CARGO_PLURAL_SWEETS :{G=m}Dulces STR_CARGO_PLURAL_COLA :{G=f}Bebida de cola -STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón de azúcar +STR_CARGO_PLURAL_CANDYFLOSS :{G=m}Algodón de azúcar STR_CARGO_PLURAL_BUBBLES :{G=f}Burbujas STR_CARGO_PLURAL_TOFFEE :{G=m}Caramelos suaves STR_CARGO_PLURAL_BATTERIES :{G=f}Pilas @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo STR_CARGO_SINGULAR_RUBBER :{G=m}Caucho STR_CARGO_SINGULAR_SUGAR :{G=m}Azúcar STR_CARGO_SINGULAR_TOY :{G=m}Juguete -STR_CARGO_SINGULAR_CANDY :{G=m}Dulce +STR_CARGO_SINGULAR_SWEETS :{G=m}Dulce STR_CARGO_SINGULAR_COLA :{G=f}Bebida de cola -STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón de azúcar +STR_CARGO_SINGULAR_CANDYFLOSS :{G=m}Algodón de azúcar STR_CARGO_SINGULAR_BUBBLE :{G=f}Burbuja STR_CARGO_SINGULAR_TOFFEE :{G=m}Caramelo suave STR_CARGO_SINGULAR_BATTERY :{G=f}Pila diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 21c811345a..6f83e5d461 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Vete STR_CARGO_PLURAL_RUBBER :Gummi STR_CARGO_PLURAL_SUGAR :Socker STR_CARGO_PLURAL_TOYS :Leksaker -STR_CARGO_PLURAL_CANDY :Godis +STR_CARGO_PLURAL_SWEETS :Godis STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Sockervadd +STR_CARGO_PLURAL_CANDYFLOSS :Sockervadd STR_CARGO_PLURAL_BUBBLES :Bubblor STR_CARGO_PLURAL_TOFFEE :Knäck STR_CARGO_PLURAL_BATTERIES :Batterier @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Spannmål STR_CARGO_SINGULAR_RUBBER :Gummi STR_CARGO_SINGULAR_SUGAR :Socker STR_CARGO_SINGULAR_TOY :Leksak -STR_CARGO_SINGULAR_CANDY :Godis +STR_CARGO_SINGULAR_SWEETS :Godis STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Sockervadd +STR_CARGO_SINGULAR_CANDYFLOSS :Sockervadd STR_CARGO_SINGULAR_BUBBLE :Bubbla STR_CARGO_SINGULAR_TOFFEE :Knäck STR_CARGO_SINGULAR_BATTERY :Batteri diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index f4cdbe0586..4e7c33b86d 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :கோதும STR_CARGO_PLURAL_RUBBER :இறப்பர் STR_CARGO_PLURAL_SUGAR :சர்க்கரை STR_CARGO_PLURAL_TOYS :பொம்மைகள் -STR_CARGO_PLURAL_CANDY :இனிப்புகள் +STR_CARGO_PLURAL_SWEETS :இனிப்புகள் STR_CARGO_PLURAL_COLA :கோலா -STR_CARGO_PLURAL_COTTON_CANDY :பஞ்சுமிட்டாய் +STR_CARGO_PLURAL_CANDYFLOSS :பஞ்சுமிட்டாய் STR_CARGO_PLURAL_BUBBLES :குமிழிகள் STR_CARGO_PLURAL_TOFFEE :மிட்டாய்கள் STR_CARGO_PLURAL_BATTERIES :பாட்டரிகள் @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :கோதும STR_CARGO_SINGULAR_RUBBER :இறப்பர் STR_CARGO_SINGULAR_SUGAR :சர்க்கரை STR_CARGO_SINGULAR_TOY :பொம்மை -STR_CARGO_SINGULAR_CANDY :இனிப்பு +STR_CARGO_SINGULAR_SWEETS :இனிப்பு STR_CARGO_SINGULAR_COLA :கோலா -STR_CARGO_SINGULAR_COTTON_CANDY :பஞ்சுமிட்டாய் +STR_CARGO_SINGULAR_CANDYFLOSS :பஞ்சுமிட்டாய் STR_CARGO_SINGULAR_BUBBLE :குமிழி STR_CARGO_SINGULAR_TOFFEE :மிட்டாய் STR_CARGO_SINGULAR_BATTERY :மின்கலம் diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 95b051e085..bbc964690a 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :ข้าวส STR_CARGO_PLURAL_RUBBER :ยางพารา STR_CARGO_PLURAL_SUGAR :น้ำตาล STR_CARGO_PLURAL_TOYS :ของเล่น -STR_CARGO_PLURAL_CANDY :ขนมสายไหม +STR_CARGO_PLURAL_SWEETS :ขนมสายไหม STR_CARGO_PLURAL_COLA :โคล่า -STR_CARGO_PLURAL_COTTON_CANDY :ขนมสายไหม +STR_CARGO_PLURAL_CANDYFLOSS :ขนมสายไหม STR_CARGO_PLURAL_BUBBLES :ฟอง STR_CARGO_PLURAL_TOFFEE :ลูกอม STR_CARGO_PLURAL_BATTERIES :ถ่านไฟฉาย @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :ข้าวส STR_CARGO_SINGULAR_RUBBER :ยางพารา STR_CARGO_SINGULAR_SUGAR :น้ำตาล STR_CARGO_SINGULAR_TOY :ของเล่น -STR_CARGO_SINGULAR_CANDY :ขนมสายไหม +STR_CARGO_SINGULAR_SWEETS :ขนมสายไหม STR_CARGO_SINGULAR_COLA :โคล่า -STR_CARGO_SINGULAR_COTTON_CANDY :ขนมสายไหม +STR_CARGO_SINGULAR_CANDYFLOSS :ขนมสายไหม STR_CARGO_SINGULAR_BUBBLE :ฟอง STR_CARGO_SINGULAR_TOFFEE :ลูกอม STR_CARGO_SINGULAR_BATTERY :ถ่านไฟฉาย diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index eabbb03608..85d8b1de4d 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :小麥 STR_CARGO_PLURAL_RUBBER :橡膠 STR_CARGO_PLURAL_SUGAR :砂糖 STR_CARGO_PLURAL_TOYS :玩具 -STR_CARGO_PLURAL_CANDY :糖果 +STR_CARGO_PLURAL_SWEETS :糖果 STR_CARGO_PLURAL_COLA :可樂 -STR_CARGO_PLURAL_COTTON_CANDY :棉花糖 +STR_CARGO_PLURAL_CANDYFLOSS :棉花糖 STR_CARGO_PLURAL_BUBBLES :氣泡 STR_CARGO_PLURAL_TOFFEE :太妃糖 STR_CARGO_PLURAL_BATTERIES :電池 @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :小麥 STR_CARGO_SINGULAR_RUBBER :橡膠 STR_CARGO_SINGULAR_SUGAR :砂糖 STR_CARGO_SINGULAR_TOY :玩具 -STR_CARGO_SINGULAR_CANDY :糖果 +STR_CARGO_SINGULAR_SWEETS :糖果 STR_CARGO_SINGULAR_COLA :可樂 -STR_CARGO_SINGULAR_COTTON_CANDY :棉花糖 +STR_CARGO_SINGULAR_CANDYFLOSS :棉花糖 STR_CARGO_SINGULAR_BUBBLE :氣泡 STR_CARGO_SINGULAR_TOFFEE :太妃糖 STR_CARGO_SINGULAR_BATTERY :電池 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 6246e05b7e..d9d664e957 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :Buğday STR_CARGO_PLURAL_RUBBER :Kauçuk STR_CARGO_PLURAL_SUGAR :Şeker STR_CARGO_PLURAL_TOYS :Oyuncak -STR_CARGO_PLURAL_CANDY :Tatlı +STR_CARGO_PLURAL_SWEETS :Tatlı STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Pamuk şeker +STR_CARGO_PLURAL_CANDYFLOSS :Pamuk şeker STR_CARGO_PLURAL_BUBBLES :Baloncuk STR_CARGO_PLURAL_TOFFEE :Şekerleme STR_CARGO_PLURAL_BATTERIES :Pil @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :Buğday STR_CARGO_SINGULAR_RUBBER :Kauçuk STR_CARGO_SINGULAR_SUGAR :Şeker STR_CARGO_SINGULAR_TOY :Oyuncak -STR_CARGO_SINGULAR_CANDY :Tatlı +STR_CARGO_SINGULAR_SWEETS :Tatlı STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Pamuk helva +STR_CARGO_SINGULAR_CANDYFLOSS :Pamuk helva STR_CARGO_SINGULAR_BUBBLE :Balon STR_CARGO_SINGULAR_TOFFEE :Şekerleme STR_CARGO_SINGULAR_BATTERY :Pil diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index e0799eddae..a0053615b4 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -95,15 +95,15 @@ STR_CARGO_PLURAL_SUGAR.z :цукор STR_CARGO_PLURAL_TOYS :іграшки STR_CARGO_PLURAL_TOYS.r :іграшок STR_CARGO_PLURAL_TOYS.z :іграшки -STR_CARGO_PLURAL_CANDY :солодощі +STR_CARGO_PLURAL_SWEETS :солодощі STR_CARGO_PLURAL_CANDY.r :солодощів STR_CARGO_PLURAL_CANDY.z :солодощі STR_CARGO_PLURAL_COLA :кола STR_CARGO_PLURAL_COLA.r :коли STR_CARGO_PLURAL_COLA.z :колу -STR_CARGO_PLURAL_COTTON_CANDY :солодка вата -STR_CARGO_PLURAL_COTTON_CANDY.r :солодкої вати -STR_CARGO_PLURAL_COTTON_CANDY.z :солодку вату +STR_CARGO_PLURAL_CANDYFLOSS :солодка вата +STR_CARGO_PLURAL_CANDYFLOSS.r :солодкої вати +STR_CARGO_PLURAL_CANDYFLOSS.z :солодку вату STR_CARGO_PLURAL_BUBBLES :бульбашки STR_CARGO_PLURAL_BUBBLES.r :бульбашок STR_CARGO_PLURAL_BUBBLES.z :бульбашки @@ -191,15 +191,15 @@ STR_CARGO_SINGULAR_SUGAR.z :цукор STR_CARGO_SINGULAR_TOY :іграшки STR_CARGO_SINGULAR_TOY.r :іграшок STR_CARGO_SINGULAR_TOY.z :іграшки -STR_CARGO_SINGULAR_CANDY :цукерки -STR_CARGO_SINGULAR_CANDY.r :цукерок -STR_CARGO_SINGULAR_CANDY.z :цукерки +STR_CARGO_SINGULAR_SWEETS :цукерки +STR_CARGO_SINGULAR_SWEETS.r :цукерок +STR_CARGO_SINGULAR_SWEETS.z :цукерки STR_CARGO_SINGULAR_COLA :кола STR_CARGO_SINGULAR_COLA.r :коли STR_CARGO_SINGULAR_COLA.z :колу -STR_CARGO_SINGULAR_COTTON_CANDY :солодка вата -STR_CARGO_SINGULAR_COTTON_CANDY.r :солодкої вати -STR_CARGO_SINGULAR_COTTON_CANDY.z :солодку вату +STR_CARGO_SINGULAR_CANDYFLOSS :солодка вата +STR_CARGO_SINGULAR_CANDYFLOSS.r :солодкої вати +STR_CARGO_SINGULAR_CANDYFLOSS.z :солодку вату STR_CARGO_SINGULAR_BUBBLE :бульбашки STR_CARGO_SINGULAR_BUBBLE.r :бульбашок STR_CARGO_SINGULAR_BUBBLE.z :бульбашки diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index e0608c3e3d..701e9aa97b 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Тулă STR_CARGO_PLURAL_RUBBER :Каучук STR_CARGO_PLURAL_SUGAR :Сахăр STR_CARGO_PLURAL_TOYS :Теттесем -STR_CARGO_PLURAL_CANDY :Канфетсем +STR_CARGO_PLURAL_SWEETS :Канфетсем STR_CARGO_PLURAL_COLA :Кола -STR_CARGO_PLURAL_COTTON_CANDY :Сахăр ваткĕ +STR_CARGO_PLURAL_CANDYFLOSS :Сахăр ваткĕ STR_CARGO_PLURAL_BUBBLES :Хӑмпӑҫӑмсем STR_CARGO_PLURAL_TOFFEE :Карамель STR_CARGO_PLURAL_BATTERIES :Батарейкасем @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Тулă STR_CARGO_SINGULAR_RUBBER :Каучук STR_CARGO_SINGULAR_SUGAR :Сахăр STR_CARGO_SINGULAR_TOY :Тетте -STR_CARGO_SINGULAR_CANDY :Канфетсем +STR_CARGO_SINGULAR_SWEETS :Канфетсем STR_CARGO_SINGULAR_COLA :Кола -STR_CARGO_SINGULAR_COTTON_CANDY :Сахăр ваткĕ +STR_CARGO_SINGULAR_CANDYFLOSS :Сахăр ваткĕ STR_CARGO_SINGULAR_BUBBLE :Хӑмпӑҫӑм STR_CARGO_SINGULAR_TOFFEE :Карамель STR_CARGO_SINGULAR_BATTERY :Батарейкасем diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 97b3746b8f..57f55e83bf 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Weet STR_CARGO_PLURAL_RUBBER :Rubber STR_CARGO_PLURAL_SUGAR :Sûker STR_CARGO_PLURAL_TOYS :Boartersguod -STR_CARGO_PLURAL_CANDY :Snobbersguod +STR_CARGO_PLURAL_SWEETS :Snobbersguod STR_CARGO_PLURAL_COLA :Kola -STR_CARGO_PLURAL_COTTON_CANDY :Sûkerspin +STR_CARGO_PLURAL_CANDYFLOSS :Sûkerspin STR_CARGO_PLURAL_BUBBLES :Bubbels STR_CARGO_PLURAL_TOFFEE :Toffee STR_CARGO_PLURAL_BATTERIES :Batterijen @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Weet STR_CARGO_SINGULAR_RUBBER :Rubber STR_CARGO_SINGULAR_SUGAR :Sûker STR_CARGO_SINGULAR_TOY :Boartersguod -STR_CARGO_SINGULAR_CANDY :Snobbersguod +STR_CARGO_SINGULAR_SWEETS :Snobbersguod STR_CARGO_SINGULAR_COLA :Kola -STR_CARGO_SINGULAR_COTTON_CANDY :Sûkerspin +STR_CARGO_SINGULAR_CANDYFLOSS :Sûkerspin STR_CARGO_SINGULAR_BUBBLE :Bûle STR_CARGO_SINGULAR_TOFFEE :Toffee STR_CARGO_SINGULAR_BATTERY :Batterij diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 8807e62bb6..d089320735 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -47,9 +47,9 @@ STR_CARGO_PLURAL_WHEAT :Frumento STR_CARGO_PLURAL_RUBBER :Kauchuko STR_CARGO_PLURAL_SUGAR :Sukro STR_CARGO_PLURAL_TOYS :Ludili -STR_CARGO_PLURAL_CANDY :Bonboni +STR_CARGO_PLURAL_SWEETS :Bonboni STR_CARGO_PLURAL_COLA :Kolao -STR_CARGO_PLURAL_COTTON_CANDY :Kandi-lanugo +STR_CARGO_PLURAL_CANDYFLOSS :Kandi-lanugo STR_CARGO_PLURAL_BUBBLES :Buli STR_CARGO_PLURAL_TOFFEE :Karamelo STR_CARGO_PLURAL_BATTERIES :Baterii @@ -81,9 +81,9 @@ STR_CARGO_SINGULAR_WHEAT :Frumento STR_CARGO_SINGULAR_RUBBER :Kauchuko STR_CARGO_SINGULAR_SUGAR :Sukro STR_CARGO_SINGULAR_TOY :Ludilo -STR_CARGO_SINGULAR_CANDY :Bonbono +STR_CARGO_SINGULAR_SWEETS :Bonbono STR_CARGO_SINGULAR_COLA :Kolao -STR_CARGO_SINGULAR_COTTON_CANDY :Kandi-lanugo +STR_CARGO_SINGULAR_CANDYFLOSS :Kandi-lanugo STR_CARGO_SINGULAR_BUBBLE :Bulo STR_CARGO_SINGULAR_TOFFEE :Karamelo STR_CARGO_SINGULAR_BATTERY :Baterio diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 340bb0818c..3884677880 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Пченица STR_CARGO_PLURAL_RUBBER :Гума STR_CARGO_PLURAL_SUGAR :Шеќер STR_CARGO_PLURAL_TOYS :Играчки -STR_CARGO_PLURAL_CANDY :Колачиња +STR_CARGO_PLURAL_SWEETS :Колачиња STR_CARGO_PLURAL_COLA :Кола (сок) -STR_CARGO_PLURAL_COTTON_CANDY :Суровина за колачиња +STR_CARGO_PLURAL_CANDYFLOSS :Суровина за колачиња STR_CARGO_PLURAL_BUBBLES :Меурчиња STR_CARGO_PLURAL_TOFFEE :Карамели STR_CARGO_PLURAL_BATTERIES :Батерии @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Пченица STR_CARGO_SINGULAR_RUBBER :Гума STR_CARGO_SINGULAR_SUGAR :Шеќер STR_CARGO_SINGULAR_TOY :Играчка -STR_CARGO_SINGULAR_CANDY :Колаче +STR_CARGO_SINGULAR_SWEETS :Колаче STR_CARGO_SINGULAR_COLA :Кола (сок) -STR_CARGO_SINGULAR_COTTON_CANDY :Суровина за колачиња +STR_CARGO_SINGULAR_CANDYFLOSS :Суровина за колачиња STR_CARGO_SINGULAR_BUBBLE :Меурче STR_CARGO_SINGULAR_TOFFEE :Карамела STR_CARGO_SINGULAR_BATTERY :Батерија diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index ea06945bb1..fccf5f42d1 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Qamħ STR_CARGO_PLURAL_RUBBER :Lastku STR_CARGO_PLURAL_SUGAR :Zokkor STR_CARGO_PLURAL_TOYS :Ġugarelli -STR_CARGO_PLURAL_CANDY :Ħelu +STR_CARGO_PLURAL_SWEETS :Ħelu STR_CARGO_PLURAL_COLA :Koka -STR_CARGO_PLURAL_COTTON_CANDY :Kandifloss +STR_CARGO_PLURAL_CANDYFLOSS :Kandifloss STR_CARGO_PLURAL_BUBBLES :Bżieżaq STR_CARGO_PLURAL_TOFFEE :Tofija STR_CARGO_PLURAL_BATTERIES :Batteriji @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Qamħ STR_CARGO_SINGULAR_RUBBER :Lastku STR_CARGO_SINGULAR_SUGAR :Zokkor STR_CARGO_SINGULAR_TOY :Ġugarell -STR_CARGO_SINGULAR_CANDY :Ħelwa +STR_CARGO_SINGULAR_SWEETS :Ħelwa STR_CARGO_SINGULAR_COLA :Koka -STR_CARGO_SINGULAR_COTTON_CANDY :Kandiflos +STR_CARGO_SINGULAR_CANDYFLOSS :Kandiflos STR_CARGO_SINGULAR_BUBBLE :Bużżieqa STR_CARGO_SINGULAR_TOFFEE :Tofija STR_CARGO_SINGULAR_BATTERY :Batterija diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 25cae04d3e..488c016bc7 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :गहू STR_CARGO_PLURAL_RUBBER :रबर STR_CARGO_PLURAL_SUGAR :साखर STR_CARGO_PLURAL_TOYS :खेळणी -STR_CARGO_PLURAL_CANDY :मिठाई +STR_CARGO_PLURAL_SWEETS :मिठाई STR_CARGO_PLURAL_COLA :शीतपेये -STR_CARGO_PLURAL_COTTON_CANDY :म्हातारीचा कापूस +STR_CARGO_PLURAL_CANDYFLOSS :म्हातारीचा कापूस STR_CARGO_PLURAL_BUBBLES :बुडबुडे STR_CARGO_PLURAL_TOFFEE :टॉफी STR_CARGO_PLURAL_BATTERIES :बॅटरी @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :गहू STR_CARGO_SINGULAR_RUBBER :रबर STR_CARGO_SINGULAR_SUGAR :साखर STR_CARGO_SINGULAR_TOY :खेळणी -STR_CARGO_SINGULAR_CANDY :मिठाई +STR_CARGO_SINGULAR_SWEETS :मिठाई STR_CARGO_SINGULAR_COLA :कोला -STR_CARGO_SINGULAR_COTTON_CANDY :कँडी फ्लास +STR_CARGO_SINGULAR_CANDYFLOSS :कँडी फ्लास STR_CARGO_SINGULAR_BUBBLE :बुडबुडा STR_CARGO_SINGULAR_TOFFEE :टॉफी STR_CARGO_SINGULAR_BATTERY :बॅटरी diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index dde996e034..ffebcc9045 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :گندم STR_CARGO_PLURAL_RUBBER :کائوچو STR_CARGO_PLURAL_SUGAR :شکر STR_CARGO_PLURAL_TOYS :اسباب بازی -STR_CARGO_PLURAL_CANDY :شیرینی +STR_CARGO_PLURAL_SWEETS :شیرینی STR_CARGO_PLURAL_COLA :نوشابه -STR_CARGO_PLURAL_COTTON_CANDY :پشمک +STR_CARGO_PLURAL_CANDYFLOSS :پشمک STR_CARGO_PLURAL_BUBBLES :حباب STR_CARGO_PLURAL_TOFFEE :تافی STR_CARGO_PLURAL_BATTERIES :باتری @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :گندم STR_CARGO_SINGULAR_RUBBER :کائوچو STR_CARGO_SINGULAR_SUGAR :شکر STR_CARGO_SINGULAR_TOY :اسباب بازی -STR_CARGO_SINGULAR_CANDY :شیرینی +STR_CARGO_SINGULAR_SWEETS :شیرینی STR_CARGO_SINGULAR_COLA :نوشابه -STR_CARGO_SINGULAR_COTTON_CANDY :پشمک +STR_CARGO_SINGULAR_CANDYFLOSS :پشمک STR_CARGO_SINGULAR_BUBBLE :حباب STR_CARGO_SINGULAR_TOFFEE :تافی STR_CARGO_SINGULAR_BATTERY :باتری diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 2e8266c230..37edeb27eb 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT :گندم STR_CARGO_PLURAL_RUBBER :ربڑ STR_CARGO_PLURAL_SUGAR :چینی STR_CARGO_PLURAL_TOYS :کھلونے -STR_CARGO_PLURAL_CANDY :مٹھایاں +STR_CARGO_PLURAL_SWEETS :مٹھایاں STR_CARGO_PLURAL_COLA :کوئلہ -STR_CARGO_PLURAL_COTTON_CANDY :کینڈی فلاس +STR_CARGO_PLURAL_CANDYFLOSS :کینڈی فلاس STR_CARGO_PLURAL_BUBBLES :بلبلے STR_CARGO_PLURAL_TOFFEE :ٹافی STR_CARGO_PLURAL_BATTERIES :بیٹریاں @@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT :گندم STR_CARGO_SINGULAR_RUBBER :ربڑ STR_CARGO_SINGULAR_SUGAR :چینی STR_CARGO_SINGULAR_TOY :کھلونا -STR_CARGO_SINGULAR_CANDY :مٹھائی +STR_CARGO_SINGULAR_SWEETS :مٹھائی STR_CARGO_SINGULAR_COLA :کولا -STR_CARGO_SINGULAR_COTTON_CANDY :کینڈی فلاس +STR_CARGO_SINGULAR_CANDYFLOSS :کینڈی فلاس STR_CARGO_SINGULAR_BUBBLE :بلبلہ STR_CARGO_SINGULAR_TOFFEE :ٹافی STR_CARGO_SINGULAR_BATTERY :بیٹری diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 8d3abf6d96..aed29fab1a 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Bột mì STR_CARGO_PLURAL_RUBBER :Cao su STR_CARGO_PLURAL_SUGAR :Đường STR_CARGO_PLURAL_TOYS :Đồ chơi -STR_CARGO_PLURAL_CANDY :Kẹo +STR_CARGO_PLURAL_SWEETS :Kẹo STR_CARGO_PLURAL_COLA :Nước cola -STR_CARGO_PLURAL_COTTON_CANDY :Kẹo bông +STR_CARGO_PLURAL_CANDYFLOSS :Kẹo bông STR_CARGO_PLURAL_BUBBLES :Bong bóng STR_CARGO_PLURAL_TOFFEE :Kẹo bơ cứng STR_CARGO_PLURAL_BATTERIES :Pin @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Bột mì STR_CARGO_SINGULAR_RUBBER :Cao su STR_CARGO_SINGULAR_SUGAR :Đường STR_CARGO_SINGULAR_TOY :Đồ chơi -STR_CARGO_SINGULAR_CANDY :Kẹo +STR_CARGO_SINGULAR_SWEETS :Kẹo STR_CARGO_SINGULAR_COLA :Nước cola -STR_CARGO_SINGULAR_COTTON_CANDY :Kẹo bông +STR_CARGO_SINGULAR_CANDYFLOSS :Kẹo bông STR_CARGO_SINGULAR_BUBBLE :Bong bóng STR_CARGO_SINGULAR_TOFFEE :Kẹo bơ cứng STR_CARGO_SINGULAR_BATTERY :Pin diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 2f267f488b..8f68d17a78 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT :Gwenith STR_CARGO_PLURAL_RUBBER :Rwber STR_CARGO_PLURAL_SUGAR :Siwgr STR_CARGO_PLURAL_TOYS :Teganau -STR_CARGO_PLURAL_CANDY :Melysion +STR_CARGO_PLURAL_SWEETS :Melysion STR_CARGO_PLURAL_COLA :Cola -STR_CARGO_PLURAL_COTTON_CANDY :Candifflos +STR_CARGO_PLURAL_CANDYFLOSS :Candifflos STR_CARGO_PLURAL_BUBBLES :Swigod STR_CARGO_PLURAL_TOFFEE :Toffi STR_CARGO_PLURAL_BATTERIES :Baterïau @@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT :Gwenith STR_CARGO_SINGULAR_RUBBER :Rwber STR_CARGO_SINGULAR_SUGAR :Siwgr STR_CARGO_SINGULAR_TOY :Tegan -STR_CARGO_SINGULAR_CANDY :Melysyn +STR_CARGO_SINGULAR_SWEETS :Melysyn STR_CARGO_SINGULAR_COLA :Cola -STR_CARGO_SINGULAR_COTTON_CANDY :Candifflos +STR_CARGO_SINGULAR_CANDYFLOSS :Candifflos STR_CARGO_SINGULAR_BUBBLE :Swigen STR_CARGO_SINGULAR_TOFFEE :Toffi STR_CARGO_SINGULAR_BATTERY :Batri From 584df548f1bdfa27482aa995d151542abe4f0bca Mon Sep 17 00:00:00 2001 From: Bernard Teo Date: Fri, 11 Jan 2019 16:09:37 +0800 Subject: [PATCH 08/38] Codechange: Make vehicle lists internally support grouping of vehicles This is in preparation for the new UI feature that allows grouping by shared orders. --- src/group_gui.cpp | 62 +++++------ src/vehicle_gui.cpp | 229 +++++++++++++++++++++++++---------------- src/vehicle_gui_base.h | 76 ++++++++++++-- 3 files changed, 233 insertions(+), 134 deletions(-) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 8d0bba8fbb..5323b65f28 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -341,24 +341,12 @@ public: this->vscroll = this->GetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR); this->group_sb = this->GetScrollbar(WID_GL_LIST_GROUP_SCROLLBAR); - switch (this->vli.vtype) { - default: NOT_REACHED(); - case VEH_TRAIN: this->sorting = &_sorting.train; break; - case VEH_ROAD: this->sorting = &_sorting.roadveh; break; - case VEH_SHIP: this->sorting = &_sorting.ship; break; - case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break; - } - this->vli.index = ALL_GROUP; this->vehicle_sel = INVALID_VEHICLE; this->group_sel = INVALID_GROUP; this->group_rename = INVALID_GROUP; this->group_over = INVALID_GROUP; - this->vehicles.SetListing(*this->sorting); - this->vehicles.ForceRebuild(); - this->vehicles.NeedResort(); - this->BuildVehicleList(); this->SortVehicleList(); @@ -382,7 +370,7 @@ public: ~VehicleGroupWindow() { - *this->sorting = this->vehicles.GetListing(); + *this->sorting = this->vehgroups.GetListing(); } void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override @@ -453,10 +441,10 @@ public: { if (data == 0) { /* This needs to be done in command-scope to enforce rebuilding before resorting invalid data */ - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); this->groups.ForceRebuild(); } else { - this->vehicles.ForceResort(); + this->vehgroups.ForceResort(); this->groups.ForceResort(); } @@ -509,8 +497,8 @@ public: this->BuildGroupList(this->owner); - this->group_sb->SetCount((uint)this->groups.size()); - this->vscroll->SetCount((uint)this->vehicles.size()); + this->group_sb->SetCount(static_cast(this->groups.size())); + this->vscroll->SetCount(static_cast(this->vehgroups.size())); /* The drop down menu is out, *but* it may not be used, retract it. */ if (this->vehicles.size() == 0 && this->IsWidgetLowered(WID_GL_MANAGE_VEHICLES_DROPDOWN)) { @@ -550,7 +538,7 @@ public: this->GetWidget(WID_GL_REPLACE_PROTECTION)->widget_data = protect_sprite + this->vli.vtype; /* Set text of sort by dropdown */ - this->GetWidget(WID_GL_SORT_BY_DROPDOWN)->widget_data = this->vehicle_sorter_names[this->vehicles.SortType()]; + this->GetWidget(WID_GL_SORT_BY_DROPDOWN)->widget_data = this->vehicle_group_none_sorter_names[this->vehgroups.SortType()]; this->DrawWidgets(); } @@ -623,16 +611,16 @@ public: } case WID_GL_SORT_BY_ORDER: - this->DrawSortButtonState(WID_GL_SORT_BY_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP); + this->DrawSortButtonState(WID_GL_SORT_BY_ORDER, this->vehgroups.IsDescSortOrder() ? SBS_DOWN : SBS_UP); break; case WID_GL_LIST_VEHICLE: - if (this->vli.index != ALL_GROUP) { - /* Mark vehicles which are in sub-groups */ + if (this->vli.index != ALL_GROUP && this->grouping == GB_NONE) { + /* Mark vehicles which are in sub-groups (only if we are not using shared order coalescing) */ int y = r.top; - uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), (uint)this->vehicles.size()); + uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), static_cast(this->vehgroups.size())); for (uint i = this->vscroll->GetPosition(); i < max; ++i) { - const Vehicle *v = this->vehicles[i]; + const Vehicle *v = this->vehgroups[i].GetSingleVehicle(); if (v->group_id != this->vli.index) { GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->resize.step_height - 2, _colour_gradient[COLOUR_GREY][3], FILLRECT_CHECKER); } @@ -658,18 +646,18 @@ public: { switch (widget) { case WID_GL_SORT_BY_ORDER: // Flip sorting method ascending/descending - this->vehicles.ToggleSortOrder(); + this->vehgroups.ToggleSortOrder(); this->SetDirty(); break; case WID_GL_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu - ShowDropDownMenu(this, this->vehicle_sorter_names, this->vehicles.SortType(), WID_GL_SORT_BY_DROPDOWN, 0, (this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : (1 << 10)); + ShowDropDownMenu(this, this->GetVehicleSorterNames(), this->vehgroups.SortType(), WID_GL_SORT_BY_DROPDOWN, 0, (this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : (1 << 10)); return; case WID_GL_ALL_VEHICLES: // All vehicles button if (!IsAllGroupID(this->vli.index)) { this->vli.index = ALL_GROUP; - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); this->SetDirty(); } break; @@ -677,7 +665,7 @@ public: case WID_GL_DEFAULT_VEHICLES: // Ungrouped vehicles button if (!IsDefaultGroupID(this->vli.index)) { this->vli.index = DEFAULT_GROUP; - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); this->SetDirty(); } break; @@ -717,17 +705,17 @@ public: SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this); - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); this->SetDirty(); break; } case WID_GL_LIST_VEHICLE: { // Matrix Vehicle uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GL_LIST_VEHICLE); - if (id_v >= this->vehicles.size()) return; // click out of list bound + if (id_v >= this->vehgroups.size()) return; // click out of list bound - const Vehicle *v = this->vehicles[id_v]; - if (VehicleClicked(v)) break; + const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; + const Vehicle * const v = vehgroup.GetSingleVehicle(); this->vehicle_sel = v->index; @@ -851,13 +839,13 @@ public: this->SetDirty(); uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GL_LIST_VEHICLE); - if (id_v >= this->vehicles.size()) return; // click out of list bound + if (id_v >= this->vehgroups.size()) return; // click out of list bound - const Vehicle *v = this->vehicles[id_v]; + const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; + const Vehicle *v = vehgroup.GetSingleVehicle(); if (!VehicleClicked(v) && vindex == v->index) { ShowVehicleViewWindow(v); } - break; } } } @@ -886,7 +874,7 @@ public: { switch (widget) { case WID_GL_SORT_BY_DROPDOWN: - this->vehicles.SetSortType(index); + this->vehgroups.SetSortType(index); break; case WID_GL_MANAGE_VEHICLES_DROPDOWN: @@ -924,7 +912,7 @@ public: void OnGameTick() override { - if (this->groups.NeedResort() || this->vehicles.NeedResort()) { + if (this->groups.NeedResort() || this->vehgroups.NeedResort()) { this->SetDirty(); } } @@ -1019,7 +1007,7 @@ public: } this->group_sb->ScrollTowards(id_g); } - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); this->SetDirty(); } diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 84ff890d15..135da393a2 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -39,40 +39,50 @@ #include "safeguards.h" +#include -Sorting _sorting; -static GUIVehicleList::SortFunction VehicleNumberSorter; -static GUIVehicleList::SortFunction VehicleNameSorter; -static GUIVehicleList::SortFunction VehicleAgeSorter; -static GUIVehicleList::SortFunction VehicleProfitThisYearSorter; -static GUIVehicleList::SortFunction VehicleProfitLastYearSorter; -static GUIVehicleList::SortFunction VehicleCargoSorter; -static GUIVehicleList::SortFunction VehicleReliabilitySorter; -static GUIVehicleList::SortFunction VehicleMaxSpeedSorter; -static GUIVehicleList::SortFunction VehicleModelSorter; -static GUIVehicleList::SortFunction VehicleValueSorter; -static GUIVehicleList::SortFunction VehicleLengthSorter; -static GUIVehicleList::SortFunction VehicleTimeToLiveSorter; -static GUIVehicleList::SortFunction VehicleTimetableDelaySorter; +BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END]; +Sorting _sorting[BaseVehicleListWindow::GB_END]; -GUIVehicleList::SortFunction * const BaseVehicleListWindow::vehicle_sorter_funcs[] = { - &VehicleNumberSorter, - &VehicleNameSorter, - &VehicleAgeSorter, - &VehicleProfitThisYearSorter, - &VehicleProfitLastYearSorter, - &VehicleCargoSorter, - &VehicleReliabilitySorter, - &VehicleMaxSpeedSorter, - &VehicleModelSorter, - &VehicleValueSorter, - &VehicleLengthSorter, - &VehicleTimeToLiveSorter, - &VehicleTimetableDelaySorter, +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNumberSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNameSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleAgeSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleProfitThisYearSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleProfitLastYearSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleCargoSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleReliabilitySorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleMaxSpeedSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleModelSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleValueSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleLengthSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleTimeToLiveSorter; +static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleTimetableDelaySorter; + +/** Wrapper to convert a VehicleIndividualSortFunction to a VehicleGroupSortFunction */ +template +static bool VehicleIndividualToGroupSorterWrapper(GUIVehicleGroup const &a, GUIVehicleGroup const &b) +{ + return func(*(a.vehicles_begin), *(b.vehicles_begin)); +} + +BaseVehicleListWindow::VehicleGroupSortFunction * const BaseVehicleListWindow::vehicle_group_none_sorter_funcs[] = { + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, + &VehicleIndividualToGroupSorterWrapper, }; -const StringID BaseVehicleListWindow::vehicle_sorter_names[] = { +const StringID BaseVehicleListWindow::vehicle_group_none_sorter_names[] = { STR_SORT_BY_NUMBER, STR_SORT_BY_NAME, STR_SORT_BY_AGE, @@ -96,6 +106,31 @@ const StringID BaseVehicleListWindow::vehicle_depot_name[] = { STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR }; +BaseVehicleListWindow::BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno) : Window(desc), vli(VehicleListIdentifier::UnPack(wno)) +{ + this->grouping = _grouping[vli.type][vli.vtype]; + this->UpdateSortingFromGrouping(); +} + +/** + * Get the number of digits of space required for the given number. + * @param number The number. + * @return The number of digits to allocate space for. + */ +uint CountDigitsForAllocatingSpace(uint number) +{ + if (number >= 10000) return 5; + if (number >= 1000) return 4; + if (number >= 100) return 3; + + /* + * When the smallest unit number is less than 10, it is + * quite likely that it will expand to become more than + * 10 quite soon. + */ + return 2; +} + /** * Get the number of digits the biggest unit number of a set of vehicles has. * @param vehicles The list of vehicles. @@ -108,30 +143,29 @@ uint GetUnitNumberDigits(VehicleList &vehicles) unitnumber = max(unitnumber, v->unitnumber); } - if (unitnumber >= 10000) return 5; - if (unitnumber >= 1000) return 4; - if (unitnumber >= 100) return 3; - - /* - * When the smallest unit number is less than 10, it is - * quite likely that it will expand to become more than - * 10 quite soon. - */ - return 2; + return CountDigitsForAllocatingSpace(unitnumber); } void BaseVehicleListWindow::BuildVehicleList() { - if (!this->vehicles.NeedRebuild()) return; + if (!this->vehgroups.NeedRebuild()) return; DEBUG(misc, 3, "Building vehicle list type %d for company %d given index %d", this->vli.type, this->vli.company, this->vli.index); + this->vehgroups.clear(); + GenerateVehicleSortList(&this->vehicles, this->vli); - this->unitnumber_digits = GetUnitNumberDigits(this->vehicles); + uint max_unitnumber = 0; + for (auto it = this->vehicles.begin(); it != this->vehicles.end(); ++it) { + this->vehgroups.emplace_back(it, it + 1, (*it)->GetDisplayProfitThisYear(), (*it)->GetDisplayProfitLastYear(), (*it)->age); - this->vehicles.RebuildDone(); - this->vscroll->SetCount((uint)this->vehicles.size()); + max_unitnumber = max(max_unitnumber, (*it)->unitnumber); + } + this->unitnumber_digits = CountDigitsForAllocatingSpace(max_unitnumber); + + this->vehgroups.RebuildDone(); + this->vscroll->SetCount(this->vehgroups.size()); } /** @@ -183,7 +217,7 @@ static const Vehicle *_last_vehicle[2] = { nullptr, nullptr }; void BaseVehicleListWindow::SortVehicleList() { - if (this->vehicles.Sort()) return; + if (this->vehgroups.Sort()) return; /* invalidate cached values for name sorter - vehicle names could change */ _last_vehicle[0] = _last_vehicle[1] = nullptr; @@ -196,16 +230,16 @@ void DepotSortList(VehicleList *list) } /** draw the vehicle profit button in the vehicle list window. */ -static void DrawVehicleProfitButton(const Vehicle *v, int x, int y) +static void DrawVehicleProfitButton(Date age, Money display_profit_last_year, uint num_vehicles, int x, int y) { SpriteID spr; /* draw profit-based coloured icons */ - if (v->age <= VEHICLE_PROFIT_MIN_AGE) { + if (age <= VEHICLE_PROFIT_MIN_AGE) { spr = SPR_PROFIT_NA; - } else if (v->GetDisplayProfitLastYear() < 0) { + } else if (display_profit_last_year < 0) { spr = SPR_PROFIT_NEGATIVE; - } else if (v->GetDisplayProfitLastYear() < VEHICLE_PROFIT_THRESHOLD) { + } else if (display_profit_last_year < VEHICLE_PROFIT_THRESHOLD * num_vehicles) { spr = SPR_PROFIT_SOME; } else { spr = SPR_PROFIT_LOT; @@ -1204,6 +1238,7 @@ static bool VehicleTimetableDelaySorter(const Vehicle * const &a, const Vehicle void InitializeGUI() { + MemSetT(&_grouping, 0); MemSetT(&_sorting, 0); } @@ -1384,16 +1419,20 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int int vehicle_button_x = rtl ? right - GetSpriteSize(SPR_PROFIT_LOT).width : left; int y = r.top; - uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), (uint)this->vehicles.size()); + uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->vehgroups.size()); for (uint i = this->vscroll->GetPosition(); i < max; ++i) { - const Vehicle *v = this->vehicles[i]; - StringID str; - SetDParam(0, v->GetDisplayProfitThisYear()); - SetDParam(1, v->GetDisplayProfitLastYear()); + const GUIVehicleGroup &vehgroup = this->vehgroups[i]; + + SetDParam(0, vehgroup.display_profit_this_year); + SetDParam(1, vehgroup.display_profit_last_year); + DrawString(text_left, text_right, y + line_height - FONT_HEIGHT_SMALL - WD_FRAMERECT_BOTTOM - 1, STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR); + + DrawVehicleProfitButton(vehgroup.age, vehgroup.display_profit_last_year, vehgroup.NumVehicles(), vehicle_button_x, y + FONT_HEIGHT_NORMAL + 3); + + const Vehicle *v = vehgroup.GetSingleVehicle(); DrawVehicleImage(v, image_left, image_right, y + FONT_HEIGHT_SMALL - 1, selected_vehicle, EIT_IN_LIST, 0); - DrawString(text_left, text_right, y + line_height - FONT_HEIGHT_SMALL - WD_FRAMERECT_BOTTOM - 1, STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR); if (!v->name.empty()) { /* The vehicle got a name so we will print it */ @@ -1407,6 +1446,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int if (show_orderlist) DrawSmallOrderList(v, orderlist_left, orderlist_right, y, v->cur_real_order_index); + StringID str; if (v->IsChainInDepot()) { str = STR_BLUE_COMMA; } else { @@ -1416,12 +1456,41 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int SetDParam(0, v->unitnumber); DrawString(left, right, y + 2, str); - DrawVehicleProfitButton(v, vehicle_button_x, y + FONT_HEIGHT_NORMAL + 3); - y += line_height; } } +void BaseVehicleListWindow::UpdateSortingFromGrouping() +{ + /* Set up sorting. Make the window-specific _sorting variable + * point to the correct global _sorting struct so we are freed + * from having conditionals during window operation */ + switch (this->vli.vtype) { + case VEH_TRAIN: this->sorting = &_sorting[this->grouping].train; break; + case VEH_ROAD: this->sorting = &_sorting[this->grouping].roadveh; break; + case VEH_SHIP: this->sorting = &_sorting[this->grouping].ship; break; + case VEH_AIRCRAFT: this->sorting = &_sorting[this->grouping].aircraft; break; + default: NOT_REACHED(); + } + this->vehgroups.SetSortFuncs(this->vehicle_group_none_sorter_funcs); + this->vehgroups.SetListing(*this->sorting); + this->vehgroups.ForceRebuild(); + this->vehgroups.NeedResort(); +} + +void BaseVehicleListWindow::UpdateVehicleGroupBy(GroupBy group_by) +{ + if (this->grouping != group_by) { + /* Save the old sorting option, so that if we change the grouping option back later on, + * UpdateSortingFromGrouping() will automatically restore the saved sorting option. */ + *this->sorting = this->vehgroups.GetListing(); + + this->grouping = group_by; + _grouping[this->vli.type][this->vli.vtype] = group_by; + this->UpdateSortingFromGrouping(); + } +} + /** * Window for the (old) vehicle listing. * @@ -1442,24 +1511,10 @@ private: public: VehicleListWindow(WindowDesc *desc, WindowNumber window_number) : BaseVehicleListWindow(desc, window_number) { - /* Set up sorting. Make the window-specific _sorting variable - * point to the correct global _sorting struct so we are freed - * from having conditionals during window operation */ - switch (this->vli.vtype) { - case VEH_TRAIN: this->sorting = &_sorting.train; break; - case VEH_ROAD: this->sorting = &_sorting.roadveh; break; - case VEH_SHIP: this->sorting = &_sorting.ship; break; - case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break; - default: NOT_REACHED(); - } - this->CreateNestedTree(); this->vscroll = this->GetScrollbar(WID_VL_SCROLLBAR); - this->vehicles.SetListing(*this->sorting); - this->vehicles.ForceRebuild(); - this->vehicles.NeedResort(); this->BuildVehicleList(); this->SortVehicleList(); @@ -1478,7 +1533,7 @@ public: ~VehicleListWindow() { - *this->sorting = this->vehicles.GetListing(); + *this->sorting = this->vehgroups.GetListing(); } void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override @@ -1533,26 +1588,26 @@ public: * and we should close the window when deleting the order. */ NOT_REACHED(); } - SetDParam(0, this->vscroll->GetCount()); + SetDParam(0, this->vehicles.size()); break; case VL_STANDARD: // Company Name SetDParam(0, STR_COMPANY_NAME); SetDParam(1, this->vli.index); - SetDParam(3, this->vscroll->GetCount()); + SetDParam(3, this->vehicles.size()); break; case VL_STATION_LIST: // Station/Waypoint Name SetDParam(0, Station::IsExpected(BaseStation::Get(this->vli.index)) ? STR_STATION_NAME : STR_WAYPOINT_NAME); SetDParam(1, this->vli.index); - SetDParam(3, this->vscroll->GetCount()); + SetDParam(3, this->vehicles.size()); break; case VL_DEPOT_LIST: SetDParam(0, STR_DEPOT_CAPTION); SetDParam(1, this->vli.vtype); SetDParam(2, this->vli.index); - SetDParam(3, this->vscroll->GetCount()); + SetDParam(3, this->vehicles.size()); break; default: NOT_REACHED(); } @@ -1566,7 +1621,7 @@ public: switch (widget) { case WID_VL_SORT_ORDER: /* draw arrow pointing up/down for ascending/descending sorting */ - this->DrawSortButtonState(widget, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP); + this->DrawSortButtonState(widget, this->vehgroups.IsDescSortOrder() ? SBS_DOWN : SBS_UP); break; case WID_VL_LIST: @@ -1602,7 +1657,7 @@ public: } /* Set text of sort by dropdown widget. */ - this->GetWidget(WID_VL_SORT_BY_PULLDOWN)->widget_data = this->vehicle_sorter_names[this->vehicles.SortType()]; + this->GetWidget(WID_VL_SORT_BY_PULLDOWN)->widget_data = this->vehicle_group_none_sorter_names[this->vehgroups.SortType()]; this->DrawWidgets(); } @@ -1611,20 +1666,22 @@ public: { switch (widget) { case WID_VL_SORT_ORDER: // Flip sorting method ascending/descending - this->vehicles.ToggleSortOrder(); + this->vehgroups.ToggleSortOrder(); this->SetDirty(); break; case WID_VL_SORT_BY_PULLDOWN:// Select sorting criteria dropdown menu - ShowDropDownMenu(this, this->vehicle_sorter_names, this->vehicles.SortType(), WID_VL_SORT_BY_PULLDOWN, 0, + ShowDropDownMenu(this, this->vehicle_group_none_sorter_names, this->vehgroups.SortType(), WID_VL_SORT_BY_PULLDOWN, 0, (this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : (1 << 10)); return; case WID_VL_LIST: { // Matrix to show vehicles uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_VL_LIST); - if (id_v >= this->vehicles.size()) return; // click out of list bound + if (id_v >= this->vehgroups.size()) return; // click out of list bound + + const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; + const Vehicle *v = vehgroup.GetSingleVehicle(); - const Vehicle *v = this->vehicles[id_v]; if (!VehicleClicked(v)) { if (_ctrl_pressed) { ShowCompanyGroupForVehicle(v); @@ -1655,7 +1712,7 @@ public: { switch (widget) { case WID_VL_SORT_BY_PULLDOWN: - this->vehicles.SetSortType(index); + this->vehgroups.SetSortType(index); break; case WID_VL_MANAGE_VEHICLES_DROPDOWN: assert(this->vehicles.size() != 0); @@ -1679,7 +1736,7 @@ public: void OnGameTick() override { - if (this->vehicles.NeedResort()) { + if (this->vehgroups.NeedResort()) { StationID station = (this->vli.type == VL_STATION_LIST) ? this->vli.index : INVALID_STATION; DEBUG(misc, 3, "Periodic resort %d list company %d at station %d", this->vli.vtype, this->owner, station); @@ -1703,15 +1760,15 @@ public: /* Needs to be done in command-scope, so everything stays valid */ this->vli.index = GB(data, 0, 20); this->window_number = this->vli.Pack(); - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); return; } if (data == 0) { /* This needs to be done in command-scope to enforce rebuilding before resorting invalid data */ - this->vehicles.ForceRebuild(); + this->vehgroups.ForceRebuild(); } else { - this->vehicles.ForceResort(); + this->vehgroups.ForceResort(); } } }; diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h index 89410b17ef..c63d5ec18f 100644 --- a/src/vehicle_gui_base.h +++ b/src/vehicle_gui_base.h @@ -10,19 +10,59 @@ #ifndef VEHICLE_GUI_BASE_H #define VEHICLE_GUI_BASE_H +#include "core/smallvec_type.hpp" +#include "date_type.h" +#include "economy_type.h" #include "sortlist_type.h" #include "vehiclelist.h" #include "window_gui.h" #include "widgets/dropdown_type.h" +#include + typedef GUIList GUIVehicleList; +struct GUIVehicleGroup { + VehicleList::const_iterator vehicles_begin; ///< Pointer to beginning element of this vehicle group. + VehicleList::const_iterator vehicles_end; ///< Pointer to past-the-end element of this vehicle group. + Money display_profit_this_year; ///< Total profit for the vehicle group this year. + Money display_profit_last_year; ///< Total profit for the vehicle group laste year. + Date age; ///< Age in days of oldest vehicle in the group. + + GUIVehicleGroup(VehicleList::const_iterator vehicles_begin, VehicleList::const_iterator vehicles_end, Money display_profit_this_year, Money display_profit_last_year, Date age) + : vehicles_begin(vehicles_begin), vehicles_end(vehicles_end), display_profit_this_year(display_profit_this_year), display_profit_last_year(display_profit_last_year), age(age) {} + + std::ptrdiff_t NumVehicles() const + { + return std::distance(vehicles_begin, vehicles_end); + } + const Vehicle *GetSingleVehicle() const + { + assert(NumVehicles() == 1); + return vehicles_begin[0]; + } +}; + +typedef GUIList GUIVehicleGroupList; + struct BaseVehicleListWindow : public Window { - GUIVehicleList vehicles; ///< The list of vehicles - Listing *sorting; ///< Pointer to the vehicle type related sorting. - byte unitnumber_digits; ///< The number of digits of the highest unit number + + enum GroupBy : byte { + GB_NONE, + + GB_END, + }; + + GroupBy grouping; ///< How we want to group the list. + VehicleList vehicles; ///< List of vehicles. This is the buffer for `vehgroups` to point into; if this is structurally modified, `vehgroups` must be rebuilt. + GUIVehicleGroupList vehgroups; ///< List of (groups of) vehicles. This stores iterators of `vehicles`, and should be rebuilt if `vehicles` is structurally changed. + Listing *sorting; ///< Pointer to the vehicle type related sorting. + byte unitnumber_digits; ///< The number of digits of the highest unit number. Scrollbar *vscroll; - VehicleListIdentifier vli; ///< Identifier of the vehicle list we want to currently show. + VehicleListIdentifier vli; ///< Identifier of the vehicle list we want to currently show. + + typedef GUIVehicleGroupList::SortFunction VehicleGroupSortFunction; + typedef GUIVehicleList::SortFunction VehicleIndividualSortFunction; enum ActionDropdownItem { ADI_REPLACE, @@ -33,19 +73,32 @@ struct BaseVehicleListWindow : public Window { }; static const StringID vehicle_depot_name[]; - static const StringID vehicle_sorter_names[]; - static GUIVehicleList::SortFunction * const vehicle_sorter_funcs[]; + static const StringID vehicle_group_by_names[]; + static const StringID vehicle_group_none_sorter_names[]; + static const StringID vehicle_group_shared_orders_sorter_names[]; + static VehicleGroupSortFunction * const vehicle_group_none_sorter_funcs[]; + static VehicleGroupSortFunction * const vehicle_group_shared_orders_sorter_funcs[]; - BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno) : Window(desc), vli(VehicleListIdentifier::UnPack(wno)) - { - this->vehicles.SetSortFuncs(this->vehicle_sorter_funcs); - } + BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno); + + void UpdateSortingFromGrouping(); void DrawVehicleListItems(VehicleID selected_vehicle, int line_height, const Rect &r) const; + void UpdateVehicleGroupBy(GroupBy group_by); void SortVehicleList(); void BuildVehicleList(); Dimension GetActionDropdownSize(bool show_autoreplace, bool show_group); DropDownList BuildActionDropdownList(bool show_autoreplace, bool show_group); + + const StringID *GetVehicleSorterNames() + { + return vehicle_group_none_sorter_names; + } + + VehicleGroupSortFunction * const *GetVehicleSorterFuncs() + { + return vehicle_group_none_sorter_funcs; + } }; uint GetVehicleListHeight(VehicleType type, uint divisor = 1); @@ -57,6 +110,7 @@ struct Sorting { Listing train; }; -extern Sorting _sorting; +extern BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END]; +extern Sorting _sorting[BaseVehicleListWindow::GB_END]; #endif /* VEHICLE_GUI_BASE_H */ From e59c400ca6e56605dd8660630246982f23a16b0a Mon Sep 17 00:00:00 2001 From: Bernard Teo Date: Fri, 11 Jan 2019 16:50:38 +0800 Subject: [PATCH 09/38] Feature: Option to group vehicle lists by shared orders This applies to all kinds of vehicle lists, as well as the "vehicle groups" window. --- src/group_gui.cpp | 71 ++++++++-- src/lang/english.txt | 9 ++ src/vehicle_gui.cpp | 251 +++++++++++++++++++++++++++++------ src/vehicle_gui_base.h | 19 ++- src/widgets/group_widget.h | 2 + src/widgets/vehicle_widget.h | 2 + 6 files changed, 298 insertions(+), 56 deletions(-) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 5323b65f28..c5d9ac5990 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -71,6 +71,11 @@ static const NWidgetPart _nested_group_widgets[] = { EndContainer(), /* right part */ NWidget(NWID_VERTICAL), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GL_GROUP_BY_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_STATION_VIEW_GROUP, STR_TOOLTIP_GROUP_ORDER), + NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GL_GROUP_BY_DROPDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_TOOLTIP_GROUP_ORDER), + NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetResize(1, 0), EndContainer(), + EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GL_SORT_BY_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GL_SORT_BY_DROPDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA), @@ -537,8 +542,11 @@ public: if (!IsDefaultGroupID(this->vli.index) && !IsAllGroupID(this->vli.index) && Group::Get(this->vli.index)->replace_protection) protect_sprite = SPR_GROUP_REPLACE_ON_TRAIN; this->GetWidget(WID_GL_REPLACE_PROTECTION)->widget_data = protect_sprite + this->vli.vtype; - /* Set text of sort by dropdown */ - this->GetWidget(WID_GL_SORT_BY_DROPDOWN)->widget_data = this->vehicle_group_none_sorter_names[this->vehgroups.SortType()]; + /* Set text of "group by" dropdown widget. */ + this->GetWidget(WID_GL_GROUP_BY_DROPDOWN)->widget_data = this->vehicle_group_by_names[this->grouping]; + + /* Set text of "sort by" dropdown widget. */ + this->GetWidget(WID_GL_SORT_BY_DROPDOWN)->widget_data = this->GetVehicleSorterNames()[this->vehgroups.SortType()]; this->DrawWidgets(); } @@ -650,6 +658,10 @@ public: this->SetDirty(); break; + case WID_GL_GROUP_BY_DROPDOWN: // Select grouping option dropdown menu + ShowDropDownMenu(this, this->vehicle_group_by_names, this->grouping, WID_GL_GROUP_BY_DROPDOWN, 0, 0); + return; + case WID_GL_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu ShowDropDownMenu(this, this->GetVehicleSorterNames(), this->vehgroups.SortType(), WID_GL_SORT_BY_DROPDOWN, 0, (this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : (1 << 10)); return; @@ -715,19 +727,35 @@ public: if (id_v >= this->vehgroups.size()) return; // click out of list bound const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; - const Vehicle * const v = vehgroup.GetSingleVehicle(); + switch (this->grouping) { + case GB_NONE: { + const Vehicle *v = vehgroup.GetSingleVehicle(); + if (VehicleClicked(v)) break; - this->vehicle_sel = v->index; + this->vehicle_sel = v->index; - if (_ctrl_pressed) { - this->SelectGroup(v->group_id); + if (_ctrl_pressed) { + this->SelectGroup(v->group_id); + } + + SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this); + SetMouseCursorVehicle(v, EIT_IN_LIST); + _cursor.vehchain = true; + + this->SetDirty(); + break; + } + + case GB_SHARED_ORDERS: + assert(vehgroup.NumVehicles() > 0); + /* No drag-and-drop support for shared order grouping; we immediately open the shared orders window */ + ShowVehicleListWindow(vehgroup.vehicles_begin[0]); + break; + + default: + NOT_REACHED(); } - SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this); - SetMouseCursorVehicle(v, EIT_IN_LIST); - _cursor.vehchain = true; - - this->SetDirty(); break; } @@ -842,10 +870,21 @@ public: if (id_v >= this->vehgroups.size()) return; // click out of list bound const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; - const Vehicle *v = vehgroup.GetSingleVehicle(); - if (!VehicleClicked(v) && vindex == v->index) { - ShowVehicleViewWindow(v); + switch (this->grouping) { + case GB_NONE: { + const Vehicle *v = vehgroup.GetSingleVehicle(); + if (!VehicleClicked(v) && vindex == v->index) { + ShowVehicleViewWindow(v); + } + break; + } + case GB_SHARED_ORDERS: + /* Currently no drag-and-drop support when grouped by shared orders. Modify this if we want to support some drag-drop behaviour for shared order list items. */ + NOT_REACHED(); + default: + NOT_REACHED(); } + break; } } } @@ -873,6 +912,10 @@ public: void OnDropdownSelect(int widget, int index) override { switch (widget) { + case WID_GL_GROUP_BY_DROPDOWN: + this->UpdateVehicleGroupBy(static_cast(index)); + break; + case WID_GL_SORT_BY_DROPDOWN: this->vehgroups.SetSortType(index); break; diff --git a/src/lang/english.txt b/src/lang/english.txt index 6d11d2d761..2b96f19314 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -315,6 +315,15 @@ STR_SORT_BY_CARGO_CAPACITY :Cargo capacity STR_SORT_BY_RANGE :Range STR_SORT_BY_POPULATION :Population STR_SORT_BY_RATING :Rating +STR_SORT_BY_NUM_VEHICLES :Number of vehicles +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Total profit last year +STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :Total profit this year +STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :Average profit last year +STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :Average profit this year + +# Group by options for vehicle list +STR_GROUP_BY_NONE :None +STR_GROUP_BY_SHARED_ORDERS :Shared orders # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pause game diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 135da393a2..a1b40ba921 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -58,6 +58,11 @@ static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleValueSorter; static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleLengthSorter; static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleTimeToLiveSorter; static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleTimetableDelaySorter; +static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupLengthSorter; +static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupTotalProfitThisYearSorter; +static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupTotalProfitLastYearSorter; +static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupAverageProfitThisYearSorter; +static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupAverageProfitLastYearSorter; /** Wrapper to convert a VehicleIndividualSortFunction to a VehicleGroupSortFunction */ template @@ -99,6 +104,29 @@ const StringID BaseVehicleListWindow::vehicle_group_none_sorter_names[] = { INVALID_STRING_ID }; +BaseVehicleListWindow::VehicleGroupSortFunction * const BaseVehicleListWindow::vehicle_group_shared_orders_sorter_funcs[] = { + &VehicleGroupLengthSorter, + &VehicleGroupTotalProfitThisYearSorter, + &VehicleGroupTotalProfitLastYearSorter, + &VehicleGroupAverageProfitThisYearSorter, + &VehicleGroupAverageProfitLastYearSorter, +}; + +const StringID BaseVehicleListWindow::vehicle_group_shared_orders_sorter_names[] = { + STR_SORT_BY_NUM_VEHICLES, + STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR, + STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR, + STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR, + STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR, + INVALID_STRING_ID +}; + +const StringID BaseVehicleListWindow::vehicle_group_by_names[] = { + STR_GROUP_BY_NONE, + STR_GROUP_BY_SHARED_ORDERS, + INVALID_STRING_ID +}; + const StringID BaseVehicleListWindow::vehicle_depot_name[] = { STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT, STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT, @@ -156,16 +184,50 @@ void BaseVehicleListWindow::BuildVehicleList() GenerateVehicleSortList(&this->vehicles, this->vli); - uint max_unitnumber = 0; - for (auto it = this->vehicles.begin(); it != this->vehicles.end(); ++it) { - this->vehgroups.emplace_back(it, it + 1, (*it)->GetDisplayProfitThisYear(), (*it)->GetDisplayProfitLastYear(), (*it)->age); + if (this->grouping == GB_NONE) { + uint max_unitnumber = 0; + for (auto it = this->vehicles.begin(); it != this->vehicles.end(); ++it) { + this->vehgroups.emplace_back(it, it + 1, (*it)->GetDisplayProfitThisYear(), (*it)->GetDisplayProfitLastYear(), (*it)->age); - max_unitnumber = max(max_unitnumber, (*it)->unitnumber); + max_unitnumber = max(max_unitnumber, (*it)->unitnumber); + } + this->unitnumber_digits = CountDigitsForAllocatingSpace(max_unitnumber); + } else { + /* Sort by the primary vehicle; we just want all vehicles that share the same orders to form a contiguous range. */ + std::stable_sort(this->vehicles.begin(), this->vehicles.end(), [](const Vehicle * const &u, const Vehicle * const &v) { + return u->FirstShared() < v->FirstShared(); + }); + + uint max_num_vehicles = 0; + + VehicleList::const_iterator begin = this->vehicles.begin(); + while (begin != this->vehicles.end()) { + VehicleList::const_iterator end = std::find_if_not(begin, this->vehicles.cend(), [first_shared = (*begin)->FirstShared()](const Vehicle * const &v) { + return v->FirstShared() == first_shared; + }); + + Money display_profit_this_year = 0; + Money display_profit_last_year = 0; + Date age = 0; + for (auto it = begin; it != end; ++it) { + const Vehicle * const v = (*it); + display_profit_this_year += v->GetDisplayProfitThisYear(); + display_profit_last_year += v->GetDisplayProfitLastYear(); + age = max(age, v->age); + } + + this->vehgroups.emplace_back(begin, end, display_profit_this_year, display_profit_last_year, age); + + max_num_vehicles = max(max_num_vehicles, static_cast(end - begin)); + + begin = end; + } + + this->unitnumber_digits = CountDigitsForAllocatingSpace(max_num_vehicles); } - this->unitnumber_digits = CountDigitsForAllocatingSpace(max_unitnumber); this->vehgroups.RebuildDone(); - this->vscroll->SetCount(this->vehgroups.size()); + this->vscroll->SetCount(static_cast(this->vehgroups.size())); } /** @@ -1114,6 +1176,36 @@ StringID GetCargoSubtypeText(const Vehicle *v) return STR_EMPTY; } +/** Sort vehicle groups by the number of vehicles in the group */ +static bool VehicleGroupLengthSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b) +{ + return a.NumVehicles() < b.NumVehicles(); +} + +/** Sort vehicle groups by the total profit this year */ +static bool VehicleGroupTotalProfitThisYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b) +{ + return a.display_profit_this_year < b.display_profit_this_year; +} + +/** Sort vehicle groups by the total profit last year */ +static bool VehicleGroupTotalProfitLastYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b) +{ + return a.display_profit_last_year < b.display_profit_last_year; +} + +/** Sort vehicle groups by the average profit this year */ +static bool VehicleGroupAverageProfitThisYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b) +{ + return a.display_profit_this_year * static_cast(b.NumVehicles()) < b.display_profit_this_year * static_cast(a.NumVehicles()); +} + +/** Sort vehicle groups by the average profit last year */ +static bool VehicleGroupAverageProfitLastYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b) +{ + return a.display_profit_last_year * static_cast(b.NumVehicles()) < b.display_profit_last_year * static_cast(a.NumVehicles()); +} + /** Sort vehicles by their number */ static bool VehicleNumberSorter(const Vehicle * const &a, const Vehicle * const &b) { @@ -1289,6 +1381,12 @@ static const NWidgetPart _nested_vehicle_list[] = { NWidget(WWT_STICKYBOX, COLOUR_GREY), EndContainer(), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_VL_GROUP_ORDER), SetMinimalSize(81, 12), SetFill(0, 1), SetDataTip(STR_STATION_VIEW_GROUP, STR_TOOLTIP_GROUP_ORDER), + NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_VL_GROUP_BY_PULLDOWN), SetMinimalSize(167, 12), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_GROUP_ORDER), + NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetFill(1, 1), SetResize(1, 0), EndContainer(), + EndContainer(), + NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VL_SORT_ORDER), SetMinimalSize(81, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_VL_SORT_BY_PULLDOWN), SetMinimalSize(167, 12), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA), @@ -1352,6 +1450,25 @@ static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y, Veh } while (oid != start); } +/** Draw small order list in the vehicle GUI, but without the little black arrow. This is used for shared order groups. */ +static void DrawSmallOrderList(const Order *order, int left, int right, int y) +{ + bool rtl = _current_text_dir == TD_RTL; + int l_offset = rtl ? 0 : ScaleGUITrad(6); + int r_offset = rtl ? ScaleGUITrad(6) : 0; + int i = 0; + while (order != nullptr) { + if (order->IsType(OT_GOTO_STATION)) { + SetDParam(0, order->GetDestination()); + DrawString(left + l_offset, right - r_offset, y, STR_TINY_BLACK_STATION); + + y += FONT_HEIGHT_SMALL; + if (++i == 4) break; + } + order = order->next; + } +} + /** * Draws an image of a vehicle chain * @param v Front vehicle @@ -1419,7 +1536,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int int vehicle_button_x = rtl ? right - GetSpriteSize(SPR_PROFIT_LOT).width : left; int y = r.top; - uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->vehgroups.size()); + uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), static_cast(this->vehgroups.size())); for (uint i = this->vscroll->GetPosition(); i < max; ++i) { const GUIVehicleGroup &vehgroup = this->vehgroups[i]; @@ -1430,32 +1547,55 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int DrawVehicleProfitButton(vehgroup.age, vehgroup.display_profit_last_year, vehgroup.NumVehicles(), vehicle_button_x, y + FONT_HEIGHT_NORMAL + 3); - const Vehicle *v = vehgroup.GetSingleVehicle(); + switch (this->grouping) { + case GB_NONE: { + const Vehicle *v = vehgroup.GetSingleVehicle(); - DrawVehicleImage(v, image_left, image_right, y + FONT_HEIGHT_SMALL - 1, selected_vehicle, EIT_IN_LIST, 0); + DrawVehicleImage(v, image_left, image_right, y + FONT_HEIGHT_SMALL - 1, selected_vehicle, EIT_IN_LIST, 0); - if (!v->name.empty()) { - /* The vehicle got a name so we will print it */ - SetDParam(0, v->index); - DrawString(text_left, text_right, y, STR_TINY_BLACK_VEHICLE); - } else if (v->group_id != DEFAULT_GROUP) { - /* The vehicle has no name, but is member of a group, so print group name */ - SetDParam(0, v->group_id); - DrawString(text_left, text_right, y, STR_TINY_GROUP, TC_BLACK); + if (!v->name.empty()) { + /* The vehicle got a name so we will print it */ + SetDParam(0, v->index); + DrawString(text_left, text_right, y, STR_TINY_BLACK_VEHICLE); + } else if (v->group_id != DEFAULT_GROUP) { + /* The vehicle has no name, but is member of a group, so print group name */ + SetDParam(0, v->group_id); + DrawString(text_left, text_right, y, STR_TINY_GROUP, TC_BLACK); + } + + if (show_orderlist) DrawSmallOrderList(v, orderlist_left, orderlist_right, y, v->cur_real_order_index); + + StringID str; + if (v->IsChainInDepot()) { + str = STR_BLUE_COMMA; + } else { + str = (v->age > v->max_age - DAYS_IN_LEAP_YEAR) ? STR_RED_COMMA : STR_BLACK_COMMA; + } + + SetDParam(0, v->unitnumber); + DrawString(left, right, y + 2, str); + break; + } + + case GB_SHARED_ORDERS: + + assert(vehgroup.NumVehicles() > 0); + + for (int i = 0; i < static_cast(vehgroup.NumVehicles()); ++i) { + if (image_left + 8 * i >= image_right) break; // Break if there is no more space to draw any more vehicles anyway. + DrawVehicleImage(vehgroup.vehicles_begin[i], image_left + 8 * i, image_right, y + FONT_HEIGHT_SMALL - 1, selected_vehicle, EIT_IN_LIST, 0); + } + + if (show_orderlist) DrawSmallOrderList((vehgroup.vehicles_begin[0])->GetFirstOrder(), orderlist_left, orderlist_right, y); + + SetDParam(0, vehgroup.NumVehicles()); + DrawString(left, right, y + 2, STR_BLACK_COMMA); + break; + + default: + NOT_REACHED(); } - if (show_orderlist) DrawSmallOrderList(v, orderlist_left, orderlist_right, y, v->cur_real_order_index); - - StringID str; - if (v->IsChainInDepot()) { - str = STR_BLUE_COMMA; - } else { - str = (v->age > v->max_age - DAYS_IN_LEAP_YEAR) ? STR_RED_COMMA : STR_BLACK_COMMA; - } - - SetDParam(0, v->unitnumber); - DrawString(left, right, y + 2, str); - y += line_height; } } @@ -1472,7 +1612,7 @@ void BaseVehicleListWindow::UpdateSortingFromGrouping() case VEH_AIRCRAFT: this->sorting = &_sorting[this->grouping].aircraft; break; default: NOT_REACHED(); } - this->vehgroups.SetSortFuncs(this->vehicle_group_none_sorter_funcs); + this->vehgroups.SetSortFuncs(this->GetVehicleSorterFuncs()); this->vehgroups.SetListing(*this->sorting); this->vehgroups.ForceRebuild(); this->vehgroups.NeedResort(); @@ -1523,6 +1663,10 @@ public: if (this->vli.type == VL_SHARED_ORDERS) { this->GetWidget(WID_VL_CAPTION)->widget_data = STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION; + /* If we are in the shared orders window, then disable the group-by dropdown menu. + * Remove this when the group-by dropdown menu has another option apart from grouping by shared orders. */ + this->SetWidgetDisabledState(WID_VL_GROUP_ORDER, true); + this->SetWidgetDisabledState(WID_VL_GROUP_BY_PULLDOWN, true); } else { this->GetWidget(WID_VL_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vli.vtype; } @@ -1656,8 +1800,11 @@ public: WIDGET_LIST_END); } + /* Set text of group by dropdown widget. */ + this->GetWidget(WID_VL_GROUP_BY_PULLDOWN)->widget_data = this->vehicle_group_by_names[this->grouping]; + /* Set text of sort by dropdown widget. */ - this->GetWidget(WID_VL_SORT_BY_PULLDOWN)->widget_data = this->vehicle_group_none_sorter_names[this->vehgroups.SortType()]; + this->GetWidget(WID_VL_SORT_BY_PULLDOWN)->widget_data = this->GetVehicleSorterNames()[this->vehgroups.SortType()]; this->DrawWidgets(); } @@ -1670,8 +1817,12 @@ public: this->SetDirty(); break; - case WID_VL_SORT_BY_PULLDOWN:// Select sorting criteria dropdown menu - ShowDropDownMenu(this, this->vehicle_group_none_sorter_names, this->vehgroups.SortType(), WID_VL_SORT_BY_PULLDOWN, 0, + case WID_VL_GROUP_BY_PULLDOWN: // Select sorting criteria dropdown menu + ShowDropDownMenu(this, this->vehicle_group_by_names, this->grouping, WID_VL_GROUP_BY_PULLDOWN, 0, 0); + return; + + case WID_VL_SORT_BY_PULLDOWN: // Select sorting criteria dropdown menu + ShowDropDownMenu(this, this->GetVehicleSorterNames(), this->vehgroups.SortType(), WID_VL_SORT_BY_PULLDOWN, 0, (this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : (1 << 10)); return; @@ -1680,15 +1831,29 @@ public: if (id_v >= this->vehgroups.size()) return; // click out of list bound const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; - const Vehicle *v = vehgroup.GetSingleVehicle(); - - if (!VehicleClicked(v)) { - if (_ctrl_pressed) { - ShowCompanyGroupForVehicle(v); - } else { - ShowVehicleViewWindow(v); + switch (this->grouping) { + case GB_NONE: { + const Vehicle *v = vehgroup.GetSingleVehicle(); + if (!VehicleClicked(v)) { + if (_ctrl_pressed) { + ShowCompanyGroupForVehicle(v); + } else { + ShowVehicleViewWindow(v); + } + } + break; } + + case GB_SHARED_ORDERS: + assert(vehgroup.NumVehicles() > 0); + /* We do not support VehicleClicked() here since the contextual action may only make sense for individual vehicles */ + + ShowVehicleListWindow(vehgroup.vehicles_begin[0]); + break; + + default: NOT_REACHED(); } + break; } @@ -1711,9 +1876,14 @@ public: void OnDropdownSelect(int widget, int index) override { switch (widget) { + case WID_VL_GROUP_BY_PULLDOWN: + this->UpdateVehicleGroupBy(static_cast(index)); + break; + case WID_VL_SORT_BY_PULLDOWN: this->vehgroups.SetSortType(index); break; + case WID_VL_MANAGE_VEHICLES_DROPDOWN: assert(this->vehicles.size() != 0); @@ -1729,6 +1899,7 @@ public: default: NOT_REACHED(); } break; + default: NOT_REACHED(); } this->SetDirty(); diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h index c63d5ec18f..f89b81ffbe 100644 --- a/src/vehicle_gui_base.h +++ b/src/vehicle_gui_base.h @@ -49,6 +49,7 @@ struct BaseVehicleListWindow : public Window { enum GroupBy : byte { GB_NONE, + GB_SHARED_ORDERS, GB_END, }; @@ -92,12 +93,26 @@ struct BaseVehicleListWindow : public Window { const StringID *GetVehicleSorterNames() { - return vehicle_group_none_sorter_names; + switch (this->grouping) { + case GB_NONE: + return vehicle_group_none_sorter_names; + case GB_SHARED_ORDERS: + return vehicle_group_shared_orders_sorter_names; + default: + NOT_REACHED(); + } } VehicleGroupSortFunction * const *GetVehicleSorterFuncs() { - return vehicle_group_none_sorter_funcs; + switch (this->grouping) { + case GB_NONE: + return vehicle_group_none_sorter_funcs; + case GB_SHARED_ORDERS: + return vehicle_group_shared_orders_sorter_funcs; + default: + NOT_REACHED(); + } } }; diff --git a/src/widgets/group_widget.h b/src/widgets/group_widget.h index beca5a3a65..03ac61a48e 100644 --- a/src/widgets/group_widget.h +++ b/src/widgets/group_widget.h @@ -13,6 +13,8 @@ /** Widgets of the #VehicleGroupWindow class. */ enum GroupListWidgets { WID_GL_CAPTION, ///< Caption of the window. + WID_GL_GROUP_BY_ORDER, ///< Group order. + WID_GL_GROUP_BY_DROPDOWN, ///< Group by dropdown list. WID_GL_SORT_BY_ORDER, ///< Sort order. WID_GL_SORT_BY_DROPDOWN, ///< Sort by dropdown list. WID_GL_LIST_VEHICLE, ///< List of the vehicles. diff --git a/src/widgets/vehicle_widget.h b/src/widgets/vehicle_widget.h index 5ecb8dffea..0ee1b2624f 100644 --- a/src/widgets/vehicle_widget.h +++ b/src/widgets/vehicle_widget.h @@ -61,6 +61,8 @@ enum VehicleDetailsWidgets { /** Widgets of the #VehicleListWindow class. */ enum VehicleListWidgets { WID_VL_CAPTION, ///< Caption of window. + WID_VL_GROUP_ORDER, ///< Group order. + WID_VL_GROUP_BY_PULLDOWN, ///< Group by dropdown list. WID_VL_SORT_ORDER, ///< Sort order. WID_VL_SORT_BY_PULLDOWN, ///< Sort by dropdown list. WID_VL_LIST, ///< List of the vehicles. From 61fb1cac546716fed45e1250be3ed26bffb312ef Mon Sep 17 00:00:00 2001 From: Bernard Teo Date: Fri, 11 Jan 2019 16:52:49 +0800 Subject: [PATCH 10/38] Cleanup: Move EndContainer() for empty WWT_PANEL to the same line --- src/vehicle_gui.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index a1b40ba921..2cc9f9d749 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1390,8 +1390,7 @@ static const NWidgetPart _nested_vehicle_list[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VL_SORT_ORDER), SetMinimalSize(81, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_VL_SORT_BY_PULLDOWN), SetMinimalSize(167, 12), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA), - NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetFill(1, 1), SetResize(1, 0), - EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetFill(1, 1), SetResize(1, 0), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL), From a5047b7566ffdc430e6753a76d1381959275f259 Mon Sep 17 00:00:00 2001 From: Bernard Teo Date: Fri, 11 Jan 2019 16:55:32 +0800 Subject: [PATCH 11/38] Cleanup: Use range-based for-loop in group_gui.cpp --- src/group_gui.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index c5d9ac5990..f1b1d4ef8e 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -565,11 +565,9 @@ public: case WID_GL_INFO: { Money this_year = 0; Money last_year = 0; - uint32 occupancy = 0; - size_t vehicle_count = this->vehicles.size(); + uint64 occupancy = 0; - for (uint i = 0; i < vehicle_count; i++) { - const Vehicle *v = this->vehicles[i]; + for (const Vehicle * const v : this->vehicles) { assert(v->owner == this->owner); this_year += v->GetDisplayProfitThisYear(); @@ -592,6 +590,7 @@ public: y += FONT_HEIGHT_NORMAL; DrawString(left, right, y, STR_GROUP_OCCUPANCY, TC_BLACK); + const size_t vehicle_count = this->vehicles.size(); if (vehicle_count > 0) { SetDParam(0, occupancy / vehicle_count); DrawString(left, right, y, STR_GROUP_OCCUPANCY_VALUE, TC_BLACK, SA_RIGHT); From 4af1acfe926db39965f3cff2a41ecf0da32b4137 Mon Sep 17 00:00:00 2001 From: Bernard Teo Date: Thu, 17 Dec 2020 20:27:29 +0800 Subject: [PATCH 12/38] Feature: Drag-and-drop vehicles in group GUI for shared order groups --- src/group_gui.cpp | 61 ++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index f1b1d4ef8e..1210087957 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -726,34 +726,43 @@ public: if (id_v >= this->vehgroups.size()) return; // click out of list bound const GUIVehicleGroup &vehgroup = this->vehgroups[id_v]; + + const Vehicle *v = nullptr; + switch (this->grouping) { case GB_NONE: { - const Vehicle *v = vehgroup.GetSingleVehicle(); - if (VehicleClicked(v)) break; - - this->vehicle_sel = v->index; - - if (_ctrl_pressed) { - this->SelectGroup(v->group_id); - } - - SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this); - SetMouseCursorVehicle(v, EIT_IN_LIST); - _cursor.vehchain = true; - - this->SetDirty(); + const Vehicle *v2 = vehgroup.GetSingleVehicle(); + if (VehicleClicked(v2)) break; + v = v2; break; } - case GB_SHARED_ORDERS: + case GB_SHARED_ORDERS: { assert(vehgroup.NumVehicles() > 0); - /* No drag-and-drop support for shared order grouping; we immediately open the shared orders window */ - ShowVehicleListWindow(vehgroup.vehicles_begin[0]); + v = vehgroup.vehicles_begin[0]; + /* + No VehicleClicked(v) support for now, because don't want + to enable any contextual actions except perhaps clicking/ctrl-clicking to clone orders. + */ break; + } default: NOT_REACHED(); } + if (v) { + this->vehicle_sel = v->index; + + if (_ctrl_pressed) { + this->SelectGroup(v->group_id); + } + + SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this); + SetMouseCursorVehicle(v, EIT_IN_LIST); + _cursor.vehchain = true; + + this->SetDirty(); + } break; } @@ -838,7 +847,7 @@ public: { switch (widget) { case WID_GL_DEFAULT_VEHICLES: // Ungrouped vehicles - DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel | (_ctrl_pressed ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE)); + DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel | (_ctrl_pressed || this->grouping == GB_SHARED_ORDERS ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE)); this->vehicle_sel = INVALID_VEHICLE; this->group_over = INVALID_GROUP; @@ -855,7 +864,7 @@ public: uint id_g = this->group_sb->GetScrolledRowFromWidget(pt.y, this, WID_GL_LIST_GROUP, 0, this->tiny_step_height); GroupID new_g = id_g >= this->groups.size() ? NEW_GROUP : this->groups[id_g]->index; - DoCommandP(0, new_g, vindex | (_ctrl_pressed ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE), new_g == NEW_GROUP ? CcAddVehicleNewGroup : nullptr); + DoCommandP(0, new_g, vindex | (_ctrl_pressed || this->grouping == GB_SHARED_ORDERS ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE), new_g == NEW_GROUP ? CcAddVehicleNewGroup : nullptr); break; } @@ -877,9 +886,17 @@ public: } break; } - case GB_SHARED_ORDERS: - /* Currently no drag-and-drop support when grouped by shared orders. Modify this if we want to support some drag-drop behaviour for shared order list items. */ - NOT_REACHED(); + + case GB_SHARED_ORDERS: { + const Vehicle *v = vehgroup.vehicles_begin[0]; + /* We do not support VehicleClicked() here since the contextual action may only make sense for individual vehicles */ + + if (vindex == v->index) { + ShowVehicleListWindow(v); + } + break; + } + default: NOT_REACHED(); } From 981c5402018bbe8f8d4593faf0fbbf712c34799d Mon Sep 17 00:00:00 2001 From: Bernard Teo Date: Sun, 20 Dec 2020 01:19:28 +0800 Subject: [PATCH 13/38] Change: Place "Group by" above "Sort by" in station window for consistency --- src/station_gui.cpp | 8 ++++---- src/widgets/station_widget.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 66a4605ea8..3cd4a42916 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -792,14 +792,14 @@ static const NWidgetPart _nested_station_view_widgets[] = { NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SORT_ORDER), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), - NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_SV_SORT_BY), SetMinimalSize(168, 12), SetResize(1, 0), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA), - EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_GROUP), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_STATION_VIEW_GROUP, 0x0), NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_SV_GROUP_BY), SetMinimalSize(168, 12), SetResize(1, 0), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_GROUP_ORDER), EndContainer(), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SORT_ORDER), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), + NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_SV_SORT_BY), SetMinimalSize(168, 12), SetResize(1, 0), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA), + EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PANEL, COLOUR_GREY, WID_SV_WAITING), SetMinimalSize(237, 44), SetResize(1, 10), SetScrollbar(WID_SV_SCROLLBAR), EndContainer(), NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_SV_SCROLLBAR), diff --git a/src/widgets/station_widget.h b/src/widgets/station_widget.h index 8ab89bbf31..491505e430 100644 --- a/src/widgets/station_widget.h +++ b/src/widgets/station_widget.h @@ -13,10 +13,10 @@ /** Widgets of the #StationViewWindow class. */ enum StationViewWidgets { WID_SV_CAPTION, ///< Caption of the window. - WID_SV_SORT_ORDER, ///< 'Sort order' button - WID_SV_SORT_BY, ///< 'Sort by' button WID_SV_GROUP, ///< label for "group by" WID_SV_GROUP_BY, ///< 'Group by' button + WID_SV_SORT_ORDER, ///< 'Sort order' button + WID_SV_SORT_BY, ///< 'Sort by' button WID_SV_WAITING, ///< List of waiting cargo. WID_SV_SCROLLBAR, ///< Scrollbar. WID_SV_ACCEPT_RATING_LIST, ///< List of accepted cargoes / rating of cargoes. From 6c3a5b5b17de97be292fc9442f6bd693973114ee Mon Sep 17 00:00:00 2001 From: Matt Kimber Date: Mon, 21 Dec 2020 22:46:38 +0000 Subject: [PATCH 14/38] Fix c02ef3e4: [NewGRF] Variable 0x44 was always HZB_TOWN_EDGE for road stops. (#8400) --- src/newgrf_roadtype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/newgrf_roadtype.cpp b/src/newgrf_roadtype.cpp index c49faa59f1..3f6150cd36 100644 --- a/src/newgrf_roadtype.cpp +++ b/src/newgrf_roadtype.cpp @@ -45,7 +45,7 @@ const Town *t = nullptr; if (IsRoadDepotTile(this->tile)) { t = Depot::GetByTile(this->tile)->town; - } else if (IsTileType(this->tile, MP_ROAD)) { + } else { t = ClosestTownFromTile(this->tile, UINT_MAX); } return t != nullptr ? GetTownRadiusGroup(t, this->tile) : HZB_TOWN_EDGE; From d8c8f4e72d8a8f9306bc4e6a86c012dee740c8ca Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 22 Dec 2020 10:44:07 +0100 Subject: [PATCH 15/38] Fix: next 67 savegame versions are used in PatchPacks; skip them (#8411) Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions slightly higher than ours. Of course, as time went by, this caught up with us, and we are now almost pushing a new version that would conflict with them. To avoid users creating unneeded issues about "why can I not load my savegame", lets be ahead of the curve and flat-out refuse to load them. Version-wise, this is totally fine. We have ~32k versions to go before we run out (0x8000 is masked by JGRPP; we should avoid using that). At the rate we bump savegames, this is not going to happen in any sane reality. --- src/lang/english.txt | 1 + src/saveload/saveload.cpp | 1 + src/saveload/saveload.h | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/src/lang/english.txt b/src/lang/english.txt index 2b96f19314..7d7af8d853 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -4254,6 +4254,7 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Savegame is mad STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :File not readable STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :File not writeable STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Data integrity check failed +STR_GAME_SAVELOAD_ERROR_PATCHPACK :Savegame is made with a modified version STR_GAME_SAVELOAD_NOT_AVAILABLE : STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Game was saved in version without tram support. All trams have been removed diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 5288f9047d..4f3b7e9914 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -2689,6 +2689,7 @@ static SaveOrLoadResult DoLoad(LoadFilter *reader, bool load_check) /* Is the version higher than the current? */ if (_sl_version > SAVEGAME_VERSION) SlError(STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME); + if (_sl_version >= SLV_START_PATCHPACKS && _sl_version <= SLV_END_PATCHPACKS) SlError(STR_GAME_SAVELOAD_ERROR_PATCHPACK); break; } diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 3581a55947..7fa91a5095 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -304,6 +304,22 @@ enum SaveLoadVersion : uint16 { SLV_ENDING_YEAR, ///< 218 PR#7747 v1.10 Configurable ending year. SLV_REMOVE_TOWN_CARGO_CACHE, ///< 219 PR#8258 Remove town cargo acceptance and production caches. + /* Patchpacks for a while considered it a good idea to jump a few versions + * above our version for their savegames. But as time continued, this gap + * has been closing, up to the point we would start to reuse versions from + * their patchpacks. This is not a problem from our perspective: the + * savegame will simply fail to load because they all contain chunks we + * cannot digest. But, this gives for ugly errors. As we have plenty of + * versions anyway, we simply skip the versions we know belong to + * patchpacks. This way we can present the user with a clean error + * indicate he is loading a savegame from a patchpack. + * For future patchpack creators: please follow a system like JGRPP, where + * the version is masked with 0x8000, and the true version is stored in + * its own chunk with feature toggles. + */ + SLV_START_PATCHPACKS, ///< 220 First known patchpack to use a version just above ours. + SLV_END_PATCHPACKS = 286, ///< 286 Last known patchpack to use a version just above ours. + SL_MAX_VERSION, ///< Highest possible saveload version }; From 547e5fdb65ae1c7909ef602a58085e5146782b42 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 22 Dec 2020 13:12:47 +0100 Subject: [PATCH 16/38] Fix 86e08aa: STR_CARGO_PLURAL_CANDY with cases was not renamed (#8412) --- src/lang/belarusian.txt | 10 +++++----- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 4 ++-- src/lang/estonian.txt | 2 +- src/lang/gaelic.txt | 6 +++--- src/lang/greek.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/latin.txt | 6 +++--- src/lang/lithuanian.txt | 12 ++++++------ src/lang/polish.txt | 12 ++++++------ src/lang/russian.txt | 4 ++-- src/lang/serbian.txt | 6 +++--- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 4 ++-- src/lang/ukrainian.txt | 4 ++-- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index e295b60282..9ded7fd19e 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -167,11 +167,11 @@ STR_CARGO_PLURAL_TOYS.acc :цацкі STR_CARGO_PLURAL_TOYS.abl :цацкамі STR_CARGO_PLURAL_TOYS.pre :цацках STR_CARGO_PLURAL_SWEETS :{G=p}Цукеркi -STR_CARGO_PLURAL_CANDY.gen :цукерак -STR_CARGO_PLURAL_CANDY.dat :цукеркам -STR_CARGO_PLURAL_CANDY.acc :цукеркі -STR_CARGO_PLURAL_CANDY.abl :цукеркамі -STR_CARGO_PLURAL_CANDY.pre :цукерках +STR_CARGO_PLURAL_SWEETS.gen :цукерак +STR_CARGO_PLURAL_SWEETS.dat :цукеркам +STR_CARGO_PLURAL_SWEETS.acc :цукеркі +STR_CARGO_PLURAL_SWEETS.abl :цукеркамі +STR_CARGO_PLURAL_SWEETS.pre :цукерках STR_CARGO_PLURAL_COLA :{G=f}Кола STR_CARGO_PLURAL_COLA.gen :колы STR_CARGO_PLURAL_COLA.dat :коле diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 3566934e5b..55e0b6b912 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -74,7 +74,7 @@ STR_CARGO_PLURAL_SUGAR.gen :šećera STR_CARGO_PLURAL_TOYS :Igračke STR_CARGO_PLURAL_TOYS.gen :igračaka STR_CARGO_PLURAL_SWEETS :Slatkiši -STR_CARGO_PLURAL_CANDY.gen :slatkiša +STR_CARGO_PLURAL_SWEETS.gen :slatkiša STR_CARGO_PLURAL_COLA :Cola STR_CARGO_PLURAL_COLA.gen :cole STR_CARGO_PLURAL_CANDYFLOSS :Šećerna vuna diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0d0b8772d9..c76e07a8a4 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -103,8 +103,8 @@ STR_CARGO_PLURAL_TOYS :hračky STR_CARGO_PLURAL_TOYS.gen :hraček STR_CARGO_PLURAL_TOYS.big :Hračky STR_CARGO_PLURAL_SWEETS :bonbony -STR_CARGO_PLURAL_CANDY.gen :bonbonů -STR_CARGO_PLURAL_CANDY.big :Bonbony +STR_CARGO_PLURAL_SWEETS.gen :bonbonů +STR_CARGO_PLURAL_SWEETS.big :Bonbony STR_CARGO_PLURAL_COLA :kola STR_CARGO_PLURAL_COLA.gen :koly STR_CARGO_PLURAL_COLA.acc :kolu diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index eab1f86e34..c390fd6d66 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -73,7 +73,7 @@ STR_CARGO_PLURAL_SUGAR.g :Suhkru STR_CARGO_PLURAL_TOYS :Mänguasjad STR_CARGO_PLURAL_TOYS.g :Mänguasjade STR_CARGO_PLURAL_SWEETS :Maiustused -STR_CARGO_PLURAL_CANDY.g :Maiustuste +STR_CARGO_PLURAL_SWEETS.g :Maiustuste STR_CARGO_PLURAL_COLA :Koola STR_CARGO_PLURAL_COLA.g :Koola STR_CARGO_PLURAL_CANDYFLOSS :Suhkruvatt diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 852ebee8fa..d0bb4435a4 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -120,9 +120,9 @@ STR_CARGO_PLURAL_TOYS.nom :Dèideagan STR_CARGO_PLURAL_TOYS.gen :Dhèideagan STR_CARGO_PLURAL_TOYS.dat :Dèideagan STR_CARGO_PLURAL_SWEETS :{G=m}Mìlseanan -STR_CARGO_PLURAL_CANDY.nom :Mìlseanan -STR_CARGO_PLURAL_CANDY.gen :Mhìlseanan -STR_CARGO_PLURAL_CANDY.dat :Mìlseanan +STR_CARGO_PLURAL_SWEETS.nom :Mìlseanan +STR_CARGO_PLURAL_SWEETS.gen :Mhìlseanan +STR_CARGO_PLURAL_SWEETS.dat :Mìlseanan STR_CARGO_PLURAL_COLA :{G=m}Cola STR_CARGO_PLURAL_COLA.nom :Cola STR_CARGO_PLURAL_COLA.gen :Cola diff --git a/src/lang/greek.txt b/src/lang/greek.txt index c09aa806fe..3ca894c0a9 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -73,7 +73,7 @@ STR_CARGO_PLURAL_SUGAR.geniki :Ζάχαρης STR_CARGO_PLURAL_TOYS :{G=n}Παιχνίδια STR_CARGO_PLURAL_TOYS.geniki :Παιχνιδιών STR_CARGO_PLURAL_SWEETS :{G=n}Γλυκίσματα -STR_CARGO_PLURAL_CANDY.geniki :Γλυκισμάτων +STR_CARGO_PLURAL_SWEETS.geniki :Γλυκισμάτων STR_CARGO_PLURAL_COLA :{G=f}Κόλα STR_CARGO_PLURAL_COLA.geniki :Κόλας STR_CARGO_PLURAL_CANDYFLOSS :{G=n}Μαλλιά της γριάς diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index c3ed93acc1..4fc1c45cde 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -73,7 +73,7 @@ STR_CARGO_PLURAL_SUGAR.t :cukrot STR_CARGO_PLURAL_TOYS :Játék STR_CARGO_PLURAL_TOYS.t :játékot STR_CARGO_PLURAL_SWEETS :Cukorka -STR_CARGO_PLURAL_CANDY.t :cukorkát +STR_CARGO_PLURAL_SWEETS.t :cukorkát STR_CARGO_PLURAL_COLA :Kóla STR_CARGO_PLURAL_COLA.t :kólát STR_CARGO_PLURAL_CANDYFLOSS :Vattacukor diff --git a/src/lang/latin.txt b/src/lang/latin.txt index a61630ede3..05f0b6abac 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -120,9 +120,9 @@ STR_CARGO_PLURAL_TOYS.gen :ludicrorum STR_CARGO_PLURAL_TOYS.acc :Ludicra STR_CARGO_PLURAL_TOYS.dat :Ludicris STR_CARGO_PLURAL_SWEETS :{G=np}Bellaria -STR_CARGO_PLURAL_CANDY.gen :bellariorum -STR_CARGO_PLURAL_CANDY.acc :Bellaria -STR_CARGO_PLURAL_CANDY.dat :Bellariis +STR_CARGO_PLURAL_SWEETS.gen :bellariorum +STR_CARGO_PLURAL_SWEETS.acc :Bellaria +STR_CARGO_PLURAL_SWEETS.dat :Bellariis STR_CARGO_PLURAL_COLA :{G=f}Cola STR_CARGO_PLURAL_COLA.gen :colae STR_CARGO_PLURAL_COLA.acc :Colam diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 8e78fb11d4..49219c9c21 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -195,12 +195,12 @@ STR_CARGO_PLURAL_TOYS.ka :žaislus STR_CARGO_PLURAL_TOYS.kuo :žaislais STR_CARGO_PLURAL_TOYS.kur :žaisluose STR_CARGO_PLURAL_SWEETS :Saldumynai -STR_CARGO_PLURAL_CANDY.kas :saldumynai -STR_CARGO_PLURAL_CANDY.ko :saldumynų -STR_CARGO_PLURAL_CANDY.kam :saldumynams -STR_CARGO_PLURAL_CANDY.ka :saldumynus -STR_CARGO_PLURAL_CANDY.kuo :saldumynais -STR_CARGO_PLURAL_CANDY.kur :saldumynuose +STR_CARGO_PLURAL_SWEETS.kas :saldumynai +STR_CARGO_PLURAL_SWEETS.ko :saldumynų +STR_CARGO_PLURAL_SWEETS.kam :saldumynams +STR_CARGO_PLURAL_SWEETS.ka :saldumynus +STR_CARGO_PLURAL_SWEETS.kuo :saldumynais +STR_CARGO_PLURAL_SWEETS.kur :saldumynuose STR_CARGO_PLURAL_COLA :Kola STR_CARGO_PLURAL_COLA.kas :kola STR_CARGO_PLURAL_COLA.ko :kolos diff --git a/src/lang/polish.txt b/src/lang/polish.txt index b7759eb719..d52d906291 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -189,12 +189,12 @@ STR_CARGO_PLURAL_TOYS.n :zabawkami STR_CARGO_PLURAL_TOYS.m :zabawkach STR_CARGO_PLURAL_TOYS.w :zabawki STR_CARGO_PLURAL_SWEETS :Słodycze -STR_CARGO_PLURAL_CANDY.d :słodyczy -STR_CARGO_PLURAL_CANDY.c :słodyczom -STR_CARGO_PLURAL_CANDY.b :słodycze -STR_CARGO_PLURAL_CANDY.n :słodyczami -STR_CARGO_PLURAL_CANDY.m :słodyczach -STR_CARGO_PLURAL_CANDY.w :słodycze +STR_CARGO_PLURAL_SWEETS.d :słodyczy +STR_CARGO_PLURAL_SWEETS.c :słodyczom +STR_CARGO_PLURAL_SWEETS.b :słodycze +STR_CARGO_PLURAL_SWEETS.n :słodyczami +STR_CARGO_PLURAL_SWEETS.m :słodyczach +STR_CARGO_PLURAL_SWEETS.w :słodycze STR_CARGO_PLURAL_COLA :Cola STR_CARGO_PLURAL_COLA.d :coli STR_CARGO_PLURAL_COLA.c :coli diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 24eef4e9ad..8ed26e1f4a 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -97,8 +97,8 @@ STR_CARGO_PLURAL_TOYS :{G=p}Игруш STR_CARGO_PLURAL_TOYS.gen :игрушек STR_CARGO_PLURAL_TOYS.acc :игрушки STR_CARGO_PLURAL_SWEETS :{G=p}Конфеты -STR_CARGO_PLURAL_CANDY.gen :конфет -STR_CARGO_PLURAL_CANDY.acc :конфеты +STR_CARGO_PLURAL_SWEETS.gen :конфет +STR_CARGO_PLURAL_SWEETS.acc :конфеты STR_CARGO_PLURAL_COLA :{G=f}Кола STR_CARGO_PLURAL_COLA.gen :колы STR_CARGO_PLURAL_COLA.acc :колу diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index b6ec8e2d6e..3c3b6a2afb 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -120,9 +120,9 @@ STR_CARGO_PLURAL_TOYS.big :Igračke STR_CARGO_PLURAL_TOYS.gen :igračaka STR_CARGO_PLURAL_TOYS.aku :igračke STR_CARGO_PLURAL_SWEETS :slatkiši -STR_CARGO_PLURAL_CANDY.big :Slatkiši -STR_CARGO_PLURAL_CANDY.gen :slatkiša -STR_CARGO_PLURAL_CANDY.aku :slatkiše +STR_CARGO_PLURAL_SWEETS.big :Slatkiši +STR_CARGO_PLURAL_SWEETS.gen :slatkiša +STR_CARGO_PLURAL_SWEETS.aku :slatkiše STR_CARGO_PLURAL_COLA :kola STR_CARGO_PLURAL_COLA.big :Kola STR_CARGO_PLURAL_COLA.gen :kole diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 5a333b98c6..6fc4f02442 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -74,7 +74,7 @@ STR_CARGO_PLURAL_SUGAR.g :cukru STR_CARGO_PLURAL_TOYS :Hračky STR_CARGO_PLURAL_TOYS.g :hračiek STR_CARGO_PLURAL_SWEETS :Cukríky -STR_CARGO_PLURAL_CANDY.g :cukríkov +STR_CARGO_PLURAL_SWEETS.g :cukríkov STR_CARGO_PLURAL_COLA :Kofola STR_CARGO_PLURAL_COLA.g :kofoly STR_CARGO_PLURAL_CANDYFLOSS :Cukrová vata diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index e90de58c23..a83f3bb4d0 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -106,8 +106,8 @@ STR_CARGO_PLURAL_TOYS :Igrače STR_CARGO_PLURAL_TOYS.r :Igrač STR_CARGO_PLURAL_TOYS.d :Igračam STR_CARGO_PLURAL_SWEETS :Sladkarije -STR_CARGO_PLURAL_CANDY.r :Sladkarij -STR_CARGO_PLURAL_CANDY.d :Sladkarijam +STR_CARGO_PLURAL_SWEETS.r :Sladkarij +STR_CARGO_PLURAL_SWEETS.d :Sladkarijam STR_CARGO_PLURAL_COLA :Cockta STR_CARGO_PLURAL_COLA.r :Cockte STR_CARGO_PLURAL_COLA.d :Cockti diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index a0053615b4..7811c4e7f0 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -96,8 +96,8 @@ STR_CARGO_PLURAL_TOYS :іграшки STR_CARGO_PLURAL_TOYS.r :іграшок STR_CARGO_PLURAL_TOYS.z :іграшки STR_CARGO_PLURAL_SWEETS :солодощі -STR_CARGO_PLURAL_CANDY.r :солодощів -STR_CARGO_PLURAL_CANDY.z :солодощі +STR_CARGO_PLURAL_SWEETS.r :солодощів +STR_CARGO_PLURAL_SWEETS.z :солодощі STR_CARGO_PLURAL_COLA :кола STR_CARGO_PLURAL_COLA.r :коли STR_CARGO_PLURAL_COLA.z :колу From b7751c483e5545aa683baf0b9f09a0add34cfefd Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Tue, 22 Dec 2020 14:21:31 +0100 Subject: [PATCH 17/38] Feature: Influence industry production changes from GS (#7912) --- src/command.cpp | 3 ++ src/command_type.h | 1 + src/industry.h | 21 ++++++++++ src/industry_cmd.cpp | 51 +++++++++++++++++++++++- src/newgrf_industries.cpp | 3 ++ src/saveload/industry_sl.cpp | 1 + src/saveload/saveload.h | 2 + src/script/api/game_changelog.hpp | 4 ++ src/script/api/script_cargo.hpp | 1 + src/script/api/script_industry.cpp | 37 ++++++++++++++++++ src/script/api/script_industry.hpp | 63 ++++++++++++++++++++++++++++++ 11 files changed, 185 insertions(+), 2 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index 453f305d38..9fbc6cae6a 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -97,6 +97,7 @@ CommandProc CmdInsertOrder; CommandProc CmdChangeServiceInt; CommandProc CmdBuildIndustry; +CommandProc CmdIndustryCtrl; CommandProc CmdSetCompanyManagerFace; CommandProc CmdSetCompanyColour; @@ -265,6 +266,8 @@ static const Command _command_proc_table[] = { DEF_CMD(CmdChangeServiceInt, 0, CMDT_VEHICLE_MANAGEMENT ), // CMD_CHANGE_SERVICE_INT DEF_CMD(CmdBuildIndustry, CMD_DEITY, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_BUILD_INDUSTRY + DEF_CMD(CmdIndustryCtrl, CMD_DEITY, CMDT_OTHER_MANAGEMENT ), // CMD_INDUSTRY_CTRL + DEF_CMD(CmdSetCompanyManagerFace, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_COMPANY_MANAGER_FACE DEF_CMD(CmdSetCompanyColour, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_COMPANY_COLOUR diff --git a/src/command_type.h b/src/command_type.h index 04dbfe893c..0620b96b63 100644 --- a/src/command_type.h +++ b/src/command_type.h @@ -230,6 +230,7 @@ enum Commands { CMD_CHANGE_SERVICE_INT, ///< change the server interval of a vehicle CMD_BUILD_INDUSTRY, ///< build a new industry + CMD_INDUSTRY_CTRL, ///< change industry properties CMD_SET_COMPANY_MANAGER_FACE, ///< set the manager's face of the company CMD_SET_COMPANY_COLOUR, ///< set the colour of the company diff --git a/src/industry.h b/src/industry.h index e82033dd13..feee6f2008 100644 --- a/src/industry.h +++ b/src/industry.h @@ -34,6 +34,26 @@ enum ProductionLevels { PRODLEVEL_MAXIMUM = 0x80, ///< the industry is running at full speed }; +/** + * Flags to control/override the behaviour of an industry. + * These flags are controlled by game scripts. + */ +enum IndustryControlFlags : byte { + /** No flags in effect */ + INDCTL_NONE = 0, + /** When industry production change is evaluated, rolls to decrease are ignored. */ + INDCTL_NO_PRODUCTION_DECREASE = 1 << 0, + /** When industry production change is evaluated, rolls to increase are ignored. */ + INDCTL_NO_PRODUCTION_INCREASE = 1 << 1, + /** + * Industry can not close regardless of production level or time since last delivery. + * This does not prevent a closure already announced. */ + INDCTL_NO_CLOSURE = 1 << 2, + /** Mask of all flags set */ + INDCTL_MASK = INDCTL_NO_PRODUCTION_DECREASE | INDCTL_NO_PRODUCTION_INCREASE | INDCTL_NO_CLOSURE, +}; +DECLARE_ENUM_AS_BIT_SET(IndustryControlFlags); + /** * Defines the internal data of a functional industry. */ @@ -59,6 +79,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { byte random_colour; ///< randomized colour of the industry, for display purpose Year last_prod_year; ///< last year of production byte was_cargo_delivered; ///< flag that indicate this has been the closest industry chosen for cargo delivery by a station. see DeliverGoodsToIndustry + IndustryControlFlags ctlflags; ///< flags overriding standard behaviours PartOfSubsidy part_of_subsidy; ///< NOSAVE: is this industry a source/destination of a subsidy? StationList stations_near; ///< NOSAVE: List of nearby stations. diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index b8b92e5bf9..420244e6dc 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1753,6 +1753,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type, i->was_cargo_delivered = false; i->last_prod_year = _cur_year; i->founder = founder; + i->ctlflags = INDCTL_NONE; i->construction_date = _date; i->construction_type = (_game_mode == GM_EDITOR) ? ICT_SCENARIO_EDITOR : @@ -2049,6 +2050,43 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin return CommandCost(EXPENSES_OTHER, indspec->GetConstructionCost()); } +/** + * Change industry properties + * @param tile Unused. + * @param flags Type of operation. + * @param p1 IndustryID + * @param p2 various bitstuffed elements + * - p2 = (bit 0 - 7) - action to perform: + * 0 = set control flags + * - p2 = (bit 8 - 15) - IndustryControlFlags + * (only used with set control flags) + * @param text unused + * @return Empty cost or an error. + */ +CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) +{ + if (_current_company != OWNER_DEITY) return CMD_ERROR; + + Industry *ind = Industry::GetIfValid(p1); + if (ind == nullptr) return CMD_ERROR; + + uint8 action = GB(p2, 0, 8); + + switch (action) { + case 0: { + IndustryControlFlags ctlflags = (IndustryControlFlags)GB(p2, 8, 8) & INDCTL_MASK; + + if (flags & DC_EXEC) ind->ctlflags = ctlflags; + + break; + } + + default: + NOT_REACHED(); + } + + return CommandCost(); +} /** * Create a new industry of random layout. @@ -2659,7 +2697,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) } } } else if (_settings_game.economy.type == ET_SMOOTH) { - closeit = true; + closeit = !(i->ctlflags & (INDCTL_NO_CLOSURE | INDCTL_NO_PRODUCTION_DECREASE)); for (byte j = 0; j < lengthof(i->produced_cargo); j++) { if (i->produced_cargo[j] == CT_INVALID) continue; uint32 r = Random(); @@ -2692,6 +2730,10 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) new_prod = Clamp(new_prod, 0, 16); } + /* If override flags are set, prevent actually changing production if any was decided on */ + if ((i->ctlflags & INDCTL_NO_PRODUCTION_DECREASE) && new_prod < old_prod) continue; + if ((i->ctlflags & INDCTL_NO_PRODUCTION_INCREASE) && new_prod > old_prod) continue; + /* Do not stop closing the industry when it has the lowest possible production rate */ if (new_prod == old_prod && old_prod > 1) { closeit = false; @@ -2711,6 +2753,10 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) } } + /* If override flags are set, prevent actually changing production if any was decided on */ + if ((i->ctlflags & INDCTL_NO_PRODUCTION_DECREASE) && (div > 0 || increment < 0)) return; + if ((i->ctlflags & INDCTL_NO_PRODUCTION_INCREASE) && (mul > 0 || increment > 0)) return; + if (!callback_enabled && (indspec->life_type & INDUSTRYLIFE_PROCESSING)) { if ( (byte)(_cur_year - i->last_prod_year) >= 5 && Chance16(1, original_economy ? 2 : 180)) { closeit = true; @@ -2728,6 +2774,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) while (div-- != 0 && !closeit) { if (i->prod_level == PRODLEVEL_MINIMUM) { closeit = true; + break; } else { i->prod_level = max(i->prod_level / 2, (int)PRODLEVEL_MINIMUM); // typecast to int required to please MSVC recalculate_multipliers = true; @@ -2750,7 +2797,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) if (recalculate_multipliers) i->RecomputeProductionMultipliers(); /* Close if needed and allowed */ - if (closeit && !CheckIndustryCloseDownProtection(i->type)) { + if (closeit && !CheckIndustryCloseDownProtection(i->type) && !(i->ctlflags & INDCTL_NO_CLOSURE)) { i->prod_level = PRODLEVEL_CLOSURE; SetWindowDirty(WC_INDUSTRY_VIEW, i->index); str = indspec->closure_text; diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index a8748a4953..2dbe907dee 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -248,6 +248,9 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout case 0x46: return this->industry->construction_date; // Date when built - long format - (in days) + /* Override flags from GS */ + case 0x47: return this->industry->ctlflags; + /* Get industry ID at offset param */ case 0x60: return GetIndustryIDAtOffset(GetNearbyTile(parameter, this->industry->location.tile, false), this->industry, this->ro.grffile->grfid); diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index f5b1464c1e..8f7301120b 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -56,6 +56,7 @@ static const SaveLoad _industry_desc[] = { SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, SLV_31, SL_MAX_VERSION), SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8), + SLE_CONDVAR(Industry, ctlflags, SLE_UINT8, SLV_GS_INDUSTRY_CONTROL, SL_MAX_VERSION), SLE_CONDVAR(Industry, founder, SLE_UINT8, SLV_70, SL_MAX_VERSION), SLE_CONDVAR(Industry, construction_date, SLE_INT32, SLV_70, SL_MAX_VERSION), diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 7fa91a5095..0b525570d7 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -320,6 +320,8 @@ enum SaveLoadVersion : uint16 { SLV_START_PATCHPACKS, ///< 220 First known patchpack to use a version just above ours. SLV_END_PATCHPACKS = 286, ///< 286 Last known patchpack to use a version just above ours. + SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 GS industry control. + SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index fc917a0120..abc9e9c35e 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -21,6 +21,10 @@ * \li GSEventStoryPageButtonClick * \li GSEventStoryPageTileSelect * \li GSEventStoryPageVehicleSelect + * \li GSIndustry::GetCargoLastAcceptedDate + * \li GSIndustry::GetControlFlags + * \li GSIndustry::GetLastProductionYear + * \li GSIndustry::SetControlFlags * \li GSStoryPage::MakePushButtonReference * \li GSStoryPage::MakeTileButtonReference * \li GSStoryPage::MakeVehicleButtonReference diff --git a/src/script/api/script_cargo.hpp b/src/script/api/script_cargo.hpp index 4aab97c70e..9ecd4cbfb2 100644 --- a/src/script/api/script_cargo.hpp +++ b/src/script/api/script_cargo.hpp @@ -57,6 +57,7 @@ public: /* Note: these values represent part of the in-game CargoTypes enum */ CT_AUTO_REFIT = ::CT_AUTO_REFIT, ///< Automatically choose cargo type when doing auto-refitting. CT_NO_REFIT = ::CT_NO_REFIT, ///< Do not refit cargo of a vehicle. + CT_INVALID = ::CT_INVALID, ///< An invalid cargo type. }; /** diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp index 4d1e91a3ce..c2b449b0ba 100644 --- a/src/script/api/script_industry.cpp +++ b/src/script/api/script_industry.cpp @@ -16,6 +16,7 @@ #include "../../station_base.h" #include "../../newgrf_industries.h" #include "table/strings.h" +#include #include "../../safeguards.h" @@ -204,3 +205,39 @@ return ::Industry::Get(industry_id)->type; } + +int32 ScriptIndustry::GetLastProductionYear(IndustryID industry_id) +{ + Industry *i = Industry::GetIfValid(industry_id); + if (i == nullptr) return 0; + return i->last_prod_year; +} + +ScriptDate::Date ScriptIndustry::GetCargoLastAcceptedDate(IndustryID industry_id, CargoID cargo_type) +{ + Industry *i = Industry::GetIfValid(industry_id); + if (i == nullptr) return ScriptDate::DATE_INVALID; + + if (cargo_type == CT_INVALID) { + return (ScriptDate::Date)std::accumulate(std::begin(i->last_cargo_accepted_at), std::end(i->last_cargo_accepted_at), 0, [](Date a, Date b) { return std::max(a, b); }); + } else { + int index = i->GetCargoAcceptedIndex(cargo_type); + if (index < 0) return ScriptDate::DATE_INVALID; + return (ScriptDate::Date)i->last_cargo_accepted_at[index]; + } +} + +uint32 ScriptIndustry::GetControlFlags(IndustryID industry_id) +{ + Industry *i = Industry::GetIfValid(industry_id); + if (i == nullptr) return 0; + return i->ctlflags; +} + +bool ScriptIndustry::SetControlFlags(IndustryID industry_id, uint32 control_flags) +{ + if (ScriptObject::GetCompany() != OWNER_DEITY) return false; + if (!IsValidIndustry(industry_id)) return false; + + return ScriptObject::DoCommand(0, industry_id, 0 | ((control_flags & ::INDCTL_MASK) << 8), CMD_INDUSTRY_CTRL); +} diff --git a/src/script/api/script_industry.hpp b/src/script/api/script_industry.hpp index 98c7d33ac3..2fbd861cc5 100644 --- a/src/script/api/script_industry.hpp +++ b/src/script/api/script_industry.hpp @@ -11,6 +11,8 @@ #define SCRIPT_INDUSTRY_HPP #include "script_object.hpp" +#include "script_date.hpp" +#include "../../industry.h" /** * Class that handles all industry related functions. @@ -25,6 +27,27 @@ public: CAS_TEMP_REFUSED, ///< The industry temporarily refuses to accept this CargoID but may do so again in the future. }; + /** + * Control flags for industry + * @api -ai + */ + enum IndustryControlFlags { + /** + * When industry production change is evaluated, rolls to decrease are ignored. + * This also prevents industry closure due to production dropping to the lowest level. + */ + INDCTL_NO_PRODUCTION_DECREASE = ::INDCTL_NO_PRODUCTION_DECREASE, + /** + * When industry production change is evaluated, rolls to increase are ignored. + */ + INDCTL_NO_PRODUCTION_INCREASE = ::INDCTL_NO_PRODUCTION_INCREASE, + /** + * Industry can not close regardless of production level or time since last delivery. + * This does not prevent a closure already announced. + */ + INDCTL_NO_CLOSURE = ::INDCTL_NO_CLOSURE, + }; + /** * Gets the number of industries. * @return The number of industries. @@ -196,6 +219,46 @@ public: * @return The IndustryType of the industry. */ static IndustryType GetIndustryType(IndustryID industry_id); + + /** + * Get the last year this industry had any production output. + * @param industry_id The index of the industry. + * @pre IsValidIndustry(industry_id). + * @return Year the industry last had production, 0 if error. + * @api -ai + */ + static int32 GetLastProductionYear(IndustryID industry_id); + + /** + * Get the last date this industry accepted any cargo delivery. + * @param industry_id The index of the industry. + * @param cargo_type The cargo to query, or CT_INVALID to query latest of all accepted cargoes. + * @pre IsValidIndustry(industry_id). + * @pre IsValidCargo(cargo_type) || cargo_type == CT_INVALID. + * @return Date the industry last received cargo from a delivery, or ScriptDate::DATE_INVALID on error. + * @api -ai + */ + static ScriptDate::Date GetCargoLastAcceptedDate(IndustryID industry_id, CargoID cargo_type); + + /** + * Get the current control flags for an industry. + * @param industry_id The index of the industry. + * @pre IsValidIndustry(industry_id). + * @return Bit flags of the IndustryControlFlags enumeration. + * @api -ai + */ + static uint32 GetControlFlags(IndustryID industry_id); + + /** + * Change the control flags for an industry. + * @param industry_id The index of the industry. + * @param control_flags New flags as a combination of IndustryControlFlags values. + * @pre IsValidIndustry(industry_id). + * @pre No ScriptCompanyMode may be in scope. + * @return True if the action succeeded. + * @api -ai + */ + static bool SetControlFlags(IndustryID industry_id, uint32 control_flags); }; #endif /* SCRIPT_INDUSTRY_HPP */ From 9a45a0f535e312cd97db12c3a2ec1068fa381136 Mon Sep 17 00:00:00 2001 From: Pavel Stupnikov Date: Tue, 22 Dec 2020 16:29:48 +0300 Subject: [PATCH 18/38] Feature: Set exclusive access to industry from GS (#8115) --- src/economy.cpp | 2 ++ src/economy_func.h | 2 +- src/industry.h | 2 ++ src/industry_cmd.cpp | 32 +++++++++++++++++++++- src/saveload/afterload.cpp | 8 ++++++ src/saveload/industry_sl.cpp | 2 ++ src/saveload/saveload.h | 2 +- src/script/api/game_changelog.hpp | 4 +++ src/script/api/script_industry.cpp | 41 ++++++++++++++++++++++++++++ src/script/api/script_industry.hpp | 44 +++++++++++++++++++++++++++++- src/station_cmd.cpp | 3 +- 11 files changed, 137 insertions(+), 5 deletions(-) diff --git a/src/economy.cpp b/src/economy.cpp index 7c801e854d..5e53334a0e 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1042,6 +1042,8 @@ static uint DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, uint n /* Check if industry temporarily refuses acceptance */ if (IndustryTemporarilyRefusesCargo(ind, cargo_type)) continue; + if (ind->exclusive_supplier != INVALID_OWNER && ind->exclusive_supplier != st->owner) continue; + /* Insert the industry into _cargo_delivery_destinations, if not yet contained */ include(_cargo_delivery_destinations, ind); diff --git a/src/economy_func.h b/src/economy_func.h index d26b344e9a..69980b4758 100644 --- a/src/economy_func.h +++ b/src/economy_func.h @@ -29,7 +29,7 @@ int UpdateCompanyRatingAndValue(Company *c, bool update); void StartupIndustryDailyChanges(bool init_counter); Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type); -uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, SourceID source_id, const StationList *all_stations); +uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, SourceID source_id, const StationList *all_stations, Owner exclusivity = INVALID_OWNER); void PrepareUnload(Vehicle *front_v); void LoadUnloadStation(Station *st); diff --git a/src/industry.h b/src/industry.h index feee6f2008..ea4d704a87 100644 --- a/src/industry.h +++ b/src/industry.h @@ -90,6 +90,8 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { uint8 construction_type; ///< Way the industry was constructed (@see IndustryConstructionType) Date last_cargo_accepted_at[INDUSTRY_NUM_INPUTS]; ///< Last day each cargo type was accepted by this industry byte selected_layout; ///< Which tile layout was used when creating the industry + Owner exclusive_supplier; ///< Which company has exclusive rights to deliver cargo (INVALID_OWNER = anyone) + Owner exclusive_consumer; ///< Which company has exclusive rights to take cargo (INVALID_OWNER = anyone) uint16 random; ///< Random value used for randomisation of all kinds of things diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 420244e6dc..92741e3f69 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -17,6 +17,7 @@ #include "town.h" #include "news_func.h" #include "cheat_type.h" +#include "company_base.h" #include "genworld.h" #include "tree_map.h" #include "newgrf_cargo.h" @@ -539,7 +540,7 @@ static bool TransportIndustryGoods(TileIndex tile) i->this_month_production[j] += cw; - uint am = MoveGoodsToStation(i->produced_cargo[j], cw, ST_INDUSTRY, i->index, &i->stations_near); + uint am = MoveGoodsToStation(i->produced_cargo[j], cw, ST_INDUSTRY, i->index, &i->stations_near, i->exclusive_consumer); i->this_month_transported[j] += am; moved_cargo |= (am != 0); @@ -946,6 +947,9 @@ static void ChangeTileOwner_Industry(TileIndex tile, Owner old_owner, Owner new_ /* If the founder merges, the industry was created by the merged company */ Industry *i = Industry::GetByTile(tile); if (i->founder == old_owner) i->founder = (new_owner == INVALID_OWNER) ? OWNER_NONE : new_owner; + + if (i->exclusive_supplier == old_owner) i->exclusive_supplier = new_owner; + if (i->exclusive_consumer == old_owner) i->exclusive_consumer = new_owner; } /** @@ -1764,6 +1768,9 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type, * else, chosen layout + 1 */ i->selected_layout = (byte)(layout_index + 1); + i->exclusive_supplier = INVALID_OWNER; + i->exclusive_consumer = INVALID_OWNER; + i->prod_level = PRODLEVEL_DEFAULT; /* Call callbacks after the regular fields got initialised. */ @@ -2058,8 +2065,13 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin * @param p2 various bitstuffed elements * - p2 = (bit 0 - 7) - action to perform: * 0 = set control flags + * 1 = set exclusive supplier + * 2 = set exclusive consumer * - p2 = (bit 8 - 15) - IndustryControlFlags * (only used with set control flags) + * - p2 = (bit 16 - 23) - CompanyID to set or INVALID_OWNER (available to everyone) or + * OWNER_NONE (neutral stations only) or OWNER_DEITY (no one) + * (only used with set exclusive supplier / consumer) * @param text unused * @return Empty cost or an error. */ @@ -2081,6 +2093,24 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint break; } + case 1: + case 2: { + Owner company_id = (Owner)GB(p2, 16, 8); + + if (company_id != OWNER_NONE && company_id != INVALID_OWNER && company_id != OWNER_DEITY + && !Company::IsValidID(company_id)) return CMD_ERROR; + + if (flags & DC_EXEC) { + if (action == 1) { + ind->exclusive_supplier = company_id; + } else { + ind->exclusive_consumer = company_id; + } + } + + break; + } + default: NOT_REACHED(); } diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 7d1e70212a..c617348d73 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3125,6 +3125,14 @@ bool AfterLoadGame() } } + /* Make sure all industries exclusive supplier/consumer set correctly. */ + if (IsSavegameVersionBefore(SLV_GS_INDUSTRY_CONTROL)) { + for (Industry *i : Industry::Iterate()) { + i->exclusive_supplier = INVALID_OWNER; + i->exclusive_consumer = INVALID_OWNER; + } + } + /* Compute station catchment areas. This is needed here in case UpdateStationAcceptance is called below. */ Station::RecomputeCatchmentForAll(); diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index 8f7301120b..99e25856c8 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -64,6 +64,8 @@ static const SaveLoad _industry_desc[] = { SLE_CONDVAR(Industry, last_cargo_accepted_at[0], SLE_INT32, SLV_70, SLV_EXTEND_INDUSTRY_CARGO_SLOTS), SLE_CONDARR(Industry, last_cargo_accepted_at, SLE_INT32, 16, SLV_EXTEND_INDUSTRY_CARGO_SLOTS, SL_MAX_VERSION), SLE_CONDVAR(Industry, selected_layout, SLE_UINT8, SLV_73, SL_MAX_VERSION), + SLE_CONDVAR(Industry, exclusive_supplier, SLE_UINT8, SLV_GS_INDUSTRY_CONTROL, SL_MAX_VERSION), + SLE_CONDVAR(Industry, exclusive_consumer, SLE_UINT8, SLV_GS_INDUSTRY_CONTROL, SL_MAX_VERSION), SLEG_CONDARR(_old_ind_persistent_storage.storage, SLE_UINT32, 16, SLV_76, SLV_161), SLE_CONDREF(Industry, psa, REF_STORAGE, SLV_161, SL_MAX_VERSION), diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 0b525570d7..58a2919326 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -320,7 +320,7 @@ enum SaveLoadVersion : uint16 { SLV_START_PATCHPACKS, ///< 220 First known patchpack to use a version just above ours. SLV_END_PATCHPACKS = 286, ///< 286 Last known patchpack to use a version just above ours. - SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 GS industry control. + SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 and PR#8115 GS industry control. SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index abc9e9c35e..1f43cdea1c 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -23,8 +23,12 @@ * \li GSEventStoryPageVehicleSelect * \li GSIndustry::GetCargoLastAcceptedDate * \li GSIndustry::GetControlFlags + * \li GSIndustry::GetExclusiveConsumer + * \li GSIndustry::GetExclusiveSupplier * \li GSIndustry::GetLastProductionYear * \li GSIndustry::SetControlFlags + * \li GSIndustry::SetExclusiveConsumer + * \li GSIndustry::SetExclusiveSupplier * \li GSStoryPage::MakePushButtonReference * \li GSStoryPage::MakeTileButtonReference * \li GSStoryPage::MakeVehicleButtonReference diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp index c2b449b0ba..14ba8e4022 100644 --- a/src/script/api/script_industry.cpp +++ b/src/script/api/script_industry.cpp @@ -10,7 +10,10 @@ #include "../../stdafx.h" #include "script_industry.hpp" #include "script_cargo.hpp" +#include "script_company.hpp" +#include "script_error.hpp" #include "script_map.hpp" +#include "../../company_base.h" #include "../../industry.h" #include "../../strings_func.h" #include "../../station_base.h" @@ -241,3 +244,41 @@ bool ScriptIndustry::SetControlFlags(IndustryID industry_id, uint32 control_flag return ScriptObject::DoCommand(0, industry_id, 0 | ((control_flags & ::INDCTL_MASK) << 8), CMD_INDUSTRY_CTRL); } + +/* static */ ScriptCompany::CompanyID ScriptIndustry::GetExclusiveSupplier(IndustryID industry_id) +{ + if (!IsValidIndustry(industry_id)) return ScriptCompany::COMPANY_INVALID; + + auto company_id = ::Industry::Get(industry_id)->exclusive_supplier; + if (!::Company::IsValidID(company_id)) return ScriptCompany::COMPANY_INVALID; + + return (ScriptCompany::CompanyID)((byte)company_id); +} + +/* static */ bool ScriptIndustry::SetExclusiveSupplier(IndustryID industry_id, ScriptCompany::CompanyID company_id) +{ + EnforcePrecondition(false, IsValidIndustry(industry_id)); + + auto company = ScriptCompany::ResolveCompanyID(company_id); + ::Owner owner = (company == ScriptCompany::COMPANY_INVALID ? ::INVALID_OWNER : (::Owner)company); + return ScriptObject::DoCommand(0, industry_id, 1 | (((uint8)owner) << 16), CMD_INDUSTRY_CTRL); +} + +/* static */ ScriptCompany::CompanyID ScriptIndustry::GetExclusiveConsumer(IndustryID industry_id) +{ + if (!IsValidIndustry(industry_id)) return ScriptCompany::COMPANY_INVALID; + + auto company_id = ::Industry::Get(industry_id)->exclusive_consumer; + if (!::Company::IsValidID(company_id)) return ScriptCompany::COMPANY_INVALID; + + return (ScriptCompany::CompanyID)((byte)company_id); +} + +/* static */ bool ScriptIndustry::SetExclusiveConsumer(IndustryID industry_id, ScriptCompany::CompanyID company_id) +{ + EnforcePrecondition(false, IsValidIndustry(industry_id)); + + auto company = ScriptCompany::ResolveCompanyID(company_id); + ::Owner owner = (company == ScriptCompany::COMPANY_INVALID ? ::INVALID_OWNER : (::Owner)company); + return ScriptObject::DoCommand(0, industry_id, 2 | (((uint8)owner) << 16), CMD_INDUSTRY_CTRL); +} diff --git a/src/script/api/script_industry.hpp b/src/script/api/script_industry.hpp index 2fbd861cc5..dac3d32fd7 100644 --- a/src/script/api/script_industry.hpp +++ b/src/script/api/script_industry.hpp @@ -10,8 +10,9 @@ #ifndef SCRIPT_INDUSTRY_HPP #define SCRIPT_INDUSTRY_HPP -#include "script_object.hpp" +#include "script_company.hpp" #include "script_date.hpp" +#include "script_object.hpp" #include "../../industry.h" /** @@ -259,6 +260,47 @@ public: * @api -ai */ static bool SetControlFlags(IndustryID industry_id, uint32 control_flags); + + /** + * Find out which company currently has the exclusive rights to deliver cargo to the industry. + * @param industry_id The index of the industry. + * @pre IsValidIndustry(industry_id). + * @return The company that has the exclusive rights. The value + * ScriptCompany::COMPANY_INVALID means that there are currently no + * exclusive rights given out to anyone. + */ + static ScriptCompany::CompanyID GetExclusiveSupplier(IndustryID industry_id); + + /** + * Sets or resets the company that has exclusive right to deliver cargo to the industry. + * @param industry_id The index of the industry. + * @param company_id The company to set (ScriptCompany::COMPANY_INVALID to reset). + * @pre IsValidIndustry(industry_id). + * @return True if the action succeeded. + * @api -ai + */ + static bool SetExclusiveSupplier(IndustryID industry_id, ScriptCompany::CompanyID company_id); + + /** + * Find out which company currently has the exclusive rights to take cargo from the industry. + * @param industry_id The index of the industry. + * @pre IsValidIndustry(industry_id). + * @return The company that has the exclusive rights. The value + * ScriptCompany::COMPANY_SPECTATOR means that there are currently no + * exclusive rights given out to anyone. + */ + static ScriptCompany::CompanyID GetExclusiveConsumer(IndustryID industry_id); + + /** + * Sets or resets the company that has exclusive right to take cargo from the industry. + * @param industry_id The index of the industry. + * @param company_id The company to set (ScriptCompany::COMPANY_INVALID to reset). + * @pre IsValidIndustry(industry_id). + * @return True if the action succeeded. + * @api -ai + */ + static bool SetExclusiveConsumer(IndustryID industry_id, ScriptCompany::CompanyID company_id); + }; #endif /* SCRIPT_INDUSTRY_HPP */ diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 7bce21353d..cd56dcb698 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -4013,7 +4013,7 @@ static bool CanMoveGoodsToStation(const Station *st, CargoID type) return true; } -uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, SourceID source_id, const StationList *all_stations) +uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, SourceID source_id, const StationList *all_stations, Owner exclusivity) { /* Return if nothing to do. Also the rounding below fails for 0. */ if (all_stations->empty()) return 0; @@ -4024,6 +4024,7 @@ uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, Sourc std::vector used_stations; for (Station *st : *all_stations) { + if (exclusivity != INVALID_OWNER && exclusivity != st->owner) continue; if (!CanMoveGoodsToStation(st, type)) continue; /* Avoid allocating a vector if there is only one station to significantly From 0c5dc5d41eff0ac0a62dd67882a718bb3c99ec3a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 22 Jan 2019 18:31:08 +0000 Subject: [PATCH 19/38] Change: [Linkgraph] Pause the game when linkgraph jobs lag (#6470) Check if the job is still running two date fract ticks before it is due to join, and if so pause the game until its done. When loading a game, check if the game would block immediately due to a job which is scheduled to be joined within two date fract ticks, and if so pause the game until its done. This avoids the main thread being blocked on a thread join, which appears to the user as if the game is unresponsive, as the UI does not repaint and cannot be interacted with. Show if pause is due to link graph job in status bar, update network messages. This does not apply for network clients. --- src/lang/english.txt | 3 ++ src/linkgraph/linkgraphjob.cpp | 3 +- src/linkgraph/linkgraphjob.h | 13 +++++- src/linkgraph/linkgraphschedule.cpp | 62 ++++++++++++++++++++++++++++- src/linkgraph/linkgraphschedule.h | 4 ++ src/misc_cmd.cpp | 1 + src/network/network.cpp | 5 ++- src/openttd.cpp | 4 ++ src/openttd.h | 1 + src/saveload/linkgraph_sl.cpp | 5 +++ src/statusbar_gui.cpp | 3 +- 11 files changed, 98 insertions(+), 6 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 7d7af8d853..04399d9a45 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -780,6 +780,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Display STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Show last message or news report STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSED * * +STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * PAUSED (waiting for link graph update) * * STR_STATUSBAR_AUTOSAVE :{RED}AUTOSAVE STR_STATUSBAR_SAVING_GAME :{RED}* * SAVING GAME * * @@ -2217,11 +2218,13 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :Game still paus STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :Game still paused ({STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :Game still paused ({STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :Game still paused ({STRING}, {STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5 :Game still paused ({STRING}, {STRING}, {STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED :Game unpaused ({STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :number of players STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :connecting clients STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :manual STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT :game script +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :waiting for link graph update ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :leaving STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {RAW_STRING} has joined the game diff --git a/src/linkgraph/linkgraphjob.cpp b/src/linkgraph/linkgraphjob.cpp index 2d7b407da7..c66ddeac79 100644 --- a/src/linkgraph/linkgraphjob.cpp +++ b/src/linkgraph/linkgraphjob.cpp @@ -37,7 +37,8 @@ LinkGraphJob::LinkGraphJob(const LinkGraph &orig) : * This is on purpose. */ link_graph(orig), settings(_settings_game.linkgraph), - join_date(_date + _settings_game.linkgraph.recalc_time) + join_date(_date + _settings_game.linkgraph.recalc_time), + job_completed(false) { } diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h index cd7ece4b1e..ab5e07fb18 100644 --- a/src/linkgraph/linkgraphjob.h +++ b/src/linkgraph/linkgraphjob.h @@ -13,6 +13,7 @@ #include "../thread.h" #include "linkgraph.h" #include +#include class LinkGraphJob; class Path; @@ -61,6 +62,7 @@ protected: Date join_date; ///< Date when the job is to be joined. NodeAnnotationVector nodes; ///< Extra node data necessary for link graph calculation. EdgeAnnotationMatrix edges; ///< Extra edge data necessary for link graph calculation. + std::atomic job_completed; ///< Is the job still running. This is accessed by multiple threads and reads may be stale. void EraseFlows(NodeID from); void JoinThread(); @@ -265,18 +267,25 @@ public: * settings have to be brutally const-casted in order to populate them. */ LinkGraphJob() : settings(_settings_game.linkgraph), - join_date(INVALID_DATE) {} + join_date(INVALID_DATE), job_completed(false) {} LinkGraphJob(const LinkGraph &orig); ~LinkGraphJob(); void Init(); + /** + * Check if job has actually finished. + * This is allowed to spuriously return an incorrect value. + * @return True if job has actually finished. + */ + inline bool IsJobCompleted() const { return this->job_completed.load(std::memory_order_acquire); } + /** * Check if job is supposed to be finished. * @return True if job should be finished by now, false if not. */ - inline bool IsFinished() const { return this->join_date <= _date; } + inline bool IsScheduledToBeJoined() const { return this->join_date <= _date; } /** * Get the date when the job should be finished. diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp index 964744509e..2638b77ea8 100644 --- a/src/linkgraph/linkgraphschedule.cpp +++ b/src/linkgraph/linkgraphschedule.cpp @@ -14,6 +14,7 @@ #include "mcf.h" #include "flowmapper.h" #include "../framerate_type.h" +#include "../command_func.h" #include "../safeguards.h" @@ -48,6 +49,17 @@ void LinkGraphSchedule::SpawnNext() } } +/** + * Check if the next job is supposed to be finished, but has not yet completed. + * @return True if job should be finished by now but is still running, false if not. + */ +bool LinkGraphSchedule::IsJoinWithUnfinishedJobDue() const +{ + if (this->running.empty()) return false; + const LinkGraphJob *next = this->running.front(); + return next->IsScheduledToBeJoined() && !next->IsJobCompleted(); +} + /** * Join the next finished job, if available. */ @@ -55,7 +67,7 @@ void LinkGraphSchedule::JoinNext() { if (this->running.empty()) return; LinkGraphJob *next = this->running.front(); - if (!next->IsFinished()) return; + if (!next->IsScheduledToBeJoined()) return; this->running.pop_front(); LinkGraphID id = next->LinkGraphIndex(); delete next; // implicitly joins the thread @@ -75,6 +87,18 @@ void LinkGraphSchedule::JoinNext() for (uint i = 0; i < lengthof(instance.handlers); ++i) { instance.handlers[i]->Run(*job); } + + /* + * Readers of this variable in another thread may see an out of date value. + * However this is OK as this will only happen just as a job is completing, + * and the real synchronisation is provided by the thread join operation. + * In the worst case the main thread will be paused for longer than + * strictly necessary before joining. + * This is just a hint variable to avoid performing the join excessively + * early and blocking the main thread. + */ + + job->job_completed.store(true, std::memory_order_release); } /** @@ -135,6 +159,42 @@ LinkGraphSchedule::~LinkGraphSchedule() } } +/** + * Pause the game if in 2 _date_fract ticks, we would do a join with the next + * link graph job, but it is still running. + * The check is done 2 _date_fract ticks early instead of 1, as in multiplayer + * calls to DoCommandP are executed after a delay of 1 _date_fract tick. + * If we previously paused, unpause if the job is now ready to be joined with. + */ +void StateGameLoop_LinkGraphPauseControl() +{ + if (_pause_mode & PM_PAUSED_LINK_GRAPH) { + /* We are paused waiting on a job, check the job every tick. */ + if (!LinkGraphSchedule::instance.IsJoinWithUnfinishedJobDue()) { + DoCommandP(0, PM_PAUSED_LINK_GRAPH, 0, CMD_PAUSE); + } + } else if (_pause_mode == PM_UNPAUSED && + _date_fract == LinkGraphSchedule::SPAWN_JOIN_TICK - 2 && + _date % _settings_game.linkgraph.recalc_interval == _settings_game.linkgraph.recalc_interval / 2 && + LinkGraphSchedule::instance.IsJoinWithUnfinishedJobDue()) { + /* Perform check two _date_fract ticks before we would join, to make + * sure it also works in multiplayer. */ + DoCommandP(0, PM_PAUSED_LINK_GRAPH, 1, CMD_PAUSE); + } +} + +/** + * Pause the game on load if we would do a join with the next link graph job, + * but it is still running, and it would not be caught by a call to + * StateGameLoop_LinkGraphPauseControl(). + */ +void AfterLoad_LinkGraphPauseControl() +{ + if (LinkGraphSchedule::instance.IsJoinWithUnfinishedJobDue()) { + _pause_mode |= PM_PAUSED_LINK_GRAPH; + } +} + /** * Spawn or join a link graph job or compress a link graph if any link graph is * due to do so. diff --git a/src/linkgraph/linkgraphschedule.h b/src/linkgraph/linkgraphschedule.h index 62ca2b0c17..6a6dff697f 100644 --- a/src/linkgraph/linkgraphschedule.h +++ b/src/linkgraph/linkgraphschedule.h @@ -55,6 +55,7 @@ public: static void Clear(); void SpawnNext(); + bool IsJoinWithUnfinishedJobDue() const; void JoinNext(); void SpawnAll(); void ShiftDates(int interval); @@ -76,4 +77,7 @@ public: void Unqueue(LinkGraph *lg) { this->schedule.remove(lg); } }; +void StateGameLoop_LinkGraphPauseControl(); +void AfterLoad_LinkGraphPauseControl(); + #endif /* LINKGRAPHSCHEDULE_H */ diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp index 63dfb15253..2b32c06bfe 100644 --- a/src/misc_cmd.cpp +++ b/src/misc_cmd.cpp @@ -150,6 +150,7 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, case PM_PAUSED_ERROR: case PM_PAUSED_NORMAL: case PM_PAUSED_GAME_SCRIPT: + case PM_PAUSED_LINK_GRAPH: break; case PM_PAUSED_JOIN: diff --git a/src/network/network.cpp b/src/network/network.cpp index a100b6b959..da341f253f 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -342,7 +342,8 @@ void NetworkHandlePauseChange(PauseMode prev_mode, PauseMode changed_mode) case PM_PAUSED_NORMAL: case PM_PAUSED_JOIN: case PM_PAUSED_GAME_SCRIPT: - case PM_PAUSED_ACTIVE_CLIENTS: { + case PM_PAUSED_ACTIVE_CLIENTS: + case PM_PAUSED_LINK_GRAPH: { bool changed = ((_pause_mode == PM_UNPAUSED) != (prev_mode == PM_UNPAUSED)); bool paused = (_pause_mode != PM_UNPAUSED); if (!paused && !changed) return; @@ -355,6 +356,7 @@ void NetworkHandlePauseChange(PauseMode prev_mode, PauseMode changed_mode) if ((_pause_mode & PM_PAUSED_JOIN) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS); if ((_pause_mode & PM_PAUSED_GAME_SCRIPT) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT); if ((_pause_mode & PM_PAUSED_ACTIVE_CLIENTS) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS); + if ((_pause_mode & PM_PAUSED_LINK_GRAPH) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH); str = STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 + i; } else { switch (changed_mode) { @@ -362,6 +364,7 @@ void NetworkHandlePauseChange(PauseMode prev_mode, PauseMode changed_mode) case PM_PAUSED_JOIN: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS); break; case PM_PAUSED_GAME_SCRIPT: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT); break; case PM_PAUSED_ACTIVE_CLIENTS: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS); break; + case PM_PAUSED_LINK_GRAPH: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH); break; default: NOT_REACHED(); } str = paused ? STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED : STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED; diff --git a/src/openttd.cpp b/src/openttd.cpp index 9cc5d2f205..e4fcf40e94 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -1355,6 +1355,10 @@ static void CheckCaches() */ void StateGameLoop() { + if (!_networking || _network_server) { + StateGameLoop_LinkGraphPauseControl(); + } + /* don't execute the state loop during pause */ if (_pause_mode != PM_UNPAUSED) { PerformanceMeasurer::Paused(PFE_GAMELOOP); diff --git a/src/openttd.h b/src/openttd.h index 61cff24564..6568881c47 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -62,6 +62,7 @@ enum PauseMode : byte { PM_PAUSED_ERROR = 1 << 3, ///< A game paused because a (critical) error PM_PAUSED_ACTIVE_CLIENTS = 1 << 4, ///< A game paused for 'min_active_clients' PM_PAUSED_GAME_SCRIPT = 1 << 5, ///< A game paused by a game script + PM_PAUSED_LINK_GRAPH = 1 << 6, ///< A game paused due to the link graph schedule lagging /** Pause mode bits when paused for network reasons. */ PMB_PAUSED_NETWORK = PM_PAUSED_ACTIVE_CLIENTS | PM_PAUSED_JOIN, diff --git a/src/saveload/linkgraph_sl.cpp b/src/saveload/linkgraph_sl.cpp index 29b685cf7d..aa3a2ff4b8 100644 --- a/src/saveload/linkgraph_sl.cpp +++ b/src/saveload/linkgraph_sl.cpp @@ -11,6 +11,7 @@ #include "../linkgraph/linkgraph.h" #include "../linkgraph/linkgraphjob.h" #include "../linkgraph/linkgraphschedule.h" +#include "../network/network.h" #include "../settings_internal.h" #include "saveload.h" @@ -245,6 +246,10 @@ void AfterLoadLinkGraphs() } LinkGraphSchedule::instance.SpawnAll(); + + if (!_networking || _network_server) { + AfterLoad_LinkGraphPauseControl(); + } } /** diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index a437f9fa8d..f97d0d4311 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -163,7 +163,8 @@ struct StatusBarWindow : Window { } else if (_do_autosave) { DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, text_top, STR_STATUSBAR_AUTOSAVE, TC_FROMSTRING, SA_HOR_CENTER); } else if (_pause_mode != PM_UNPAUSED) { - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, text_top, STR_STATUSBAR_PAUSED, TC_FROMSTRING, SA_HOR_CENTER); + StringID msg = (_pause_mode & PM_PAUSED_LINK_GRAPH) ? STR_STATUSBAR_PAUSED_LINK_GRAPH : STR_STATUSBAR_PAUSED; + DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, text_top, msg, TC_FROMSTRING, SA_HOR_CENTER); } else if (this->ticker_scroll < TICKER_STOP && _statusbar_news_item != nullptr && _statusbar_news_item->string_id != 0) { /* Draw the scrolling news text */ if (!DrawScrollingStatusText(_statusbar_news_item, ScaleGUITrad(this->ticker_scroll), r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, r.bottom)) { From 7f0fefddcfbf4b16f22ec58b5cf3eac794ded43e Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 10 Mar 2019 19:20:11 +0000 Subject: [PATCH 20/38] Change: [Linkgraph] Only acquire thread join performance measurements on network clients Network servers and single player clients do not block on thread joins due to instead pausing shortly before the join is due. --- src/linkgraph/linkgraphschedule.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp index 2638b77ea8..87ab4818a1 100644 --- a/src/linkgraph/linkgraphschedule.cpp +++ b/src/linkgraph/linkgraphschedule.cpp @@ -15,6 +15,7 @@ #include "flowmapper.h" #include "../framerate_type.h" #include "../command_func.h" +#include "../network/network.h" #include "../safeguards.h" @@ -206,8 +207,13 @@ void OnTick_LinkGraph() if (offset == 0) { LinkGraphSchedule::instance.SpawnNext(); } else if (offset == _settings_game.linkgraph.recalc_interval / 2) { - PerformanceMeasurer framerate(PFE_GL_LINKGRAPH); - LinkGraphSchedule::instance.JoinNext(); + if (!_networking || _network_server) { + PerformanceMeasurer::SetInactive(PFE_GL_LINKGRAPH); + LinkGraphSchedule::instance.JoinNext(); + } else { + PerformanceMeasurer framerate(PFE_GL_LINKGRAPH); + LinkGraphSchedule::instance.JoinNext(); + } } } From cc8301449e4426dbd42622317ca772766a8386f7 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 22 Dec 2020 18:13:57 +0000 Subject: [PATCH 21/38] Update: Translations from eints korean: 2 changes by telk5093 catalan: 13 changes by perezdidac --- src/lang/afrikaans.txt | 2 ++ src/lang/arabic_egypt.txt | 2 ++ src/lang/basque.txt | 2 ++ src/lang/belarusian.txt | 2 ++ src/lang/brazilian_portuguese.txt | 2 ++ src/lang/bulgarian.txt | 2 ++ src/lang/catalan.txt | 19 +++++++++++++++---- src/lang/croatian.txt | 2 ++ src/lang/czech.txt | 2 ++ src/lang/danish.txt | 2 ++ src/lang/dutch.txt | 2 ++ src/lang/english_AU.txt | 2 ++ src/lang/english_US.txt | 2 ++ src/lang/esperanto.txt | 2 ++ src/lang/estonian.txt | 2 ++ src/lang/faroese.txt | 2 ++ src/lang/finnish.txt | 2 ++ src/lang/french.txt | 2 ++ src/lang/gaelic.txt | 2 ++ src/lang/galician.txt | 2 ++ src/lang/german.txt | 2 ++ src/lang/greek.txt | 2 ++ src/lang/hebrew.txt | 2 ++ src/lang/hungarian.txt | 2 ++ src/lang/icelandic.txt | 2 ++ src/lang/indonesian.txt | 2 ++ src/lang/irish.txt | 2 ++ src/lang/italian.txt | 2 ++ src/lang/japanese.txt | 2 ++ src/lang/korean.txt | 6 ++++-- src/lang/latin.txt | 2 ++ src/lang/latvian.txt | 2 ++ src/lang/lithuanian.txt | 2 ++ src/lang/luxembourgish.txt | 2 ++ src/lang/malay.txt | 2 ++ src/lang/norwegian_bokmal.txt | 2 ++ src/lang/norwegian_nynorsk.txt | 2 ++ src/lang/polish.txt | 2 ++ src/lang/portuguese.txt | 2 ++ src/lang/romanian.txt | 2 ++ src/lang/russian.txt | 2 ++ src/lang/serbian.txt | 2 ++ src/lang/simplified_chinese.txt | 2 ++ src/lang/slovak.txt | 2 ++ src/lang/slovenian.txt | 2 ++ src/lang/spanish.txt | 2 ++ src/lang/spanish_MX.txt | 2 ++ src/lang/swedish.txt | 2 ++ src/lang/tamil.txt | 2 ++ src/lang/thai.txt | 2 ++ src/lang/traditional_chinese.txt | 2 ++ src/lang/turkish.txt | 2 ++ src/lang/ukrainian.txt | 2 ++ src/lang/unfinished/chuvash.txt | 2 ++ src/lang/unfinished/frisian.txt | 2 ++ src/lang/unfinished/ido.txt | 2 ++ src/lang/unfinished/macedonian.txt | 2 ++ src/lang/unfinished/maltese.txt | 2 ++ src/lang/unfinished/marathi.txt | 2 ++ src/lang/unfinished/persian.txt | 2 ++ src/lang/unfinished/urdu.txt | 2 ++ src/lang/vietnamese.txt | 2 ++ src/lang/welsh.txt | 2 ++ 63 files changed, 141 insertions(+), 6 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 5ac444e61c..895c5214e4 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Afstand STR_SORT_BY_POPULATION :Bevolking STR_SORT_BY_RATING :Waardering +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Onderbreek spel STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Vinnig vooruit die spel diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index d86812afb1..a0df0f04e4 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -291,6 +291,8 @@ STR_SORT_BY_CARGO_CAPACITY :سعة الشح STR_SORT_BY_RANGE :مدى STR_SORT_BY_POPULATION :عدد السكان +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}ايقاف اللعبة STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}سرع اللعبه diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 3c84f8df62..07838daee4 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -308,6 +308,8 @@ STR_SORT_BY_RANGE :Irismena STR_SORT_BY_POPULATION :Biztanleria STR_SORT_BY_RATING :Balorazioa +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Jokoa pausatu STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Jokoa bizkortu diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 9ded7fd19e..f82deae1ec 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -626,6 +626,8 @@ STR_SORT_BY_RANGE :Далёкас STR_SORT_BY_POPULATION :Насельніцтва STR_SORT_BY_RATING :Рэйтынґ +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Паўза STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Паскорыць гульню diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 49d34f5bfe..ed2de430a8 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Alcance STR_SORT_BY_POPULATION :População STR_SORT_BY_RATING :Classificação +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausar jogo STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Acelerar o jogo diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index c5a645caf8..a9a48bc093 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -312,6 +312,8 @@ STR_SORT_BY_RANGE :Обхват STR_SORT_BY_POPULATION :Население STR_SORT_BY_RATING :Рейтинг +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Пауза STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Бързо превъртане на играта diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e2b4561029..fff9299934 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -195,6 +195,7 @@ STR_COLOUR_DEFAULT :Per defecte STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mph STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}cel·les/dia STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}cv STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv @@ -316,6 +317,8 @@ STR_SORT_BY_RANGE :Abast STR_SORT_BY_POPULATION :Població STR_SORT_BY_RATING :Qualificació +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Posa en pausa o reprèn la partida STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Avança la partida el més ràpid possible @@ -1554,6 +1557,11 @@ STR_CONFIG_SETTING_ENDING_YEAR :Any de puntuaci STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT :Estableix l'any en què finalitza la partida i es puntua les companyies. Al final d'aquest any, la puntuació de la companyia es guarda i es mostra a la llista de classificació, però els jugadors poden continuar jugant.{}Si l'any de finalització és anterior a l'any d'inici, no es guardaran les puntuacions ni es mostrarà la llista de classificació. STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} STR_CONFIG_SETTING_ENDING_YEAR_ZERO :Mai +STR_CONFIG_SETTING_ECONOMY_TYPE :Tipus d'economia: {STRING} +STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Una economia suau implica canvis freqüents però petits en productivitat. En una economia congelada no hi ha canvis de productivitat ni tancament d'indústries. Aquesta configuració pot no tenir cap efecte si els tipus d'indústria venen predeterminats per un NewGRF. +STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Original +STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Suau +STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :{G=Femenin}Congelada STR_CONFIG_SETTING_ALLOW_SHARES :Permet comprar participacions d'altres companyies: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Permet comprar i vendre accions de les companyies. Les accions només estan disponibles per companyies d'una certa edat. STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Edat mínima de la companyia per negociar participacions: {STRING} @@ -1674,6 +1682,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Quan es mostren STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperial (mph) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Mètric (km/h) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/s) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Unitats del joc (cel·les/dia) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Unitats de potència dels vehicles: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Quan es mostra la potència d'un vehicle a la interfície d'usuari, presenta-la en les unitats seleccionades @@ -1806,6 +1815,7 @@ STR_INTRO_TRANSLATION :{BLACK}A aquest # Quit window STR_QUIT_CAPTION :{WHITE}Surt +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Esteu segur que voleu sortir de l'OpenTTD? STR_QUIT_YES :{BLACK}Sí STR_QUIT_NO :{BLACK}No @@ -4725,10 +4735,10 @@ STR_INDUSTRY_NAME_SUGAR_MINE :{G=Femenin}Mina ##id 0x6000 STR_SV_EMPTY : STR_SV_UNNAMED :Sense nom -STR_SV_TRAIN_NAME :{G=Masculin}Tren {COMMA} -STR_SV_ROAD_VEHICLE_NAME :{G=Masculin}Automòbil {COMMA} -STR_SV_SHIP_NAME :{G=Masculin}Vaixell {COMMA} -STR_SV_AIRCRAFT_NAME :{G=Masculin}Avió {COMMA} +STR_SV_TRAIN_NAME :{G=Masculin}Tren #{COMMA} +STR_SV_ROAD_VEHICLE_NAME :{G=Masculin}Automòbil #{COMMA} +STR_SV_SHIP_NAME :{G=Masculin}Vaixell #{COMMA} +STR_SV_AIRCRAFT_NAME :{G=Masculin}Avió #{COMMA} STR_SV_STNAME :{STRING} STR_SV_STNAME_NORTH :{STRING} Nord @@ -5030,6 +5040,7 @@ STR_FORMAT_BUOY_NAME :Boia de {TOWN} STR_FORMAT_BUOY_NAME_SERIAL :Boia de {TOWN} #{COMMA} STR_FORMAT_COMPANY_NUM :{G=Femenin}(Companyia {COMMA}) STR_FORMAT_GROUP_NAME :{G=Masculin}Grup {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA} STR_FORMAT_INDUSTRY_NAME :{TOWN}: {STRING} STR_FORMAT_WAYPOINT_NAME :Punt de pas de {TOWN} STR_FORMAT_WAYPOINT_NAME_SERIAL :Punt de pas de {TOWN} #{COMMA} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 55e0b6b912..82f6902028 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -411,6 +411,8 @@ STR_SORT_BY_RANGE :Domet STR_SORT_BY_POPULATION :Stanovništvo STR_SORT_BY_RATING :Rejting +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Zaustavi igru STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Premotaj igru naprijed diff --git a/src/lang/czech.txt b/src/lang/czech.txt index c76e07a8a4..739de18919 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -390,6 +390,8 @@ STR_SORT_BY_RANGE :dosah STR_SORT_BY_POPULATION :Podle populace STR_SORT_BY_RATING :Hodnocení +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauza STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Zrychlit běh hry diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 95d65615ee..001010bf22 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Interval STR_SORT_BY_POPULATION :Indbyggertal STR_SORT_BY_RATING :Værdi +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Sæt spillet på pause STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Kør spillet hurtigere diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 4f3e3c3ac5..49f861f6fd 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Bereik STR_SORT_BY_POPULATION :Aantal inwoners STR_SORT_BY_RATING :Waardering +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Hiermee pauzeer je het spel STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Hiermee verhoog je de spelsnelheid diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index a4a2b405de..f5d1509d6b 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -302,6 +302,8 @@ STR_SORT_BY_RANGE :Range STR_SORT_BY_POPULATION :Population STR_SORT_BY_RATING :Rating +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pause game STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Fast forward the game diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 73b1bf42b1..b4f33a2036 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Range STR_SORT_BY_POPULATION :Population STR_SORT_BY_RATING :Rating +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pause game STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Fast forward the game diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 676314aa61..d2be60700f 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -304,6 +304,8 @@ STR_SORT_BY_CARGO_CAPACITY :Ŝarĝkapablo STR_SORT_BY_RANGE :Atingopovo STR_SORT_BY_POPULATION :Enloĝantaro +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Paŭzigu la ludon STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Rapide pluirigu la ludon diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index c390fd6d66..fe97b7df82 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -368,6 +368,8 @@ STR_SORT_BY_RANGE :Vahekaugus STR_SORT_BY_POPULATION :Rahvaarv STR_SORT_BY_RATING :Hinnang +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Seiska mäng STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Kiirenda mängu diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 66ed873d64..d8b5c1f95f 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -292,6 +292,8 @@ STR_SORT_BY_RANGE :Vídd STR_SORT_BY_POPULATION :Fólkatal STR_SORT_BY_RATING :Virði +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Steðga spælinum STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Skunda undir spæli diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index b756e299c3..646eed3432 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Toimintasäde STR_SORT_BY_POPULATION :Asukasluku STR_SORT_BY_RATING :Arvio +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Tauko STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Nopeuta peliä diff --git a/src/lang/french.txt b/src/lang/french.txt index fba699ebb3..41c9efb34b 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -317,6 +317,8 @@ STR_SORT_BY_RANGE :Rayon d'action STR_SORT_BY_POPULATION :Population STR_SORT_BY_RATING :Qualité de service +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Mettre le jeu en pause STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Avance rapide du jeu diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index d0bb4435a4..59980042de 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -498,6 +498,8 @@ STR_SORT_BY_RANGE :Dlùths STR_SORT_BY_POPULATION :Àireamh-shluaigh STR_SORT_BY_RATING :Rangachadh +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Cuir an geama na stad / a' dol STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Cuir an geama air adhart gu luath diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 5834e93d55..c8e82dee37 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Autonomía STR_SORT_BY_POPULATION :Poboación STR_SORT_BY_RATING :Puntuación +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausar partida STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Avance rápido da partida diff --git a/src/lang/german.txt b/src/lang/german.txt index 2cad372f9b..41724fc7fb 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Reichweite STR_SORT_BY_POPULATION :Bevölkerung STR_SORT_BY_RATING :Bewertung +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Spiel anhalten STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Zeitraffer (Zeit vergeht schnellstmöglich) diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 3ca894c0a9..1b20d0b7b8 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -373,6 +373,8 @@ STR_SORT_BY_RANGE :Εμβέλει STR_SORT_BY_POPULATION :Πληθυσμός STR_SORT_BY_RATING :Εκτίμηση +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Παύση παιχνιδιού STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Γρήγορη ταχύτητα παιχνιδιού diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 5a8f15312e..3d9254b199 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -324,6 +324,8 @@ STR_SORT_BY_RANGE :טווח STR_SORT_BY_POPULATION :אכלוסיה STR_SORT_BY_RATING :דרוג +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}השהה משחק STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}הרץ את הזמן במהירות diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 4fc1c45cde..ab9f5c37e0 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -378,6 +378,8 @@ STR_SORT_BY_RANGE :Hatótávolság STR_SORT_BY_POPULATION :Lakosság STR_SORT_BY_RATING :Értékelés +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Játék szüneteltetése STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Játék gyorsítása diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index eca04147e6..27a97d1270 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -292,6 +292,8 @@ STR_SORT_BY_RANGE :Drægni STR_SORT_BY_POPULATION :Fólksfjöldi STR_SORT_BY_RATING :Einkunn +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Stöðva leik STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Spóla leikinn áfram diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index dc1a20878f..21ee30b50b 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Jangkauan STR_SORT_BY_POPULATION :Populasi STR_SORT_BY_RATING :Peringkat +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Hentikan sementara permainan STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Percepat maju waktu permainan diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 0658941a7d..5eda95ae04 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -310,6 +310,8 @@ STR_SORT_BY_RANGE :Raon STR_SORT_BY_POPULATION :Daonra STR_SORT_BY_RATING :Rátáil +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Cuir an cluiche ar sos STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Bog an cluiche ar aghaidh go scioptha diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 770ddc41a0..74cc0acc51 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -317,6 +317,8 @@ STR_SORT_BY_RANGE :{G=f}Autonomia STR_SORT_BY_POPULATION :Popolazione STR_SORT_BY_RATING :Valutazione +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausa STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Aumenta la velocità di gioco diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 203a33ab38..30b9aca6ed 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -310,6 +310,8 @@ STR_SORT_BY_RANGE :航続距離 STR_SORT_BY_POPULATION :人口 STR_SORT_BY_RATING :レーティング +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}ゲームをポーズします STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}ゲームスピードを早くします diff --git a/src/lang/korean.txt b/src/lang/korean.txt index dfd20b2d5f..690907cb55 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -317,6 +317,8 @@ STR_SORT_BY_RANGE :항속거리 STR_SORT_BY_POPULATION :인구 STR_SORT_BY_RATING :등급 +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}게임을 일시 정지합니다. STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}게임 시간을 빠르게 가도록 합니다. @@ -2251,7 +2253,7 @@ STR_CONTENT_OPEN_URL :{BLACK}웹 사 STR_CONTENT_OPEN_URL_TOOLTIP :{BLACK}이 컨텐츠의 웹 사이트를 방문합니다 STR_CONTENT_DOWNLOAD_CAPTION :{BLACK}다운로드 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP :{BLACK}선택한 콘텐츠의 다운로드를 시작합니다 -STR_CONTENT_TOTAL_DOWNLOAD_SIZE :{SILVER}다운로드 할 파일의 총 용량: {WHITE}{BYTES} +STR_CONTENT_TOTAL_DOWNLOAD_SIZE :{SILVER}다운로드할 파일의 총 용량: {WHITE}{BYTES} STR_CONTENT_DETAIL_TITLE :{SILVER}콘텐츠 정보 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED :{SILVER}이 콘텐츠를 선택하지 않았습니다 STR_CONTENT_DETAIL_SUBTITLE_SELECTED :{SILVER}이 콘텐츠를 다운로드하기 위해 선택하였습니다 @@ -2269,7 +2271,7 @@ STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF :{WHITE}{STRING} STR_CONTENT_DETAIL_DEPENDENCIES :{SILVER}필요한 요소: {WHITE}{STRING} STR_CONTENT_DETAIL_TAGS :{SILVER}태그: {WHITE}{STRING} STR_CONTENT_NO_ZLIB :{WHITE}OpenTTD가 "zlib" 지원 기능이 없는 상태에서 빌드되었습니다... -STR_CONTENT_NO_ZLIB_SUB :{WHITE}... 콘텐츠를 다운로드 할 수 없습니다! +STR_CONTENT_NO_ZLIB_SUB :{WHITE}... 콘텐츠를 다운로드할 수 없습니다! # Order of these is important! STR_CONTENT_TYPE_BASE_GRAPHICS :{G=m}기본 그래픽 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 05f0b6abac..7a8679dcd5 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -500,6 +500,8 @@ STR_SORT_BY_RANGE :Distantia volat STR_SORT_BY_POPULATION :Numero Incolarum STR_SORT_BY_RATING :Censione +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Ludum intermittere STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Ludum adcelerare diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index e14040c1a4..2167b56fdc 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -318,6 +318,8 @@ STR_SORT_BY_RANGE :apgabala STR_SORT_BY_POPULATION :iedzīvotāju skaita STR_SORT_BY_RATING :vērtējuma +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauzēt spēli STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Paātrināta spēle diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 49219c9c21..b91c6a471e 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -506,6 +506,8 @@ STR_SORT_BY_RANGE :atstumą STR_SORT_BY_POPULATION :populiaciją STR_SORT_BY_RATING :reitingą +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pristabdyti žaidimą STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Pagreitinti žaidimą diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index f73c886e49..595cb1dc16 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Längt STR_SORT_BY_POPULATION :Bevölkerung STR_SORT_BY_RATING :Rating +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Spill pausen STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Spill schnell lafe loossen diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 9cfa8578f7..0b61bdaf56 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -295,6 +295,8 @@ STR_SORT_BY_CARGO_CAPACITY :Muatan Kargo STR_SORT_BY_RANGE :Jarak STR_SORT_BY_POPULATION :Jumlah Penduduk +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Henti Sebentar Permainan STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Rancakkan permainan diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index f51737db28..76a9d49e38 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -317,6 +317,8 @@ STR_SORT_BY_RANGE :Rekkevidde STR_SORT_BY_POPULATION :Folketall STR_SORT_BY_RATING :Rangering +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Sett spillet på pause STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Dobbel hastighet på spillet diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index adf49f5051..9ae7bdfbfc 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -312,6 +312,8 @@ STR_SORT_BY_RANGE :Rekkevidde STR_SORT_BY_POPULATION :Innbyggjartal STR_SORT_BY_RATING :Vurdering +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pause STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Dobbel fart på spelet diff --git a/src/lang/polish.txt b/src/lang/polish.txt index d52d906291..34a674a772 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -695,6 +695,8 @@ STR_SORT_BY_RANGE :Zasięg STR_SORT_BY_POPULATION :Liczba mieszkańców STR_SORT_BY_RATING :Ocena +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauza STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Szybkie przemijanie czasu w grze diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index a98e24b917..f468725ecf 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -314,6 +314,8 @@ STR_SORT_BY_RANGE :Alcance STR_SORT_BY_POPULATION :População STR_SORT_BY_RATING :Classificação +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausa STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Aumentar velocidade do jogo diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index c79feefab0..6aabc5dfc3 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -313,6 +313,8 @@ STR_SORT_BY_RANGE :Raza de acțiun STR_SORT_BY_POPULATION :Populaţia STR_SORT_BY_RATING :Cotaţie +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauză joc STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Măreşte viteza de trecere a timpului diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 8ed26e1f4a..66ab819360 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -442,6 +442,8 @@ STR_SORT_BY_RANGE :Дальнос STR_SORT_BY_POPULATION :Население STR_SORT_BY_RATING :Рейтинг +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Пауза STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Ускорить игру diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 3c3b6a2afb..4b5d1ce3f6 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -498,6 +498,8 @@ STR_SORT_BY_RANGE :Dometu STR_SORT_BY_POPULATION :Naseljenosti STR_SORT_BY_RATING :Rejtingu +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauziranje partije STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Ubrzavanje igre diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 1b113ac767..dc26d6b43b 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :航行距离 STR_SORT_BY_POPULATION :人口 STR_SORT_BY_RATING :等级 +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}暂停游戏 STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}快速游戏模式 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 6fc4f02442..3c5a3da3e2 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -380,6 +380,8 @@ STR_SORT_BY_RANGE :Rozsah STR_SORT_BY_POPULATION :Populácia STR_SORT_BY_RATING :Hodnotenie +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pozastaviť hru STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Zrýchliť priebeh hry diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index a83f3bb4d0..8fb879315e 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -463,6 +463,8 @@ STR_SORT_BY_RANGE :Domet STR_SORT_BY_POPULATION :Prebivalstvo STR_SORT_BY_RATING :Ocena +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Premor STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Hitro naprej diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 05c2ad5129..22715e1666 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Alcance STR_SORT_BY_POPULATION :Población STR_SORT_BY_RATING :Calificación +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausar juego STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Avance rápido del juego diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index ee9c8ff37e..05beb7eb09 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Alcance STR_SORT_BY_POPULATION :Población STR_SORT_BY_RATING :Evaluación +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Poner en pausa STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Avance rápido diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 6f83e5d461..4875627f6e 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Räckvidd STR_SORT_BY_POPULATION :Folkmängd STR_SORT_BY_RATING :Värdering +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausa spelet STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Snabbspola spelet diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 4e7c33b86d..1f43ad1f88 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -309,6 +309,8 @@ STR_SORT_BY_RANGE :வரையற STR_SORT_BY_POPULATION :மக்கள் தொகை STR_SORT_BY_RATING :மதிப்பீடு +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}இடை நிறுத்து STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}அதி வேகமாக விளையாடு diff --git a/src/lang/thai.txt b/src/lang/thai.txt index bbc964690a..7d0a21e6da 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -303,6 +303,8 @@ STR_SORT_BY_RANGE :ช่วง STR_SORT_BY_POPULATION :ประชากร STR_SORT_BY_RATING :ความพึงพอใจ +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}หยุดเกมชั่วคราว STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}เร่งความเร็วเกม diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 85d8b1de4d..1be89fc1a9 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -310,6 +310,8 @@ STR_SORT_BY_RANGE :範圍 STR_SORT_BY_POPULATION :人口 STR_SORT_BY_RATING :評價 +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}暫停遊戲 STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}快轉遊戲 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index d9d664e957..b9c5a8c3c4 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -316,6 +316,8 @@ STR_SORT_BY_RANGE :Menzil STR_SORT_BY_POPULATION :Nüfus STR_SORT_BY_RATING :Değerlendirme +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Oyunu durdur STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Oyunu hızlandır diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 7811c4e7f0..f1cc85fcb1 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -440,6 +440,8 @@ STR_SORT_BY_RANGE :за дальн STR_SORT_BY_POPULATION :за населенням STR_SORT_BY_RATING :за рейтингом +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Пауза STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Прискорити гру diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index 701e9aa97b..58b66ecfdf 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -203,6 +203,8 @@ STR_SORT_BY_COST :Хак STR_SORT_BY_POWER :Хӑватлӑх STR_SORT_BY_POPULATION :Ҫынисем +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Вӑййи тӑхтав STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Вӑййи хӑвӑртлат diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 57f55e83bf..8c5957937d 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -310,6 +310,8 @@ STR_SORT_BY_RANGE :Beryk STR_SORT_BY_POPULATION :Ynwenners STR_SORT_BY_RATING :Rang +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Spul skoftsjen STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Tiid hurder rinne litte diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index d089320735..4637e7369f 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -255,6 +255,8 @@ STR_SORT_BY_FACILITY :Stacion-tipo STR_SORT_BY_POWER :Povo STR_SORT_BY_POPULATION :Populo +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauzas ludo STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Selekti diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 3884677880..12e81d3588 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -290,6 +290,8 @@ STR_SORT_BY_RANGE :опсег STR_SORT_BY_POPULATION :Населеност STR_SORT_BY_RATING :Рејтинг +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Паузирај ја играта STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Брзо нанапред играта diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index fccf5f42d1..af23b5ab47 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -241,6 +241,8 @@ STR_SORT_BY_CARGO_CAPACITY :Kapaċita ta' m STR_SORT_BY_RANGE :Kemm Twassal STR_SORT_BY_POPULATION :Popolazzjoni +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Waqfa temporanja mil-logħba STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Għaġġel il-loghba diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 488c016bc7..9519aeb7b5 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -291,6 +291,8 @@ STR_SORT_BY_RANGE :प्रका STR_SORT_BY_POPULATION :लोकसंख्या STR_SORT_BY_RATING :धारा +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK} खेळ स्थगित करा STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}जलद खेळ अग्रेषित diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index ffebcc9045..e342772d3e 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -300,6 +300,8 @@ STR_SORT_BY_RANGE :بازه STR_SORT_BY_POPULATION :جمعیت STR_SORT_BY_RATING :نرخ +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}وقفه موقت بازی STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}بالا بردن سرعت بازی diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 37edeb27eb..481ceb13be 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -298,6 +298,8 @@ STR_SORT_BY_CARGO_CAPACITY :سامان کی STR_SORT_BY_RANGE :پہنچ STR_SORT_BY_POPULATION :آبادی +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK} کھیل میں وقفھ لیجیئے STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK} کھیل کو تیزی سے بڑھایئں diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index aed29fab1a..6e1cf35b12 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -315,6 +315,8 @@ STR_SORT_BY_RANGE :Tầm xa STR_SORT_BY_POPULATION :Dân số STR_SORT_BY_RATING :Đánh giá +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Tạm dừng trò chơi STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Tua nhanh trò chơi diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 8f68d17a78..0fbb9efe9f 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -310,6 +310,8 @@ STR_SORT_BY_RANGE :Maes teithio STR_SORT_BY_POPULATION :Poblogaeth STR_SORT_BY_RATING :Gradd +# Group by options for vehicle list + # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Oedi'r gêm STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Cyflymu'r gêm From 3f606691a8f94e7626327ccd6b7293b3d39da743 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 22 Dec 2020 22:39:24 +0100 Subject: [PATCH 22/38] Add: [GitHub] PR template. (#8414) --- .github/PULL_REQUEST_TEMPLATE.md | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..1949f6f1f9 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,47 @@ +## Motivation / Problem + + + + +## Description + + + + +## Limitations + + + + +## Checklist for review + +Some things are not automated, and forgotten often. This list is a reminder for the reviewers. +* The bug fix is important enough to be backported? (label: 'backport requested') +* This PR affects the save game format? (label 'savegame upgrade') +* This PR affects the GS/AI API? (label 'needs review: Script API') + * ai_changelog.hpp, gs_changelog.hpp need updating. + * The compatibility wrappers (compat_*.nut) need updating. +* This PR affects the NewGRF API? (label 'needs review: NewGRF') + * [PR must be added to API tracker](https://wiki.openttd.org/en/Development/NewGRF/Specification%20Status) From 2e6f37ecf14aadc5669ed2662e08e923bfe093a7 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 23 Dec 2020 18:17:50 +0000 Subject: [PATCH 23/38] Update: Translations from eints arabic (egypt): 15 changes by AviationGamerX korean: 15 changes by telk5093 finnish: 12 changes by hpiirai --- src/lang/arabic_egypt.txt | 15 +++++++++++++++ src/lang/finnish.txt | 13 ++++++++++++- src/lang/korean.txt | 19 +++++++++++++++---- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index a0df0f04e4..4e105d4bdb 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -448,9 +448,11 @@ STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :توقل كونسول STR_ABOUT_MENU_AI_DEBUG :مكتشف اخطاء الذكاء الصناعي STR_ABOUT_MENU_SCREENSHOT :صورة من الشاشة - Ctrl-S - +STR_ABOUT_MENU_SHOW_FRAMERATE :سرعة عرض الإطارات STR_ABOUT_MENU_ABOUT_OPENTTD :حول 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :موائم العفريتات STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :اضهار /اخفاء مربح الحوارات/الخيارات +STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :تبديل ألوان الكتل المتسخة ############ range ends here ############ range for ordinal numbers used for the place in the highscore window @@ -1079,6 +1081,8 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT :يسار STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER :متوسط STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT :يمين +STR_CONFIG_SETTING_CONSTRUCTION_SPEED ::سرعة البناء {STRING} +STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS ::تعطلات العربة {STRING} STR_CONFIG_SETTING_AUTOSLOPE :السماح بتحريك الأرض تحت المباني, الطرق, الخ : {STRING} STR_CONFIG_SETTING_CATCHMENT :السماح بحدود اكثر واقعية للمحطات بحسب الحجم: {STRING} @@ -1127,6 +1131,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW_ON :لكل العر STR_CONFIG_SETTING_WARN_INCOME_LESS :حذر عندما يكون الدخل سالبا :{STRING} STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :المركبات لا تنتهي صلاحيتها ابدا : {STRING} STR_CONFIG_SETTING_AUTORENEW_VEHICLE :جدد العربات عندما تصبح قديمة : {STRING} +STR_CONFIG_SETTING_AUTORENEW_VEHICLE_HELPTEXT :عند التمكين ، يتم استبدال العربة التي اقتربت من نهاية عمرها عند اكتمال شروط التجديد STR_CONFIG_SETTING_AUTORENEW_MONEY :التجديد التلقائي عند توفر السيولة الدنيا للتجديد: {STRING} STR_CONFIG_SETTING_POPULATION_IN_LABEL :أعرض عدد السكان مع الاسم على العلامة: {STRING} STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :سمك الخطوط في العرض: {STRING} @@ -1251,6 +1256,7 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :السماح ب STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES :#opcodes قبل تعليق الاسكربت: {STRING} STR_CONFIG_SETTING_SERVINT_ISPERCENT :فترات الصيانة بالنسبة المئوية : {STRING} +STR_CONFIG_SETTING_SERVINT_AIRCRAFT ::مدة فحص الطائرة الإفتراضي{STRING} STR_CONFIG_SETTING_NOSERVICE :الغاء الصيانة عندما يكون التعطيل للمركبات غير مفعل: {STRING} STR_CONFIG_SETTING_WAGONSPEEDLIMITS :السماح بتحديد سرعة العربات: {STRING} STR_CONFIG_SETTING_DISABLE_ELRAILS :تعطيل سكة القطار الكهربائي: {STRING} @@ -1339,6 +1345,7 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :مضاعف ال +STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :م) متري) STR_CONFIG_SETTING_GRAPHICS :رسوميات {ORANGE} STR_CONFIG_SETTING_SOUND :{ORANGE}الصوت @@ -2177,6 +2184,8 @@ STR_INDUSTRY_DISPLAY_CHAIN :{BLACK}اعرض STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}اعرض المصانع التي تمد و تقبل البضائع STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP :{BLACK}اربط بالخريطة المصغرة STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP :{BLACK}اعرض المصانع المختارة في الخرائط المصغرة ايضا. +STR_INDUSTRY_CARGOES_SELECT_CARGO :{BLACK}اختر البضائع +STR_INDUSTRY_CARGOES_SELECT_INDUSTRY :{BLACK}اختر الصناعة # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}معلومات ارض @@ -2200,6 +2209,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}اسم STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}الشحنة المقبولة: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA} /8 {STRING}) +STR_LANG_AREA_INFORMATION_ROAD_TYPE :{BLACK}:نوع الطريق {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}حدود سرعة سكة الحديد: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}حدود سرعه الطريق: {LTBLUE}{VELOCITY} @@ -2795,6 +2805,7 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}وسط STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}نسبة الانتاج: {YELLOW}{COMMA}% +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}:يتطلب STR_CONFIG_GAME_PRODUCTION :{WHITE}تغيير الانتاج مضاعف من 8 الى 2040 STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}غير مستوى الانتاج{}نسبة مئوية حتى 800%. @@ -2904,6 +2915,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}شراء STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}شراء سفينة STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}شراء طائرة +STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}شراء العربة وتجديد بضائعها STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}شراء العربة الموضحة STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}شراء العربة @@ -2923,6 +2935,7 @@ STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}اعاد +STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK} تبيدل بين إخفاء / عرض نوع الطائرة STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}اعادة تسمية عربات القطار STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}اعادة تسمية العربة @@ -3050,6 +3063,7 @@ STR_REPLACE_ELRAIL_VEHICLES :سكة حديد STR_REPLACE_MONORAIL_VEHICLES :عربات احادية السكة STR_REPLACE_MAGLEV_VEHICLES :مركبات ممغنطة +STR_REPLACE_TRAM_VEHICLES :مركبات الترام STR_REPLACE_REMOVE_WAGON :{BLACK} إزالة العربات: {ORANGE}{STRING} STR_REPLACE_REMOVE_WAGON_HELP :{BLACK} المحافظة على طول القطار بازالة عربات ابتداء من المقدمة عند التبديل - عندما يكون التبدل ينتج قطارا اطول. @@ -3628,6 +3642,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200 :{WHITE}... يم STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... يمكن بنائة في الغابات المطيرة فقط STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... يمكن بنائة في المناطق الصحراوية فقط STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... يبنى فقط في المدن +STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER :{WHITE}... لا يمكن بناؤها إلا بقرب وسط المدن STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS :{WHITE}... يمكن بنائه في المناطق المنخفضة فقط STR_ERROR_CAN_ONLY_BE_POSITIONED :{WHITE}... يمكن بنائة على اطراف الخريطة فقط STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... يمكن زراعة الغابة فوق خط الثلج فقط diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 646eed3432..6f0758deea 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -315,8 +315,15 @@ STR_SORT_BY_CARGO_CAPACITY :Rahtikapasiteet STR_SORT_BY_RANGE :Toimintasäde STR_SORT_BY_POPULATION :Asukasluku STR_SORT_BY_RATING :Arvio +STR_SORT_BY_NUM_VEHICLES :Kulkuneuvojen määrä +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Kokonaistuotto viime vuonna +STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :Kokonaistuotto tänä vuonna +STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :Keskimääräinen tuotto viime vuonna +STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :Keskimääräinen tuotto tänä vuonna # Group by options for vehicle list +STR_GROUP_BY_NONE :Ei mitään +STR_GROUP_BY_SHARED_ORDERS :Jaetut käskyt # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Tauko @@ -773,6 +780,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Näytä STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Näytä viimeisin viesti tai uutisraportti STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * TAUKO * * +STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * TAUKO (odotetaan yhteyskuvaajan päivittymistä) * * STR_STATUSBAR_AUTOSAVE :{RED}AUTOMAATTITALLENNUS STR_STATUSBAR_SAVING_GAME :{RED}* * TALLENNETAAN PELIÄ * * @@ -2210,11 +2218,13 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :Peli yhä pysä STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :Peli yhä pysäytetty ({STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5 :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED :Peliä jatketaan ({STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :pelaajien määrä STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :yhdistäviä pelaajia STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :manuaalinen STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT :peliskripti +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :odotetaan yhteyskuvaajan päivittymistä ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :poistutaan STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} on liittynyt peliin @@ -4243,10 +4253,11 @@ STR_ERROR_UNABLE_TO_DELETE_FILE :{WHITE}Tiedosto STR_ERROR_GAME_LOAD_FAILED :{WHITE}Lataus epäonnistui.{}{STRING} STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Sisäinen virhe: {STRING} STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME :Viallinen tallennus – {STRING} -STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Tallennus on tehty uudemalla versiolla +STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Tallennus on tehty uudemmalla versiolla STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Tiedostoa ei voi lukea STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Tiedostoa ei voi kirjoittaa STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Tietojen varmistustarkistus epäonnistui +STR_GAME_SAVELOAD_ERROR_PATCHPACK :Tallennus on tehty muokatulla versiolla STR_GAME_SAVELOAD_NOT_AVAILABLE : STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Peli tallennettiin versiossa, joka ei tue raitiovaunuja. Kaikki raitiovaunut on poistettu diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 690907cb55..12f4257cb1 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -316,8 +316,15 @@ STR_SORT_BY_CARGO_CAPACITY :화물 수송 STR_SORT_BY_RANGE :항속거리 STR_SORT_BY_POPULATION :인구 STR_SORT_BY_RATING :등급 +STR_SORT_BY_NUM_VEHICLES :차량 수 +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :작년 총 이익 +STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :올해 총 이익 +STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :작년 평균 이익 +STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :올해 평균 이익 # Group by options for vehicle list +STR_GROUP_BY_NONE :없음 +STR_GROUP_BY_SHARED_ORDERS :공유된 경로 # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}게임을 일시 정지합니다. @@ -774,6 +781,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}모든 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}마지막 메시지/뉴스 보기 STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * 일시 정지 * * +STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * 일시 정지됨 (연결 상태가 업데이트되기를 기다리는 중) * * STR_STATUSBAR_AUTOSAVE :{RED}자동 저장 STR_STATUSBAR_SAVING_GAME :{RED}* * 게임 저장 중 * * @@ -2207,15 +2215,17 @@ STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION :{WHITE}마지 STR_NETWORK_SERVER_MESSAGE :*** {1:STRING} ############ Leave those lines in this order!! STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED :게임이 일시 정지되었습니다. ({STRING}) -STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :게임이 아직 일시 정지된 상태입니다. ({STRING}) -STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING}) -STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING}, {STRING}) -STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :게임이 아직 일시 정지된 상태입니다 ({STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5 :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}, {STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED :게임이 재개되었습니다. ({STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :플레이하는 사람 수 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :접속자와 연결중 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :수동 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT :게임 스크립트 +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :연결 상태가 업데이트되기를 기다리는 중 ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :게임 종료 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} 님이 입장하셨습니다 @@ -4248,6 +4258,7 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :상위 버전 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :파일을 읽을 수 없습니다 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :파일을 쓸 수 없습니다 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :데이터 무결성 검사에 실패하였습니다 +STR_GAME_SAVELOAD_ERROR_PATCHPACK :수정된 버전의 게임 저장 파일입니다 STR_GAME_SAVELOAD_NOT_AVAILABLE :<사용 불가능> STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}전차를 지원하지 않는 버전으로 게임이 저장되었습니다. 모든 전차는 제거되었습니다. From ad47e3d9e6d07e5ee60a53ff53a8671058680da7 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 24 Dec 2020 18:19:47 +0000 Subject: [PATCH 24/38] Update: Translations from eints finnish: 1 change by hpiirai --- src/lang/finnish.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 6f0758deea..712643addc 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -4257,7 +4257,7 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Tallennus on te STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Tiedostoa ei voi lukea STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Tiedostoa ei voi kirjoittaa STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Tietojen varmistustarkistus epäonnistui -STR_GAME_SAVELOAD_ERROR_PATCHPACK :Tallennus on tehty muokatulla versiolla +STR_GAME_SAVELOAD_ERROR_PATCHPACK :Tallennus on tehty muunnellulla versiolla STR_GAME_SAVELOAD_NOT_AVAILABLE : STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Peli tallennettiin versiossa, joka ei tue raitiovaunuja. Kaikki raitiovaunut on poistettu From 94d629d79bcd623a5c77daa3db742cd8fd43d7b4 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 24 Dec 2020 23:36:36 +0000 Subject: [PATCH 25/38] Change: [Linkgraph] Allow job threads to be aborted early when clearing schedule (#8416) When link graph jobs are cleared due to abandoning the game or exiting, flag the job as aborted. The link graph job running in a separate thread checks the aborted flag periodically and terminates processing early if set. This reduces the delay at game abandon or exit if a long-running job would otherwise still be running. --- src/linkgraph/linkgraphjob.cpp | 8 +++++++- src/linkgraph/linkgraphjob.h | 18 +++++++++++++++++- src/linkgraph/linkgraphschedule.cpp | 3 ++- src/linkgraph/mcf.cpp | 4 ++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/linkgraph/linkgraphjob.cpp b/src/linkgraph/linkgraphjob.cpp index c66ddeac79..e23c23b479 100644 --- a/src/linkgraph/linkgraphjob.cpp +++ b/src/linkgraph/linkgraphjob.cpp @@ -38,7 +38,8 @@ LinkGraphJob::LinkGraphJob(const LinkGraph &orig) : link_graph(orig), settings(_settings_game.linkgraph), join_date(_date + _settings_game.linkgraph.recalc_time), - job_completed(false) + job_completed(false), + job_aborted(false) { } @@ -92,6 +93,11 @@ LinkGraphJob::~LinkGraphJob() * Accessing other pools may be invalid. */ if (CleaningPool()) return; + /* If the job has been aborted, the job state is invalid. + * This should never be reached, as once the job has been marked as aborted + * the only valid job operation is to clear the LinkGraphJob pool. */ + assert(!this->IsJobAborted()); + /* Link graph has been merged into another one. */ if (!LinkGraph::IsValidID(this->link_graph.index)) return; diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h index ab5e07fb18..7643659212 100644 --- a/src/linkgraph/linkgraphjob.h +++ b/src/linkgraph/linkgraphjob.h @@ -63,6 +63,7 @@ protected: NodeAnnotationVector nodes; ///< Extra node data necessary for link graph calculation. EdgeAnnotationMatrix edges; ///< Extra edge data necessary for link graph calculation. std::atomic job_completed; ///< Is the job still running. This is accessed by multiple threads and reads may be stale. + std::atomic job_aborted; ///< Has the job been aborted. This is accessed by multiple threads and reads may be stale. void EraseFlows(NodeID from); void JoinThread(); @@ -267,7 +268,7 @@ public: * settings have to be brutally const-casted in order to populate them. */ LinkGraphJob() : settings(_settings_game.linkgraph), - join_date(INVALID_DATE), job_completed(false) {} + join_date(INVALID_DATE), job_completed(false), job_aborted(false) {} LinkGraphJob(const LinkGraph &orig); ~LinkGraphJob(); @@ -281,6 +282,21 @@ public: */ inline bool IsJobCompleted() const { return this->job_completed.load(std::memory_order_acquire); } + /** + * Check if job has been aborted. + * This is allowed to spuriously return false incorrectly, but is not allowed to incorrectly return true. + * @return True if job has been aborted. + */ + inline bool IsJobAborted() const { return this->job_aborted.load(std::memory_order_acquire); } + + /** + * Abort job. + * The job may exit early at the next available opportunity. + * After this method has been called the state of the job is undefined, and the only valid operation + * is to join the thread and discard the job data. + */ + inline void AbortJob() { this->job_aborted.store(true, std::memory_order_release); } + /** * Check if job is supposed to be finished. * @return True if job should be finished by now, false if not. diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp index 87ab4818a1..ce28ec3d85 100644 --- a/src/linkgraph/linkgraphschedule.cpp +++ b/src/linkgraph/linkgraphschedule.cpp @@ -86,6 +86,7 @@ void LinkGraphSchedule::JoinNext() /* static */ void LinkGraphSchedule::Run(LinkGraphJob *job) { for (uint i = 0; i < lengthof(instance.handlers); ++i) { + if (job->IsJobAborted()) return; instance.handlers[i]->Run(*job); } @@ -119,7 +120,7 @@ void LinkGraphSchedule::SpawnAll() /* static */ void LinkGraphSchedule::Clear() { for (JobList::iterator i(instance.running.begin()); i != instance.running.end(); ++i) { - (*i)->JoinThread(); + (*i)->AbortJob(); } instance.running.clear(); instance.schedule.clear(); diff --git a/src/linkgraph/mcf.cpp b/src/linkgraph/mcf.cpp index c8c031ea3b..ea10409417 100644 --- a/src/linkgraph/mcf.cpp +++ b/src/linkgraph/mcf.cpp @@ -528,7 +528,7 @@ MCF1stPass::MCF1stPass(LinkGraphJob &job) : MultiCommodityFlow(job) finished_sources[source] = !source_demand_left; this->CleanupPaths(source, paths); } - } while (more_loops || this->EliminateCycles()); + } while ((more_loops || this->EliminateCycles()) && !job.IsJobAborted()); } /** @@ -544,7 +544,7 @@ MCF2ndPass::MCF2ndPass(LinkGraphJob &job) : MultiCommodityFlow(job) uint accuracy = job.Settings().accuracy; bool demand_left = true; std::vector finished_sources(size); - while (demand_left) { + while (demand_left && !job.IsJobAborted()) { demand_left = false; for (NodeID source = 0; source < size; ++source) { if (finished_sources[source]) continue; From 04e572933d3752ee23d14206a78e3d944ca42c2f Mon Sep 17 00:00:00 2001 From: Pavel Stupnikov Date: Fri, 25 Dec 2020 02:36:45 +0300 Subject: [PATCH 26/38] Fix: Don't lower tree density if spreading is not enabled (#8413) --- src/tree_cmd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index cdc9869207..8c7f9ea31f 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -681,7 +681,7 @@ static void TileLoop_Trees(TileIndex tile) break; case 1: // add a tree - if (GetTreeCount(tile) < 4) { + if (GetTreeCount(tile) < 4 && CanPlantExtraTrees(tile)) { AddTreeCount(tile, 1); SetTreeGrowth(tile, 0); break; @@ -713,13 +713,13 @@ static void TileLoop_Trees(TileIndex tile) break; case 6: // final stage of tree destruction - if (GetTreeCount(tile) > 1) { + if (!CanPlantExtraTrees(tile)) { + /* if trees can't spread just plant a new one to prevent deforestation */ + SetTreeGrowth(tile, 0); + } else if (GetTreeCount(tile) > 1) { /* more than one tree, delete it */ AddTreeCount(tile, -1); SetTreeGrowth(tile, 3); - } else if (!CanPlantExtraTrees(tile)) { - /* if trees can't spread just plant a new one to prevent deforestation */ - SetTreeGrowth(tile, 0); } else { /* just one tree, change type into MP_CLEAR */ switch (GetTreeGround(tile)) { From 22b9dec9603bf2a06fb13347b49527c7920e59dc Mon Sep 17 00:00:00 2001 From: Pavel Stupnikov Date: Fri, 25 Dec 2020 02:36:54 +0300 Subject: [PATCH 27/38] Feature: Add an option to disable tree growth completely (#8415) --- src/lang/english.txt | 7 ++++--- src/table/settings.ini | 4 ++-- src/tree_cmd.cpp | 20 ++++++++++++-------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 04399d9a45..93d5352ed2 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1620,9 +1620,10 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :In game placement of trees: {STRING2} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Control random appearance of trees during the game. This might affect industries which rely on tree growth, for example lumber mills -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :None {RED}(breaks lumber mill) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Only in rain forests -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Everywhere +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Grow but don't spread {RED}(breaks lumber mill) +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Grow but only spread in rain forests +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Grow and spread everywhere +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Don't grow, don't spread {RED}(breaks lumber mill) STR_CONFIG_SETTING_TOOLBAR_POS :Position of main toolbar: {STRING2} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontal position of the main toolbar at the top of the screen diff --git a/src/table/settings.ini b/src/table/settings.ini index cca6a99bf8..f082567661 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2391,10 +2391,10 @@ from = SLV_132 guiflags = SGF_MULTISTRING def = 2 min = 0 -max = 2 +max = 3 str = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT strhelp = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT -strval = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE +strval = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD cat = SC_BASIC [SDT_VAR] diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index 8c7f9ea31f..c40df4394c 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -42,9 +42,10 @@ enum TreePlacer { /** Where to place trees while in-game? */ enum ExtraTreePlacement { - ETP_NONE, ///< Place trees on no tiles - ETP_RAINFOREST, ///< Place trees only on rainforest tiles - ETP_ALL, ///< Place trees on all tiles + ETP_NO_SPREAD, ///< Grow trees on tiles that have them but don't spread to new ones + ETP_SPREAD_RAINFOREST, ///< Grow trees on tiles that have them, only spread to new ones in rainforests + ETP_SPREAD_ALL, ///< Grow trees and spread them without restrictions + ETP_NO_GROWTH_NO_SPREAD, ///< Don't grow trees and don't spread them at all }; /** Determines when to consider building more trees. */ @@ -635,8 +636,8 @@ static void TileLoopTreesAlps(TileIndex tile) static bool CanPlantExtraTrees(TileIndex tile) { return ((_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_RAINFOREST) ? - _settings_game.construction.extra_tree_placement != ETP_NONE : - _settings_game.construction.extra_tree_placement == ETP_ALL); + (_settings_game.construction.extra_tree_placement == ETP_SPREAD_ALL || _settings_game.construction.extra_tree_placement == ETP_SPREAD_RAINFOREST) : + _settings_game.construction.extra_tree_placement == ETP_SPREAD_ALL); } static void TileLoop_Trees(TileIndex tile) @@ -662,6 +663,9 @@ static void TileLoop_Trees(TileIndex tile) MarkTileDirtyByTile(tile); } } + + if (_settings_game.construction.extra_tree_placement == ETP_NO_GROWTH_NO_SPREAD) return; + if (GetTreeCounter(tile) < 15) { AddTreeCounter(tile, 1); return; @@ -755,8 +759,8 @@ static void TileLoop_Trees(TileIndex tile) void OnTick_Trees() { - /* Don't place trees if that's not allowed */ - if (_settings_game.construction.extra_tree_placement == ETP_NONE) return; + /* Don't spread trees if that's not allowed */ + if (_settings_game.construction.extra_tree_placement == ETP_NO_SPREAD || _settings_game.construction.extra_tree_placement == ETP_NO_GROWTH_NO_SPREAD) return; uint32 r; TileIndex tile; @@ -771,7 +775,7 @@ void OnTick_Trees() } /* byte underflow */ - if (--_trees_tick_ctr != 0 || _settings_game.construction.extra_tree_placement != ETP_ALL) return; + if (--_trees_tick_ctr != 0 || _settings_game.construction.extra_tree_placement == ETP_SPREAD_RAINFOREST) return; /* place a tree at a random spot */ r = Random(); From 7bdfb382a89145ea3ce6c89992eacd0ec676babd Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Thu, 24 Dec 2020 18:37:13 -0500 Subject: [PATCH 28/38] Change: Towns don't build dead-end road bridges (#8401) --- src/town_cmd.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 374601cad2..ff63b613f5 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1087,6 +1087,48 @@ static bool GrowTownWithRoad(const Town *t, TileIndex tile, RoadBits rcmd) return false; } +/** + * Checks if a town road can be continued on the other side of a bridge. + * + * @param end_tile The end tile of the bridge + * @param bridge_dir The direction of the bridge + * @return true if the road can be continued, else false + */ +static bool CanRoadContinueAfterBridge(const Town* t, const TileIndex end_tile, const DiagDirection bridge_dir) +{ + const int delta = TileOffsByDiagDir(bridge_dir); // +1 tile in the direction of the bridge + TileIndex next_tile = end_tile + delta; // The tile beyond the bridge + RoadBits rcmd = DiagDirToRoadBits(ReverseDiagDir(bridge_dir)); + RoadType rt = GetTownRoadType(t); + + /* Before we try anything, make sure the tile is on the map and not the void. */ + if (!IsValidTile(next_tile)) return false; + + /* If the next tile is a bridge or tunnel, allow if it's a road bridge/tunnel continuing in the same direction. */ + if (IsTileType(next_tile, MP_TUNNELBRIDGE)) { + return GetTunnelBridgeTransportType(next_tile) == TRANSPORT_ROAD && GetTunnelBridgeDirection(next_tile) == bridge_dir; + } + + /* If the next tile is a station, allow if it's a road station facing the proper direction. Otherwise return false. */ + if (IsTileType(next_tile, MP_STATION)) { + /* If the next tile is a road station, allow if it's facing the same direction, otherwise disallow. */ + return IsRoadStop(next_tile) && GetRoadStopDir(next_tile) == ReverseDiagDir(bridge_dir); + } + + /* If the next tile is a road depot, allow if it's facing the new bridge. */ + if (IsTileType(next_tile, MP_ROAD)) { + return IsRoadDepot(next_tile) && GetRoadDepotDirection(next_tile) == ReverseDiagDir(bridge_dir); + } + + /* If the next tile is a railroad track, check if towns are allowed to build level crossings. + * If level crossing are not allowed, reject the bridge. Else allow DoCommand to determine if the rail track is buildable. */ + if (IsTileType(next_tile, MP_RAILWAY) && !_settings_game.economy.allow_town_level_crossings) return false; + + /* If a road tile can be built, the bridge is allowed. + * If not, the bridge is rejected. */ + return DoCommand(next_tile, rcmd | (rt << 4), t->index, DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD).Succeeded(); +} + /** * Grows the town with a bridge. * At first we check if a bridge is reasonable. @@ -1136,9 +1178,12 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi } while (IsValidTile(bridge_tile) && (IsWaterTile(bridge_tile) || IsPlainRailTile(bridge_tile) || (IsNormalRoadTile(bridge_tile) && GetDisallowedRoadDirections(bridge_tile) != DRD_NONE))); } - /* no water tiles in between? */ + /* Don't allow a bridge where the start and end tiles are adjacent with no span between. */ if (bridge_length == 1) return false; + /* Make sure the road can be continued past the bridge. At this point, bridge_tile holds the end tile of the bridge. */ + if (!CanRoadContinueAfterBridge(t, bridge_tile, bridge_dir)) return false; + for (uint8 times = 0; times <= 22; times++) { byte bridge_type = RandomRange(MAX_BRIDGES - 1); @@ -1154,7 +1199,6 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi return false; } - /** * Checks whether at least one surrounding roads allows to build a house here * From 2bb691f50e79164d2dfc63a2b0103893314df90f Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 24 Dec 2020 19:00:53 +0100 Subject: [PATCH 29/38] Change: Remove the LAN/Internet combobox from the server list in favour of adding two separate search buttons. --- src/lang/english.txt | 12 +++--- src/network/network_gui.cpp | 71 ++++++------------------------------ src/settings_type.h | 1 - src/table/settings.ini | 9 ----- src/widgets/network_widget.h | 5 +-- 5 files changed, 19 insertions(+), 79 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 93d5352ed2..1683604aac 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1947,10 +1947,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}This is the name other players will identify you by @@ -1991,8 +1987,10 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Join gam STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Refresh server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Refresh the server info -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Find server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Search network for a server +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :{BLACK}Search internet +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Search internet for public servers +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN :{BLACK}Search LAN +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Search local area network for servers STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Add server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adds a server to the list which will always be checked for running games STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server @@ -2009,6 +2007,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}The game STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Set password STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protect your game with a password if you don't want it to be publicly accessible +STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised +STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Yes STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s} diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 47bf8fb69c..b6449b5246 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -55,15 +55,6 @@ static const StringID _connection_types_dropdown[] = { INVALID_STRING_ID }; -/** - * Advertisement options in the server list - */ -static const StringID _lan_internet_types_dropdown[] = { - STR_NETWORK_SERVER_LIST_ADVERTISED_NO, - STR_NETWORK_SERVER_LIST_ADVERTISED_YES, - INVALID_STRING_ID -}; - static std::vector _language_dropdown; void SortNetworkLanguages() @@ -503,27 +494,12 @@ public: this->last_sorting = this->servers.GetListing(); } - void SetStringParameters(int widget) const override - { - switch (widget) { - case WID_NG_CONN_BTN: - SetDParam(0, _lan_internet_types_dropdown[_settings_client.network.lan_internet]); - break; - } - } - void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override { switch (widget) { - case WID_NG_CONN_BTN: - *size = maxdim(*size, maxdim(GetStringBoundingBox(_lan_internet_types_dropdown[0]), GetStringBoundingBox(_lan_internet_types_dropdown[1]))); - size->width += padding.width; - size->height += padding.height; - break; - case WID_NG_MATRIX: resize->height = WD_MATRIX_TOP + max(GetSpriteSize(SPR_BLOT).height, (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM; - size->height = 10 * resize->height; + size->height = 12 * resize->height; break; case WID_NG_LASTJOINED: @@ -560,10 +536,6 @@ public: SetDParamMaxValue(0, 5); *size = maxdim(*size, GetStringBoundingBox(STR_JUST_INT)); break; - - case WID_NG_DETAILS_SPACER: - size->height = 20 + 12 * FONT_HEIGHT_NORMAL; - break; } } @@ -627,7 +599,8 @@ public: this->GetWidget(WID_NG_NEWGRF_MISSING_SEL)->SetDisplayedPlane(sel == nullptr || !sel->online || sel->info.grfconfig == nullptr || !sel->info.version_compatible || sel->info.compatible); #ifdef __EMSCRIPTEN__ - this->SetWidgetDisabledState(WID_NG_FIND, true); + this->SetWidgetDisabledState(WID_NG_SEARCH_INTERNET, true); + this->SetWidgetDisabledState(WID_NG_SEARCH_LAN, true); this->SetWidgetDisabledState(WID_NG_ADD, true); this->SetWidgetDisabledState(WID_NG_START, true); #endif @@ -715,10 +688,6 @@ public: DeleteWindowById(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME); break; - case WID_NG_CONN_BTN: // 'Connection' droplist - ShowDropDownMenu(this, _lan_internet_types_dropdown, _settings_client.network.lan_internet, WID_NG_CONN_BTN, 0, 0); // do it for widget WID_NSS_CONN_BTN - break; - case WID_NG_NAME: // Sort by name case WID_NG_CLIENTS: // Sort by connected clients case WID_NG_MAPSIZE: // Sort by map size @@ -763,11 +732,12 @@ public: break; } - case WID_NG_FIND: // Find server automatically - switch (_settings_client.network.lan_internet) { - case 0: NetworkUDPSearchGame(); break; - case 1: NetworkUDPQueryMasterServer(); break; - } + case WID_NG_SEARCH_INTERNET: + NetworkUDPQueryMasterServer(); + break; + + case WID_NG_SEARCH_LAN: + NetworkUDPSearchGame(); break; case WID_NG_ADD: // Add a server @@ -805,20 +775,6 @@ public: } } - void OnDropdownSelect(int widget, int index) override - { - switch (widget) { - case WID_NG_CONN_BTN: - _settings_client.network.lan_internet = index; - break; - - default: - NOT_REACHED(); - } - - this->SetDirty(); - } - /** * Some data on this window has become invalid. * @param data Information about the changed data. @@ -964,12 +920,6 @@ static const NWidgetPart _nested_network_game_widgets[] = { NWidget(NWID_HORIZONTAL), SetPIP(10, 7, 10), /* LEFT SIDE */ NWidget(NWID_VERTICAL), SetPIP(0, 7, 0), - NWidget(NWID_HORIZONTAL), SetPIP(0, 7, 0), - NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NG_CONNECTION), SetDataTip(STR_NETWORK_SERVER_LIST_ADVERTISED, STR_NULL), - NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NG_CONN_BTN), - SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP), - NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0), - EndContainer(), NWidget(NWID_HORIZONTAL), SetPIP(0, 7, 0), NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NG_FILTER_LABEL), SetDataTip(STR_LIST_FILTER_TITLE, STR_NULL), NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, WID_NG_FILTER), SetMinimalSize(251, 12), SetFill(1, 0), SetResize(1, 0), @@ -1029,7 +979,8 @@ static const NWidgetPart _nested_network_game_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(NWID_VERTICAL), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 7, 4), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_FIND), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_FIND_SERVER, STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_SEARCH_INTERNET), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET, STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_SEARCH_LAN), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN, STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_ADD), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_ADD_SERVER, STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_START), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_START_SERVER, STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_CANCEL), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_CANCEL, STR_NULL), diff --git a/src/settings_type.h b/src/settings_type.h index 2dbca59d82..5729a50bea 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -255,7 +255,6 @@ struct NetworkSettings { char rcon_password[NETWORK_PASSWORD_LENGTH]; ///< password for rconsole (server side) char admin_password[NETWORK_PASSWORD_LENGTH]; ///< password for the admin network bool server_advertise; ///< advertise the server to the masterserver - uint8 lan_internet; ///< search on the LAN or internet for servers char client_name[NETWORK_CLIENT_NAME_LENGTH]; ///< name of the player (as client) char default_company_pass[NETWORK_PASSWORD_LENGTH]; ///< default password for new companies in encrypted form char connect_to_ip[NETWORK_HOSTNAME_LENGTH]; ///< default for the "Add server" query diff --git a/src/table/settings.ini b/src/table/settings.ini index f082567661..320786751a 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -3801,15 +3801,6 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC guiflags = SGF_NETWORK_ONLY def = false -[SDTC_VAR] -var = network.lan_internet -type = SLE_UINT8 -flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC -guiflags = SGF_NETWORK_ONLY -def = 1 -min = 0 -max = 1 - [SDTC_STR] var = network.client_name type = SLE_STRB diff --git a/src/widgets/network_widget.h b/src/widgets/network_widget.h index 23ea95a61a..8372b6360d 100644 --- a/src/widgets/network_widget.h +++ b/src/widgets/network_widget.h @@ -14,8 +14,6 @@ enum NetworkGameWidgets { WID_NG_MAIN, ///< Main panel. - WID_NG_CONNECTION, ///< Label in front of connection droplist. - WID_NG_CONN_BTN, ///< 'Connection' droplist button. WID_NG_CLIENT_LABEL, ///< Label in front of client name edit box. WID_NG_CLIENT, ///< Panel with editbox to set client name. WID_NG_FILTER_LABEL, ///< Label in front of the filter/search edit box. @@ -45,7 +43,8 @@ enum NetworkGameWidgets { WID_NG_NEWGRF_MISSING, ///< 'Find missing NewGRF online' button. WID_NG_NEWGRF_MISSING_SEL, ///< Selection widget for the above button. - WID_NG_FIND, ///< 'Find server' button. + WID_NG_SEARCH_INTERNET, ///< 'Search internet server' button. + WID_NG_SEARCH_LAN, ///< 'Search LAN server' button. WID_NG_ADD, ///< 'Add server' button. WID_NG_START, ///< 'Start server' button. WID_NG_CANCEL, ///< 'Cancel' button. From ba49fa3b820923512b26b7ec184c33aa3016e1dd Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 24 Dec 2020 19:05:45 +0100 Subject: [PATCH 30/38] Codechange: Rename strings to match their usage. --- src/lang/afrikaans.txt | 4 ++-- src/lang/belarusian.txt | 4 ++-- src/lang/brazilian_portuguese.txt | 4 ++-- src/lang/bulgarian.txt | 4 ++-- src/lang/catalan.txt | 4 ++-- src/lang/croatian.txt | 4 ++-- src/lang/czech.txt | 4 ++-- src/lang/danish.txt | 4 ++-- src/lang/dutch.txt | 4 ++-- src/lang/english.txt | 4 ++-- src/lang/english_AU.txt | 4 ++-- src/lang/english_US.txt | 4 ++-- src/lang/estonian.txt | 4 ++-- src/lang/finnish.txt | 4 ++-- src/lang/french.txt | 4 ++-- src/lang/gaelic.txt | 4 ++-- src/lang/galician.txt | 4 ++-- src/lang/german.txt | 4 ++-- src/lang/greek.txt | 4 ++-- src/lang/hebrew.txt | 4 ++-- src/lang/hungarian.txt | 4 ++-- src/lang/indonesian.txt | 4 ++-- src/lang/irish.txt | 4 ++-- src/lang/italian.txt | 4 ++-- src/lang/japanese.txt | 4 ++-- src/lang/korean.txt | 4 ++-- src/lang/latin.txt | 4 ++-- src/lang/latvian.txt | 4 ++-- src/lang/lithuanian.txt | 4 ++-- src/lang/luxembourgish.txt | 4 ++-- src/lang/norwegian_bokmal.txt | 4 ++-- src/lang/norwegian_nynorsk.txt | 4 ++-- src/lang/polish.txt | 4 ++-- src/lang/portuguese.txt | 4 ++-- src/lang/romanian.txt | 4 ++-- src/lang/russian.txt | 4 ++-- src/lang/serbian.txt | 4 ++-- src/lang/simplified_chinese.txt | 4 ++-- src/lang/slovak.txt | 4 ++-- src/lang/slovenian.txt | 4 ++-- src/lang/spanish.txt | 4 ++-- src/lang/spanish_MX.txt | 4 ++-- src/lang/swedish.txt | 4 ++-- src/lang/tamil.txt | 2 +- src/lang/thai.txt | 4 ++-- src/lang/traditional_chinese.txt | 4 ++-- src/lang/turkish.txt | 4 ++-- src/lang/ukrainian.txt | 4 ++-- src/lang/unfinished/frisian.txt | 4 ++-- src/lang/unfinished/persian.txt | 2 +- src/lang/vietnamese.txt | 4 ++-- src/lang/welsh.txt | 4 ++-- src/network/network_gui.cpp | 4 ++-- 53 files changed, 104 insertions(+), 104 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 895c5214e4..25d1946b71 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1921,8 +1921,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Verander # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multispeler -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Openbaar -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Kies tussen 'n openbare (internet) of 'n plaaslike (LAN) spel +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Openbaar +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tussen 'n openbare (internet) of 'n plaaslike (LAN) spel STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Speler naam: diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index f82deae1ec..31487bb3e6 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -2231,8 +2231,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Зьмя # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Сеткавая гульня -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Інтэрнэт -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Выберыце паміж гульнёй праз Інтэрнэт або ў лакальнай сетцы +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Інтэрнэт +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Выберыце паміж гульнёй праз Інтэрнэт або ў лакальнай сетцы STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Не STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Так STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Імя гульца: diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index ed2de430a8..3662a8861e 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1931,8 +1931,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Alterar # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multi-jogador -STR_NETWORK_SERVER_LIST_ADVERTISED :[BLACK}Publicado -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Selecione entre um jogo publicado (internet) ou não publicado (Rede de Área Local, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :[BLACK}Publicado +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Selecione entre um jogo publicado (internet) ou não publicado (Rede de Área Local, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Não STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sim STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome: diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index a9a48bc093..5c0abd5196 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1842,8 +1842,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cмен # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Онлайн играчи -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Рекламирана -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Избери игра измежду рекламирана през интернет или нерекламирана през Локален интернет хост или ЛАН +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Рекламирана +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Избери игра измежду рекламирана през интернет или нерекламирана през Локален интернет хост или ЛАН STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Не STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Да STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Име на играч: diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index fff9299934..bb3651958c 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1939,8 +1939,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Canvia l # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijugador -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Anunciat -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Escull entre una partida anunciada (internet) i una partida no anunciada (xarxa d'àrea local, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciat +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escull entre una partida anunciada (internet) i una partida no anunciada (xarxa d'àrea local, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sí STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nom del jugador: diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 82f6902028..796a412eb1 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2026,8 +2026,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Promijen # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Više igrača -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Sa oglasima -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Odaberi između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Sa oglasima +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Odaberi između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ime igrača: diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 739de18919..1118c22a7b 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2017,8 +2017,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Změnit # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Vypsané -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Vyber mezi propagovanou (internet) a nepropagovanou (Místní síť, LAN) hrou +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Vypsané +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vyber mezi propagovanou (internet) a nepropagovanou (Místní síť, LAN) hrou STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ano STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Jméno hráče: diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 001010bf22..0ac79a126b 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1930,8 +1930,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Ændre s # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Netværksspil -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Offentlig -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Vælg mellem et offentligt (internet) og et ikke offentligt (lokalnetværk, LAN) spil +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Offentlig +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vælg mellem et offentligt (internet) og et ikke offentligt (lokalnetværk, LAN) spil STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nej STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spiller navn: diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 49f861f6fd..99471fe9bf 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1930,8 +1930,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Verander # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Netwerkspel -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Openbaar -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Kies tussen een openbaar (internet) en een niet-openbaar (Local Area Network, LAN) spel +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Openbaar +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tussen een openbaar (internet) en een niet-openbaar (Local Area Network, LAN) spel STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spelersnaam: diff --git a/src/lang/english.txt b/src/lang/english.txt index 1683604aac..a735eace9d 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2007,8 +2007,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}The game STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Set password STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protect your game with a password if you don't want it to be publicly accessible -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Yes STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index f5d1509d6b..593291f62a 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -1850,8 +1850,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name: diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index b4f33a2036..b978cb7a05 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1928,8 +1928,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name: diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index fe97b7df82..9f86f5f930 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1944,8 +1944,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Vaheta k # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Mitmikmäng -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Reklaamitav -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Valib reklaamitava (internet) või mittereklaamitava (kohtvõrk, LAN) mängu +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Reklaamitav +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Valib reklaamitava (internet) või mittereklaamitava (kohtvõrk, LAN) mängu STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ei STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Jah STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Mängija nimi: diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 712643addc..9c107ce812 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1946,8 +1946,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Vaihda s # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Moninpeli -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Mainostettu -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Valitse mainostettu (internet) tai ei-mainostettu (paikallisverkko, LAN) peli +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Mainostettu +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Valitse mainostettu (internet) tai ei-mainostettu (paikallisverkko, LAN) peli STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ei STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Kyllä STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Pelaajan nimi diff --git a/src/lang/french.txt b/src/lang/french.txt index 41c9efb34b..10668d93af 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1939,8 +1939,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Modifier # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijoueurs -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Publiée -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choisir entre une partie publiée (internet) et une partie non publiée (Réseau local, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publiée +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choisir entre une partie publiée (internet) et une partie non publiée (Réseau local, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Non STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Oui STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nom du joueur{NBSP}: diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 59980042de..44f3a378e7 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -2087,8 +2087,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Atharrai # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Ioma-chluicheadair -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Sanasaichte -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Dèan taghadh eadar geama sanasaichte (eadar-lìon) no gun sanasachadh (lìonra ionadail, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Sanasaichte +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Dèan taghadh eadar geama sanasaichte (eadar-lìon) no gun sanasachadh (lìonra ionadail, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Gun sanasachadh STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sanasaichte STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ainm cluicheadair: diff --git a/src/lang/galician.txt b/src/lang/galician.txt index c8e82dee37..2cedd87f1c 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1923,8 +1923,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambia-l # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multixogador -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Anunciado -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Escolle entre unha partida con anuncios (internet) ou sen eles (LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciado +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escolle entre unha partida con anuncios (internet) ou sen eles (LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Non STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Si STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome do xogador: diff --git a/src/lang/german.txt b/src/lang/german.txt index 41724fc7fb..41ece7a738 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1916,8 +1916,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Krawatte # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Mehrspieler -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Angekündigt -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Zwischen öffentlich angekündigtem (Internet) und nicht angekündigtem (Local Area Network, LAN) Spiel wählen +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Angekündigt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Zwischen öffentlich angekündigtem (Internet) und nicht angekündigtem (Local Area Network, LAN) Spiel wählen STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nein STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spielername: diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 1b20d0b7b8..e1be46f15f 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -2016,8 +2016,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Αλλα # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Παιχνίδι πολλών παικτών -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Διαφημιζόμενο -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Επιλογή ανάμεσα σε ένα διαφημιζόμενο (διαδίκτυο) ή μη διαφημιζόμενο (Τοπικό Δίκτυο/LAN) παιχνίδι +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Διαφημιζόμενο +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Επιλογή ανάμεσα σε ένα διαφημιζόμενο (διαδίκτυο) ή μη διαφημιζόμενο (Τοπικό Δίκτυο/LAN) παιχνίδι STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Όχι STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ναι STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Όνομα παίκτη: diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 3d9254b199..061f988e2c 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1901,8 +1901,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK} שנה # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}משחק רשת -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}מפורסם -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}בחר בין משחק מפורסם (אינטרנטי) ומשחק לא מפורסם (רשת מקומית, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}מפורסם +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}בחר בין משחק מפורסם (אינטרנטי) ומשחק לא מפורסם (רשת מקומית, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :לא STR_NETWORK_SERVER_LIST_ADVERTISED_YES :כן STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK} :שם השחקן diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index ab9f5c37e0..43ae63d8bf 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1994,8 +1994,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Nyakkend # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hálózati játék -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Hírdetett -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Válassz hírdetett (internet) és nem hírdetett (helyi hálózat, LAN) játék közül. +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Hírdetett +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Válassz hírdetett (internet) és nem hírdetett (helyi hálózat, LAN) játék közül. STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nem STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Igen STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Játékos neve: diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 21ee30b50b..d74b18ec99 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1930,8 +1930,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Ubah das # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Bermain bersama -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Diiklankan -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Pilih antara permainan diiklankan (internet) dan tidak diiklankan (Jaringan wilayah lokal, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Diiklankan +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Pilih antara permainan diiklankan (internet) dan tidak diiklankan (Jaringan wilayah lokal, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Tidak STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ya STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nama pemain: diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 5eda95ae04..1bd2cc2413 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -1875,8 +1875,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Athraigh # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Ilimreoirí -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Fógartha -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Roghnaigh idir cluiche fógartha (idirlín) agus cluiche neamhfhógartha (Líonra Achair Logánta, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Fógartha +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Roghnaigh idir cluiche fógartha (idirlín) agus cluiche neamhfhógartha (Líonra Achair Logánta, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Níl STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Tá STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ainm imreora: diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 74cc0acc51..c78fd56183 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1954,8 +1954,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambia l # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multigiocatore -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Pubblico -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Sceglie fra partita pubblica (su Internet) o privata (su rete locale, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Pubblico +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Sceglie fra partita pubblica (su Internet) o privata (su rete locale, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sì STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome giocatore: diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 30b9aca6ed..27df32cc5c 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1875,8 +1875,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}ネク # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}マルチプレイヤーゲーム -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}ゲーム公示 -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}ゲームを公示(インターネット)するか、非公示(LAN)にするかを選びます +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}ゲーム公示 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}ゲームを公示(インターネット)するか、非公示(LAN)にするかを選びます STR_NETWORK_SERVER_LIST_ADVERTISED_NO :非公示 STR_NETWORK_SERVER_LIST_ADVERTISED_YES :公示 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}プレイヤー名: diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 12f4257cb1..e3135c023a 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1947,8 +1947,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}넥타 # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}멀티 플레이 -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}공개 여부 -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}공개된 게임(인터넷)과 비공개된 게임(LAN) 중에서 선택하십시오. +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}공개 여부 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}공개된 게임(인터넷)과 비공개된 게임(LAN) 중에서 선택하십시오. STR_NETWORK_SERVER_LIST_ADVERTISED_NO :아니요 STR_NETWORK_SERVER_LIST_ADVERTISED_YES :예 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}플레이어 이름: diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 7a8679dcd5..d218e55b7e 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -2094,8 +2094,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Mutare f # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Modus Plurium Lusorum -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Ostensum -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Eligere servatrum ostensum (interretis) aut non ostensum (LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Ostensum +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Eligere servatrum ostensum (interretis) aut non ostensum (LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Non STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ita STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nomen lusoris: diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 2167b56fdc..863a52f2a3 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1942,8 +1942,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Mainīt # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Vairākspēlētāju spēle -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Izsludināt -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Izvēlieties starp reklamēto (interneta) un nereklamēto (lokālā tīkla, LAN) spēli +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Izsludināt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Izvēlieties starp reklamēto (interneta) un nereklamēto (lokālā tīkla, LAN) spēli STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nē STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Jā STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spēlētāja vārds: diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index b91c6a471e..f211546ea7 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2104,8 +2104,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Pakeisti # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Žaidimas tinkle -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Reklamuoti -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Pasirinkite tarp reklamuojamo (internetas) ir nereklamuojamo (Vietinis Tinklas, LAN) žaidimo +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Reklamuoti +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Pasirinkite tarp reklamuojamo (internetas) ir nereklamuojamo (Vietinis Tinklas, LAN) žaidimo STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Taip STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Žaidėjo vardas: diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 595cb1dc16..749c7e12ba 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1929,8 +1929,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Krawatt # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Ugekënnegt -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Wiel tëschent engem ugekënnegten (Internet) an net ugekënnegten (LAN) Spill +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Ugekënnegt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Wiel tëschent engem ugekënnegten (Internet) an net ugekënnegten (LAN) Spill STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Jo STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spillernumm: diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 76a9d49e38..4dd19b613a 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1931,8 +1931,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Endre sl # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Flerspiller -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Annonsert -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Velg mellom et utlyst (internett) og et ikke utlyst (Lokalnettverk, LAN) spill +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Annonsert +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Velg mellom et utlyst (internett) og et ikke utlyst (Lokalnettverk, LAN) spill STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nei STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spillernavn: diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 9ae7bdfbfc..51ca5aa742 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1799,8 +1799,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Byt slip # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Fleirspelar -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Kunngjort -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Vel mellom spel på internett (kunngjort) og spel på lokalt nett (ikkje kunngjort) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Kunngjort +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vel mellom spel på internett (kunngjort) og spel på lokalt nett (ikkje kunngjort) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nei STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spelarnamn: diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 34a674a772..c20f2894a0 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2318,8 +2318,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Zmień k # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Gra wieloosobowa -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Publiczny -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Wybierz między rozgrywkami reklamowanymi (internetowymi) a niereklamowanymi (w sieci lokalnej LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publiczny +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Wybierz między rozgrywkami reklamowanymi (internetowymi) a niereklamowanymi (w sieci lokalnej LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nie STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Tak STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nazwa gracza: diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index f468725ecf..1619365a93 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1918,8 +1918,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Mudar gr # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multi-jogador -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Anunciado -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Escolher entre jogo público (internet) e privado (Área de Rede Local, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciado +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escolher entre jogo público (internet) e privado (Área de Rede Local, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Não STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sim STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome do jogador: diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 6aabc5dfc3..132b9bc32a 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1868,8 +1868,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Schimbă # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Publicat -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Alege între un joc publicat (prin Internet) și unul privat (reț) game +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publicat +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Alege între un joc publicat (prin Internet) și unul privat (reț) game STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nu STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Numele jucătorului: diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 66ab819360..e4d40051da 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2090,8 +2090,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Изме # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Сетевая игра -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Интернет -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Выберите между игрой через Интернет, либо в локальной сети +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Интернет +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Выберите между игрой через Интернет, либо в локальной сети STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Нет STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Да STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Имя игрока: diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 4b5d1ce3f6..5fb756a846 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -2082,8 +2082,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Promena # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Mrežna partija -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK} Sa reklamama -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Odaberite između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK} Sa reklamama +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Odaberite između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ime igrača: diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index dc26d6b43b..e9dd7b7bbf 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1930,8 +1930,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}选择 # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}联机游戏 -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}发布到互联网 -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}选择是否将游戏发布到官方服务器列表。发布的话，可以让互联网上的玩家找到你的服务器并加入游戏，否则进行局域网内的游戏。 +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}发布到互联网 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}选择是否将游戏发布到官方服务器列表。发布的话，可以让互联网上的玩家找到你的服务器并加入游戏，否则进行局域网内的游戏。 STR_NETWORK_SERVER_LIST_ADVERTISED_NO :否 STR_NETWORK_SERVER_LIST_ADVERTISED_YES :是 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}玩家名称： diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 3c5a3da3e2..34546b11ef 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2006,8 +2006,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Zmeniť # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hra pre viac hráčov -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Zverejnené -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Vyberte medzi zverejnenou (internet) alebo nezverejnenou (lokálna sieť, LAN) hrou +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Zverejnené +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vyberte medzi zverejnenou (internet) alebo nezverejnenou (lokálna sieť, LAN) hrou STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nie STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Áno STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Meno hráča: diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 8fb879315e..c493b1d239 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2031,8 +2031,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Spremeni # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Več igralcev -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Oglaševano -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Izberi med oglaševano (internet) in neoglaševano (Local Area Network, LAN) igro +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Oglaševano +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Izberi med oglaševano (internet) in neoglaševano (Local Area Network, LAN) igro STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ime igralca: diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 22715e1666..662a067452 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1931,8 +1931,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambiar # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijugador -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Público -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Permite escoger entre una partida pública (internet) y una partida privada (LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Público +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Permite escoger entre una partida pública (internet) y una partida privada (LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sí STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nombre del jugador: diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 05beb7eb09..ab4340fb46 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -1931,8 +1931,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambiar # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijugador -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Público -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Permitir escoger entre una partida pública (Internet) y una partida privada (LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Público +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Permitir escoger entre una partida pública (Internet) y una partida privada (LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sí STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nombre del jugador: diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 4875627f6e..3380d9985b 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1930,8 +1930,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Ändra s # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Flera spelare -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Publikt -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Välj mellan ett publikt (internet) eller icke publikt (Local Area Network. LAN) spel +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publikt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Välj mellan ett publikt (internet) eller icke publikt (Local Area Network. LAN) spel STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nej STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spelarnamn: diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 1f43ad1f88..8d6f31b66b 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -1720,7 +1720,7 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Tie அ # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}பல்வீரர் -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}விளம்பரப்படுத்தப்பட்ட +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}விளம்பரப்படுத்தப்பட்ட STR_NETWORK_SERVER_LIST_ADVERTISED_NO :இல்லை STR_NETWORK_SERVER_LIST_ADVERTISED_YES :ஆம் STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}விளையாடுபவரின் பெயர்: diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 7d0a21e6da..6974910256 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -1824,8 +1824,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}เป # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}เล่นหลายคน -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}การประกาศ -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}เลือกระหว่างการโฆษณา (internet) หรือไม่โฆษณา (Local Area Network, LAN) เกม +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}การประกาศ +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}เลือกระหว่างการโฆษณา (internet) หรือไม่โฆษณา (Local Area Network, LAN) เกม STR_NETWORK_SERVER_LIST_ADVERTISED_NO :ไม่ใช่ STR_NETWORK_SERVER_LIST_ADVERTISED_YES :ใช่ STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}ชื่อผู้เล่น: diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 1be89fc1a9..4378e68def 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1878,8 +1878,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}改變 # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}多人遊戲 -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}已啟用宣傳 -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}選擇是否在互聯網上宣傳此遊戲 +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}已啟用宣傳 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}選擇是否在互聯網上宣傳此遊戲 STR_NETWORK_SERVER_LIST_ADVERTISED_NO :否 STR_NETWORK_SERVER_LIST_ADVERTISED_YES :是 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}玩家名稱： diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index b9c5a8c3c4..dabcf38102 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1931,8 +1931,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Kravatı # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Çok Oyunculu -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Duyurulan -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Duyurulan (internet) ve duyurulmayan (yerel ağ, LAN) oyun türlerinden birini seçin +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Duyurulan +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Duyurulan (internet) ve duyurulmayan (yerel ağ, LAN) oyun türlerinden birini seçin STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Hayır STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Evet STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Oyuncu adı: diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index f1cc85fcb1..80957f3b30 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2058,8 +2058,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Змін # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Мережева гра -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Інтернет -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Вибір між рекламованою (інтернет) і не рекламованою (локальна мережа, LAN) грою +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Інтернет +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Вибір між рекламованою (інтернет) і не рекламованою (локальна мережа, LAN) грою STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ні STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Так STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ім'я гравця: diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 8c5957937d..cf8cbb22a2 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1800,8 +1800,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Feroarje # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertearre -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Kies tusken in advertearre (ynternet) of in net-advertearre (LAN) spul +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertearre +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tusken in advertearre (ynternet) of in net-advertearre (LAN) spul STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Namme fan spieler: diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index e342772d3e..186f60e93a 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -1590,7 +1590,7 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}تغیی # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}چندنفره -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}تبلیغ دار +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}تبلیغ دار STR_NETWORK_SERVER_LIST_ADVERTISED_NO :خیر STR_NETWORK_SERVER_LIST_ADVERTISED_YES :بله STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}نام بازیگر: diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 6e1cf35b12..2d02f45952 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1932,8 +1932,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Thay đ # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Ván Chơi Mạng -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Đã quảng bá -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Lựa chọn ván chơi quảng bá (ra ngoài internet) và không quảng bá (Local Area Network, LAN) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Đã quảng bá +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Lựa chọn ván chơi quảng bá (ra ngoài internet) và không quảng bá (Local Area Network, LAN) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Không STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Có STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Tên người chơi: diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 0fbb9efe9f..2f6048c31c 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1883,8 +1883,8 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Newid te # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Amlchwaraewr -STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Hysbys -STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Dewis rhwyd gêm a hysbysebir (rhyngrwyd) neu un anhysbys (rhwydwaith leol) +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Hysbys +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Dewis rhwyd gêm a hysbysebir (rhyngrwyd) neu un anhysbys (rhwydwaith leol) STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Na STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ia STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Enw chwaraewr: diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index b6449b5246..cd57e9af9f 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1248,8 +1248,8 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = { NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 6, 10), NWidget(NWID_VERTICAL), SetPIP(0, 1, 0), - NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_ADVERTISED, STR_NULL), - NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_BTN), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP), + NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_START_SERVER_ADVERTISED_LABEL, STR_NULL), + NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_BTN), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP), EndContainer(), NWidget(NWID_VERTICAL), SetPIP(0, 1, 0), NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_LANGUAGE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN, STR_NULL), From 7b515fa0e287e45aee8281f44ea357498b22020f Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 25 Dec 2020 13:07:40 +0000 Subject: [PATCH 31/38] Update: Translations from eints --- src/lang/afrikaans.txt | 11 ++--------- src/lang/arabic_egypt.txt | 5 ----- src/lang/basque.txt | 7 ------- src/lang/belarusian.txt | 11 ++--------- src/lang/brazilian_portuguese.txt | 11 ++--------- src/lang/bulgarian.txt | 11 ++--------- src/lang/catalan.txt | 11 ++--------- src/lang/croatian.txt | 11 ++--------- src/lang/czech.txt | 11 ++--------- src/lang/danish.txt | 11 ++--------- src/lang/dutch.txt | 11 ++--------- src/lang/english_AU.txt | 11 ++--------- src/lang/english_US.txt | 11 ++--------- src/lang/esperanto.txt | 5 ----- src/lang/estonian.txt | 11 ++--------- src/lang/faroese.txt | 4 ---- src/lang/finnish.txt | 11 ++--------- src/lang/french.txt | 11 ++--------- src/lang/gaelic.txt | 11 ++--------- src/lang/galician.txt | 11 ++--------- src/lang/german.txt | 11 ++--------- src/lang/greek.txt | 11 ++--------- src/lang/hebrew.txt | 11 ++--------- src/lang/hungarian.txt | 11 ++--------- src/lang/icelandic.txt | 5 ----- src/lang/indonesian.txt | 11 ++--------- src/lang/irish.txt | 11 ++--------- src/lang/italian.txt | 11 ++--------- src/lang/japanese.txt | 11 ++--------- src/lang/korean.txt | 11 ++--------- src/lang/latin.txt | 11 ++--------- src/lang/latvian.txt | 11 ++--------- src/lang/lithuanian.txt | 11 ++--------- src/lang/luxembourgish.txt | 11 ++--------- src/lang/malay.txt | 5 ----- src/lang/norwegian_bokmal.txt | 11 ++--------- src/lang/norwegian_nynorsk.txt | 11 ++--------- src/lang/polish.txt | 11 ++--------- src/lang/portuguese.txt | 11 ++--------- src/lang/romanian.txt | 11 ++--------- src/lang/russian.txt | 11 ++--------- src/lang/serbian.txt | 11 ++--------- src/lang/simplified_chinese.txt | 11 ++--------- src/lang/slovak.txt | 11 ++--------- src/lang/slovenian.txt | 11 ++--------- src/lang/spanish.txt | 11 ++--------- src/lang/spanish_MX.txt | 11 ++--------- src/lang/swedish.txt | 11 ++--------- src/lang/tamil.txt | 9 +-------- src/lang/thai.txt | 11 ++--------- src/lang/traditional_chinese.txt | 11 ++--------- src/lang/turkish.txt | 11 ++--------- src/lang/ukrainian.txt | 11 ++--------- src/lang/unfinished/chuvash.txt | 3 --- src/lang/unfinished/frisian.txt | 10 ++-------- src/lang/unfinished/ido.txt | 1 - src/lang/unfinished/persian.txt | 9 +-------- src/lang/unfinished/urdu.txt | 5 ----- src/lang/vietnamese.txt | 11 ++--------- src/lang/welsh.txt | 11 ++--------- 60 files changed, 100 insertions(+), 496 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 25d1946b71..27c04099c3 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1598,9 +1598,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineêre STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Binne speletjie plasing van bome: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Beheer die ewekansige voorkoms van bome tydens die spel. Dit kan 'n invloed op nywerhede hê wat staatmaak op die groei van bome, byvoorbeeld hout meulens -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Geen {RED}(breek timmerhout meul) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Slegs in reënwoude -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Orals STR_CONFIG_SETTING_TOOLBAR_POS :Posisie van hoof werktuigbaan: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horisontale posisie van die hoof nutsbalk aan die bokant van die skerm @@ -1921,10 +1918,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Verander # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multispeler -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Openbaar -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tussen 'n openbare (internet) of 'n plaaslike (LAN) spel -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Speler naam: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Die is die naam waarmee ander spelers sal jou aanwys @@ -1965,8 +1958,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Verbind STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Vervris verskaffer STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Vervris die verskaffer inligting -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Soek bediener -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Versoek netwerk vir 'n verskaffer STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Voeg bediender by STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Voeg 'n verskaffer by die lys wat altyd ondersoek sal word vir speletjies wat reeds aan die gang is STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Begin bediener @@ -1983,6 +1974,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Die spel STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Stel wagwoord STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Beskerm jou spel met 'n wagwoord as jy wil dit nie publieke toepassing laat wees nie +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Openbaar +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tussen 'n openbare (internet) of 'n plaaslike (LAN) spel STR_NETWORK_START_SERVER_UNADVERTISED :Nee STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} Klient{P "" e} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 4e105d4bdb..7f342e7b3c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1316,9 +1316,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :مسموح STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :مسموح - نمط مدينة قابل للتعديل STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :اضافة الاشجار اثناء اللعب: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :بدون {RED}-المشغولات الخشبية معطل- -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :الغابات الماطرة فقط -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :كل مكان STR_CONFIG_SETTING_TOOLBAR_POS :موقع شريط الأدوات الرئيسي: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :موقع شريط المعلومات: {STRING} @@ -1594,8 +1591,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}أنضم STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}حدث الخادم STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}حدث معلومات الخادم -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}إبحث عن خوادم -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}أبحث في الشبكة عن خادم STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}اضف خادم - سيرفر STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}اضف خادم (سيرفر) و الذي سوف يفحص اذا كان هناك لعبة قيد التشغيل حاليا STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}أبدأ الخادم diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 07838daee4..9e63803637 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -1499,9 +1499,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Gaitua herrien STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Zuhaitzen landaketa jokoan: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Jokoa bitartean zuhaitzen ausazko landatzea kontrolatu. Zuhaitzen landatzean oinarritzen diren industriei eragin dezake, zerrategiei adibidez -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ezer ez {RED}(Paisai tropikalean zerrategiak hautsiko ditu) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Bakarrik basoetan -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Leku guztietan STR_CONFIG_SETTING_TOOLBAR_POS :Tresna barra nagusiaren kokapena: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Tresna barra nagusia posizio horizontalean pantailaren goiko aldean @@ -1794,8 +1791,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Aldatu k # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijokalaria -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ez -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Bai STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Jokalariaren izena: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Izen honen bidez ezagutua izango zara beste jokalarien artean @@ -1836,8 +1831,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Jokoan s STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Zerbitzaria freskatu STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Zerbitzariaren informazioa freskatu -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Zerbitzaria bilatu -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Sarean zerbitzariak bilatu STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Zerbitzaria gehitu STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Zerrendara zerbitzari bat gehitu martxa dauden jokoak bilatuko dituena STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Zerbitzari bat sortu diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 31487bb3e6..c297aefdf3 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -1907,9 +1907,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :лінейна STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Расстаноўка дрэваў у гульні: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Кантроль адвольнага з'яўленьня дрэваў падчас гульні. Гэта можа закрануць прадпрыемствы, якія залежаць ад росту дрэваў, напрыклад, пільні. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :адключана {RED}(пільні ня змогуць працаваць) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :толькі ў трапічных джунґлях -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :усюды STR_CONFIG_SETTING_TOOLBAR_POS :Разьмяшчэньне галоўнай панэлі: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Гарызантальнае разьмяшчэньне галоўнай панэлі інструмэнтаў зьверху экрана. @@ -2231,10 +2228,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Зьмя # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Сеткавая гульня -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Інтэрнэт -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Выберыце паміж гульнёй праз Інтэрнэт або ў лакальнай сетцы -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Не -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Так STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Імя гульца: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Гэта ваша імя, якое будзе бачна іншым гульцам @@ -2275,8 +2268,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Далу STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Абнавіць сэрвэр STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Абнавіць iнфармацыю аб сэрвэры -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Знайсьці сэрвэр -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Знайсьці сэрвэры, якія зараз ёсьць у сетцы STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Дадаць сэрвэр STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Дадаць сэрвэр у сьпіс, які будзе аўтаматычна правярацца на ідучыя гульні STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Запуск сэрвэра @@ -2293,6 +2284,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Назв STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Усталяваць пароль STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Абараніце вашу гульню паролем, калі ня хочаце рабіць яе публічна даступнай +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Інтэрнэт +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Выберыце паміж гульнёй праз Інтэрнэт або ў лакальнай сетцы STR_NETWORK_START_SERVER_UNADVERTISED :Не STR_NETWORK_START_SERVER_ADVERTISED :Так STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} клiент{P "" ы аў} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 3662a8861e..97a5f59fab 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1607,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Posicionamento de árvores: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controla o nascimento aleatório de árvores durante o jogo. Isso pode afetar indústrias que dependem do crescimento de árvores, como serrarias -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nenhum {RED}(extingue a serraria) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Apenas nas florestas tropicais -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Em todo o lugar STR_CONFIG_SETTING_TOOLBAR_POS :Posição da barra de ferramentas principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posição horizontal da barra de ferramentas principal no topo da tela @@ -1931,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Alterar # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multi-jogador -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :[BLACK}Publicado -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Selecione entre um jogo publicado (internet) ou não publicado (Rede de Área Local, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Não -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sim STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Este é o nome pelo qual os outros jogadores irão te identificar @@ -1975,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Entrar n STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Atualizar dados STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Atualiza as informações sobre o servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Localizar servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Pesquisar por um servidor na rede STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Adicionar servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adiciona um servidor à lista que será sempre verificada se existem jogos ocorrendo STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Iniciar servidor @@ -1993,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}O nome d STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Definir senha STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Proteja o jogo com uma senha se não desejar que seja publicamente acessível +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :[BLACK}Publicado +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Selecione entre um jogo publicado (internet) ou não publicado (Rede de Área Local, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Não STR_NETWORK_START_SERVER_ADVERTISED :Sim STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} cliente{P "" s} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 5c0abd5196..99183c8498 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1548,9 +1548,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Разреше STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Разпределяне на дърветата в гората: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Контролирайте случайното появяване на дървета по време на игра. Това може да засегне промишленостите, които зависят от растежа на дървета, като например дърводелниците -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Без {RED}(разваля дъскорезницата) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Само в дъждовни гори -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Навсякъде STR_CONFIG_SETTING_TOOLBAR_POS :Позиция на лентата за инструменти: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Хоризонтално позициониране на основната лента в горната част на екрана @@ -1842,10 +1839,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cмен # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Онлайн играчи -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Рекламирана -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Избери игра измежду рекламирана през интернет или нерекламирана през Локален интернет хост или ЛАН -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Не -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Да STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Име на играч: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Чрез това име другите играчи ще ви идентифицират @@ -1886,8 +1879,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Прис STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Обновяване сървъра STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Обновява информацията за съръра -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Търсене на сървър -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Претърсване на мрежата за сървър STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Добави сървър STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Добяви сървър към списакът, който винаги ще бъде проверяван за активни игри. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Пускане на сървър @@ -1904,6 +1895,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Имет STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Поставяне на парола STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Защитаване на вашата игра с парола за да не е публично достъпна +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Рекламирана +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Избери игра измежду рекламирана през интернет или нерекламирана през Локален интернет хост или ЛАН STR_NETWORK_START_SERVER_UNADVERTISED :Не STR_NETWORK_START_SERVER_ADVERTISED :Да STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} клиент{P "" s} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index bb3651958c..872ed5974b 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1613,9 +1613,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineal STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Disposició de nous arbres durant la partida: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controla l'aparició aleatòria dels arbres durant una partida. Això podria afectar a les indústries que es basen en el creixement dels arbres, per exemple les serradores -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Cap {RED}(inhabilita la serradora) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Només a les selves tropicals -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :A tot arreu STR_CONFIG_SETTING_TOOLBAR_POS :Posició de la barra d'eines principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posició horitzontal de la barra principal a la part superior de la pantalla @@ -1939,10 +1936,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Canvia l # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijugador -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciat -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escull entre una partida anunciada (internet) i una partida no anunciada (xarxa d'àrea local, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sí STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nom del jugador: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Aquest és el nom amb el que els altres jugadors t'identificaran @@ -1983,8 +1976,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Connecta STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Actualitza servidor STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Actualitza la informació del servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Busca servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Cercant un servidor a la xarxa STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Afegeix un servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Afegeix un servidor a la llista que sempre es comprovarà per buscar partides en marxa STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Inicia el servidor @@ -2001,6 +1992,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}El nom d STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Posa una contrasenya STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protegeix la teva partida amb una contrasenya si no vols que sigui accessible a desconeguts +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciat +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escull entre una partida anunciada (internet) i una partida no anunciada (xarxa d'àrea local, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Sí STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 796a412eb1..66b02221e2 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1702,9 +1702,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linearno STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Smještaj drveća u igri: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontroliraj nasumično pojavljivanje stabala tijekom igre. Ovo može utjecati na industrije koje ovise o rastu stabala, npr. pilane -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nigdje {RED}(uništava pilanu) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Samo u kišnim šumama -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Posvuda STR_CONFIG_SETTING_TOOLBAR_POS :Položaj glavne alatne trake: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Vodoravna pozicija glavne alatne trake na vrhu zaslona @@ -2026,10 +2023,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Promijen # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Više igrača -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Sa oglasima -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Odaberi između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ime igrača: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Ovo je ime po kojem će te drugi igrači raspoznavati @@ -2070,8 +2063,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Pridruž STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Osvježi poslužitelj STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Osvježi podatke o poslužitelju -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Pronađi poslužitelj -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Pronađi poslužitelje u mreži STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Dodaj poslužitelj STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Dodaje poslužitelj na popis koji će uvijek biti provjeren postoje li igre u tijeku. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Pokreni poslužitelj @@ -2088,6 +2079,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Ime igre STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Postavi zaporku STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Zaštiti svoju igru pomoću zaporke ukoliko ne želiš da bude javno dostupna +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Sa oglasima +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Odaberi između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Ne STR_NETWORK_START_SERVER_ADVERTISED :Da STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klijen{P t ta ata} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 1118c22a7b..41b3020ade 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1693,9 +1693,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineární STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Umístění stromů ve hře: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Náhodné umisťování stromů během hry. Může ovlivnit průmysl závisející na růstu stromů, například pily. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Žádné {RED}(nefunguje pila) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Jen v deštných pralesech -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Všude STR_CONFIG_SETTING_TOOLBAR_POS :Umístění hlavní lišty: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontální pozice hlavního panelu v horní části obrazovky @@ -2017,10 +2014,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Změnit # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Vypsané -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vyber mezi propagovanou (internet) a nepropagovanou (Místní síť, LAN) hrou -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ano STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Jméno hráče: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Podle tohoto jména tě ostatní hráči poznají @@ -2061,8 +2054,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Přidat STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Obnovit info STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Znovu načte informace o serveru -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Najít server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Hledat server v síti STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Přidat server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Přidá server do seznamu, ve kterém se budou hledat běžící hry STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Spustit server @@ -2079,6 +2070,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Jméno h STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Nastavit heslo STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Svoji hru si můžeš ochránit heslem, když nechceš, aby se ti do ni hlásili jiní lidé +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Vypsané +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vyber mezi propagovanou (internet) a nepropagovanou (Místní síť, LAN) hrou STR_NETWORK_START_SERVER_UNADVERTISED :Ne STR_NETWORK_START_SERVER_ADVERTISED :Ano STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" i ů} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 0ac79a126b..892782abcd 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1606,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineær STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Placering af træer i spillet: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontroller den tilfældige fremkomst af træer i løbet af spillet. Dette vil påvirke industrier der afhænger træers vækst, f.eks. savværker -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ingen {RED}(ødelægger træfabrik) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Kun i regnskove -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Alle steder STR_CONFIG_SETTING_TOOLBAR_POS :Placering af værktøjslinje: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horisontal placering af hovedværktøjlinjen i toppen af skærmen @@ -1930,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Ændre s # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Netværksspil -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Offentlig -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vælg mellem et offentligt (internet) og et ikke offentligt (lokalnetværk, LAN) spil -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nej -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spiller navn: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Dette er det navn, som andre spillere vil kende dig ved @@ -1974,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Tilslut STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Genopfrisk server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Genopfrisk serverens info -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Find server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Søg netværket for en server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Tilføj server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Tilføjer en server til listen, som altid vil blive tjekket for kørerende spil. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server @@ -1992,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Navnet v STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Sæt kodeord STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Beskyt dit spil med et kodeord hvis du ikke vil have fremmede med +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Offentlig +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vælg mellem et offentligt (internet) og et ikke offentligt (lokalnetværk, LAN) spil STR_NETWORK_START_SERVER_UNADVERTISED :Nej STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" er} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 99471fe9bf..1ff98d11da 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1606,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineair STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plaatsing van bomen in het spel: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Beheert het willekeurig verschijnen van bomen tijdens het spel. Dit kan gevolgen hebben voor industrietakken die afhankelijk zijn van groei van bomen, bijvoorbeeld houtzagerijen. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Geen {RED}(houtzagerijen werken niet) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Alleen in regenwouden -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Overal STR_CONFIG_SETTING_TOOLBAR_POS :Positie van algemene knoppenbalk: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontale positie van de algemene taakbalk aan de bovenkant van het scherm. @@ -1930,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Verander # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Netwerkspel -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Openbaar -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tussen een openbaar (internet) en een niet-openbaar (Local Area Network, LAN) spel -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spelersnaam: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Dit is de naam waarmee andere spelers je herkennen @@ -1974,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Meespele STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Ververs server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Ververs de informatie over deze server -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Server zoeken -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Zoek op het netwerk naar een server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Voeg server toe STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Voegt een server toe aan de lijst die altijd gecontroleerd zal worden op draaiende spellen STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server @@ -1992,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}De speln STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Wachtwoord instellen STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Beveilig je spel met een wachtwoord als je niet wilt dat dit algemeen toegankelijk is +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Openbaar +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tussen een openbaar (internet) en een niet-openbaar (Local Area Network, LAN) spel STR_NETWORK_START_SERVER_UNADVERTISED :Nee STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} speler{P "" s} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 593291f62a..44efedb7f7 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -1532,9 +1532,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Allowed, custom STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :In game placement of trees: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Control random appearance of trees during the game. This might affect industries which rely on tree growth, for example lumber mills -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :None {RED}(breaks lumber mill) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Only in rain forests -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Everywhere STR_CONFIG_SETTING_TOOLBAR_POS :Position of main toolbar: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontal position of the main toolbar at the top of the screen @@ -1850,10 +1847,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}This is the name other players will identify you by @@ -1894,8 +1887,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Join gam STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Refresh server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Refresh the server info -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Find server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Search network for a server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Add server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adds a server to the list which will always be checked for running games STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server @@ -1912,6 +1903,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}The game STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Set password STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protect your game with a password if you don't want it to be publicly accessible +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Yes STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index b978cb7a05..38d01204f4 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1604,9 +1604,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :In-game placement of trees: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Control random appearance of trees during the game. This might affect industries which rely on tree growth, for example lumber mills -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :None {RED}(breaks lumber mill) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Only in rain forests -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Everywhere STR_CONFIG_SETTING_TOOLBAR_POS :Position of main toolbar: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontal position of the main toolbar at the top of the screen @@ -1928,10 +1925,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}This is the name other players will identify you by @@ -1972,8 +1965,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Join gam STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Refresh server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Refresh the server info -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Find server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Search network for a server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Add server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adds a server to the list which will always be checked for running games STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server @@ -1990,6 +1981,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}The game STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Set password STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protect your game with a password if you don't want it to be publicly accessible +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertised +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Yes STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index d2be60700f..0adcf0b115 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1326,9 +1326,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :permesate STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :permesate, kutimo urbomapo STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :En ludo metanta de arbojn: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :neniu {RED}(rompas ligno muelilo) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :nur en tropika praarbaroj -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Ĉie STR_CONFIG_SETTING_TOOLBAR_POS :Loko de ĉefa ilbreto: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :Loko de kondiĉbaro: {STRING} @@ -1574,8 +1571,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Aliĝu a STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Refreŝigu servilon STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Refreŝigu servilajn informojn -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Trovu servilon -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Serĉu reton por servilo STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Aldonu servilon STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Aldonas servilon al la listo kiu ĉiam estos kontrolata pri kurantaj ludoj STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Startu servilon diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 9f86f5f930..74b827f3f4 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1621,9 +1621,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Lubatud, koos l STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Mängu jooksul kasvavad puud: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Juhib suvalist puude kasvu mängu jooksul. See seade võib mõjutada osade tööstuste tööd, mis sõltuvad puude kasvust (näiteks saekaater) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ei {RED}(saeveski ei tööta) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Ainult vihmametsades -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Igal pool STR_CONFIG_SETTING_TOOLBAR_POS :Peamine tarvikuriba paikneb: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Tarvikuriba rõhtne paiknemine ekraani ülaosas @@ -1944,10 +1941,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Vaheta k # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Mitmikmäng -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Reklaamitav -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Valib reklaamitava (internet) või mittereklaamitava (kohtvõrk, LAN) mängu -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ei -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Jah STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Mängija nimi: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Teised mängijad tunnevad sind selle nime järgi @@ -1988,8 +1981,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Liitu m STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Uuenda andmeid STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Serveri info värskendamine -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Uuenda loendit -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Uuenda võrgus asuvate serverite loendit STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Sisesta server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Sisesta loendisse uus server, milles toimuvaid mänge jälgida STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Tee server @@ -2006,6 +1997,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Serveril STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Määra salasõna STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Et server ei oleks avalik, kaitse oma mäng salasõnaga +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Reklaamitav +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Valib reklaamitava (internet) või mittereklaamitava (kohtvõrk, LAN) mängu STR_NETWORK_START_SERVER_UNADVERTISED :Jah STR_NETWORK_START_SERVER_ADVERTISED :Jah STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" i} diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index d8b5c1f95f..0b2c1fa2b8 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -1697,8 +1697,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Broyt sl # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hópspæl -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nei -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spælara navn: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Hetta er navni aðrir spælarir fara at kenna teg vi @@ -1739,8 +1737,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Tak lut STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Endurnýggja servara STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Endurnýggja kunning um servara -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Finn servara -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Leita eftir servara á netverki STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Legg servara aftrat STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Leggur ein servara til listan sum altíð verður kannaður fyri koyrandi spøl STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Set servara í gongd diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 9c107ce812..254621dce4 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1620,9 +1620,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineaarinen STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Puiden istutus pelissä: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Määrittää puiden sattumanvaraisen luomisen. Tämä voi vaikuttaa teollisuuslaitoksiin jotka ovat riippuvaisia puiden kasvamisesta, esimerkiksi sahat -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ei ollenkaan {RED}(rikkoo sahan) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Vain sademetsiin -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Kaikkialle STR_CONFIG_SETTING_TOOLBAR_POS :Päätyökalupalkin sijainti: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Ruudun yläreunassa olevan työkalupalkin sijainti vaakasuunnassa @@ -1946,10 +1943,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Vaihda s # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Moninpeli -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Mainostettu -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Valitse mainostettu (internet) tai ei-mainostettu (paikallisverkko, LAN) peli -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ei -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Kyllä STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Pelaajan nimi STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Pelaajat tunnistetaan ja erotetaan toisistaan nimien avulla @@ -1990,8 +1983,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Liity pe STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Päivitä STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Päivitä palvelintiedot -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Etsi palvelin -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Etsi palvelin verkosta STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Lisää palvelin STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Lisää palvelin listaan, joka käydään läpi aina uusia pelejä haettaessa STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Käynnistä palvelin @@ -2008,6 +1999,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Nimi nä STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Aseta salasana STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Jos peliin ei halua ulkopuolisia, voi sen suojata salasanalla +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Mainostettu +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Valitse mainostettu (internet) tai ei-mainostettu (paikallisverkko, LAN) peli STR_NETWORK_START_SERVER_UNADVERTISED :Ei STR_NETWORK_START_SERVER_ADVERTISED :Kyllä STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} asiakas{P "" ta} diff --git a/src/lang/french.txt b/src/lang/french.txt index 10668d93af..6b08754c75 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1613,9 +1613,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linéaire STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plantation d'arbres durant la partie{NBSP}: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Contrôle l'apparition aléatoire des arbres durant la partie. Cela peut affecter les industries qui dépendent de la croissance des arbres, par exemple les scieries -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nulle part {RED}(les scieries ne fonctionneront plus) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Seulement dans les forêts tropicales -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Partout STR_CONFIG_SETTING_TOOLBAR_POS :Position de la barre d'outils principale{NBSP}: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Position horizontale de la barre d'outils principale en haut de l'écran @@ -1939,10 +1936,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Modifier # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijoueurs -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publiée -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choisir entre une partie publiée (internet) et une partie non publiée (Réseau local, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Non -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Oui STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nom du joueur{NBSP}: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Ceci est le nom sous lequel vous serez connu des autres joueurs @@ -1983,8 +1976,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Rejoindr STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Actualiser STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Actualiser les informations sur le serveur -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Trouver un serveur -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Chercher un serveur sur le réseau STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Ajouter un serveur STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Ajouter un serveur à la liste de ceux parmi lesquels des parties en cours seront toujours cherchées STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Démarrer le serveur @@ -2001,6 +1992,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Les autr STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Choisir le mot de passe STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protégez votre partie avec un mot de passe si vous ne souhaitez pas que d'autres l'utilisent +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publiée +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Choisir entre une partie publiée (internet) et une partie non publiée (Réseau local, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Non STR_NETWORK_START_SERVER_ADVERTISED :Oui STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s} diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 44f3a378e7..3db73e8bb0 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -1763,9 +1763,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Ceadaichte, co- STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Cur nan craobh sa gheama: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Cùm smachd air na craobhan a nochdas sa gheama air thuaiream. Dh'fhaoidte gun toir seo buaidh air gnìomhachasan a tha an eisimeil fàs nan craobhan a leithid muileannan-fiodha -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Chan eil gin {RED}(brisidh seo muileannan-fiodha) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Ann an coilltean-uisge a-mhàin -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Àite sam bith STR_CONFIG_SETTING_TOOLBAR_POS :Ionad a' phrìomh bhàir-inneal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Ionad còmhnard a' phrìomh bhàir-inneal air barr na sgrìn @@ -2087,10 +2084,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Atharrai # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Ioma-chluicheadair -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Sanasaichte -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Dèan taghadh eadar geama sanasaichte (eadar-lìon) no gun sanasachadh (lìonra ionadail, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Gun sanasachadh -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sanasaichte STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ainm cluicheadair: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Seo an t-ainm leis an aithnich cluicheadairean eile thu @@ -2131,8 +2124,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Gabh sa STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Ath-nuadhaich am frithealaiche STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Ath-nuadhaich fiosrachadh an fhrithealaiche -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Lorg frithealaiche -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Lorg san lìonraidh airson frithealaiche STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Cuir frithealaiche ris STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Cuiridh seo frithealaiche ris an liosta gus an tèid sùil a thoirt air airson geamannan nan ruith STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Tòisich frithealaiche @@ -2149,6 +2140,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Thèid a STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Suidhich facal-faire STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Dìon an geama agad le facal-faire ach nach eil e ri fhaighinn gu poblach +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Sanasaichte +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Dèan taghadh eadar geama sanasaichte (eadar-lìon) no gun sanasachadh (lìonra ionadail, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Chan eil STR_NETWORK_START_SERVER_ADVERTISED :Tha STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} {P chliant chliant cliantan cliant} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 2cedd87f1c..82c7be26a3 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1599,9 +1599,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineal STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Colocación de árbores durante a partida: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controla a aparición aleatoria de árbores durante a partida. Isto pode afectar ás industrias que dependan do crecemento arbóreo, por exemplo o serradoiro -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ningún {RED}(rompe o serradoiro) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Só nos bosques -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :En todas partes STR_CONFIG_SETTING_TOOLBAR_POS :Posición da barra de ferramentas principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posición horizontal da barra de ferramentas principal da parte superior da pantalla @@ -1923,10 +1920,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambia-l # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multixogador -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciado -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escolle entre unha partida con anuncios (internet) ou sen eles (LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Non -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Si STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome do xogador: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Este é o nome polo que te identificarán os outros xogadores @@ -1967,8 +1960,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Unirse STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Actualizar servidor STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Actualiza-la información do servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Procurar servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Buscar un servidor na rede STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Engadir servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Engade un servidor á lista que será comprobado sempre para buscar partidas. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Iniciar servidor @@ -1985,6 +1976,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}O nome d STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Establecer contrasinal STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protexe a túa partida cun contrasinal se non queres ser accesible públicamente +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciado +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escolle entre unha partida con anuncios (internet) ou sen eles (LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Non STR_NETWORK_START_SERVER_ADVERTISED :Si STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} cliente{P "" s} diff --git a/src/lang/german.txt b/src/lang/german.txt index 41ece7a738..d5fa23a4b7 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1592,9 +1592,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Platzierung von Bäumen während des Spiels: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Lege das Ausmaß des zufälligen Baumwachstums während des Spiels fest. Dies kann Industrien wie die Sägemühle beeinflussen, welche auf nachwachsende Bäume angewiesen sind -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nirgends {RED}(macht Sägemühle nutzlos) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Nur im Regenwald -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :überall STR_CONFIG_SETTING_TOOLBAR_POS :Position der Werkzeugleiste: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontale Position der Bauleiste am oberen Bildschirmrand @@ -1916,10 +1913,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Krawatte # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Mehrspieler -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Angekündigt -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Zwischen öffentlich angekündigtem (Internet) und nicht angekündigtem (Local Area Network, LAN) Spiel wählen -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nein -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spielername: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Dieser Name dient zur Identifizierung anderen Spielern gegenüber @@ -1960,8 +1953,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Spiel be STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Aktualisieren STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Aktualisiert die Serverinformationen -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Server suchen -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Netzwerk nach einem Server durchsuchen STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Server hinzufügen STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Fügt einen Server zu der Liste von Servern hinzu, die immer nach laufenden Spielen kontrolliert werden STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Server starten @@ -1978,6 +1969,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Der Name STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Passwort setzen STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Ein Passwort verhindert, dass unbefugte Leute beitreten +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Angekündigt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Zwischen öffentlich angekündigtem (Internet) und nicht angekündigtem (Local Area Network, LAN) Spiel wählen STR_NETWORK_START_SERVER_UNADVERTISED :Nein STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} Teilnehmer diff --git a/src/lang/greek.txt b/src/lang/greek.txt index e1be46f15f..e60bdf374e 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1692,9 +1692,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Γραμμικ STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Τοποθέτηση δέντρων εντός παιχνιδιού: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Έλεγχος της τυχαίας εμφάνισης δέντρων κατά τη διάρκεια του παιχνιδιού. Αυτό είναι πιθανό να επηρεάσει βιομηχανίες που εξαρτώνται από την ανάπτυξη των δέντρων, όπως για παράδειγμα οι υλοτομίες -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Κανένα {RED}(καταστρέφει το ξυλουργείο) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Μόνο σε τροπικά δάση -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Παντού STR_CONFIG_SETTING_TOOLBAR_POS :Θέση κύριας εργαλειοθήκης: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Οριζόντια τοποθέτηση της κύριας γραμμής εργαλείων στο επάνω μέρος της οθόνης @@ -2016,10 +2013,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Αλλα # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Παιχνίδι πολλών παικτών -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Διαφημιζόμενο -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Επιλογή ανάμεσα σε ένα διαφημιζόμενο (διαδίκτυο) ή μη διαφημιζόμενο (Τοπικό Δίκτυο/LAN) παιχνίδι -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Όχι -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ναι STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Όνομα παίκτη: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Αυτό είναι το όνομα με το οποίο θα σας αναγνωρίζουν οι άλλοι παίκτες @@ -2060,8 +2053,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Συμμ STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Ανανέωση διακομιστή STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Ανανεώση πληροφοριών του διακομιστή -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Αναζήτηση διακομιστή -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Ψάξτε το δίκτυο για ένα διακομιστή STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Προσθήκη διακομιστή STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Προσθέτει ένα διακομιστή στη λίστα ο οποίος θα ελέγχεται κάθε φορά για ενεργά παιχνίδια. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Εκκίνηση διακομιστή @@ -2078,6 +2069,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Το ό STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Θέση κωδικού STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Προστατέψτε το παιχνίδι με έναν κωδικό εάν δε θέλετε να είναι δημοσίως προσβάσιμο +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Διαφημιζόμενο +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Επιλογή ανάμεσα σε ένα διαφημιζόμενο (διαδίκτυο) ή μη διαφημιζόμενο (Τοπικό Δίκτυο/LAN) παιχνίδι STR_NETWORK_START_SERVER_UNADVERTISED :Όχι STR_NETWORK_START_SERVER_ADVERTISED :Ναι STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} συμπαίκτ{P ης ες} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 061f988e2c..2d59515113 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1578,9 +1578,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :מותר, מת STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :מיקום עצים במהלך המשחק: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :שלוט בהופעה אקראית של עצים במהלך המשחק. זה עלול להשפיע על תעשיות המסתמכות על צמיחת עצים, לדוגמא מנסרות -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :ללא {RED}(שובר מנסרת עץ) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :רק ביערות גשם -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :בכל מקום STR_CONFIG_SETTING_TOOLBAR_POS :{STRING} :מיקום הסרגל העיקרי STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :מיקום אופקי של סרגל הכלים הראשי בראש המסך @@ -1901,10 +1898,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK} שנה # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}משחק רשת -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}מפורסם -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}בחר בין משחק מפורסם (אינטרנטי) ומשחק לא מפורסם (רשת מקומית, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :לא -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :כן STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK} :שם השחקן STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}זהו שמך כפי שיצפה ע"י המשתתפים האחרים @@ -1945,8 +1938,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}הצטר STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}רענן שרת STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}רענן את המידע המוצג לגבי השרת -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}אתר שרת -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}סרוק את הרשת לאיתור שרת STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}הוסף שרת STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}מוסיף שרת לרשימה שתמיד תבדק למשחקים פעילים. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}הפעל שרת @@ -1963,6 +1954,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}השם STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}קבע סיסמה STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}הגן על המשחק שלך עם סיסמה אם אתה לא רוצה שהוא יהיה זמין לכולם +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}מפורסם +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}בחר בין משחק מפורסם (אינטרנטי) ומשחק לא מפורסם (רשת מקומית, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :לא STR_NETWORK_START_SERVER_ADVERTISED :כן STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} לקוח{P "" "ות"} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 43ae63d8bf..1d543d19b6 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1670,9 +1670,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineáris STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Játékbeli faelhelyezkedés: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Fák véletlenszerű megjelenésének szabályozása a játék során. Ez befolyásolhatja a gazdasági épületeket, melyek a fák növekedésétől függnek, mint a favágók -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :sehol {RED}(favágók ellehetetlenítése) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :csak esőerdőkben -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :mindenhol STR_CONFIG_SETTING_TOOLBAR_POS :A fő eszközsor helye: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :A fő eszközsor vízszintes elhelyezésének beállítása a képernyő tetején @@ -1994,10 +1991,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Nyakkend # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hálózati játék -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Hírdetett -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Válassz hírdetett (internet) és nem hírdetett (helyi hálózat, LAN) játék közül. -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nem -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Igen STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Játékos neve: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}A többi játékos ilyen néven fog ismerni Téged. @@ -2038,8 +2031,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Csatlako STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Szerver frissítése STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Szerver infó frissítése -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Szerver keresése -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Szerver keresése a hálózaton STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Szerver hozzáadása STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Hozzáadja a szervert a listához, így később gyorsabban tudsz hozzá csatlakozni STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Szerver indítása @@ -2056,6 +2047,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}A játé STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Jelszó beállítása STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Védd le a játékodat jelszóval, ha nem akarod hogy illetéktelenek csatlakozzanak +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Hírdetett +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Válassz hírdetett (internet) és nem hírdetett (helyi hálózat, LAN) játék közül. STR_NETWORK_START_SERVER_UNADVERTISED :Nem STR_NETWORK_START_SERVER_ADVERTISED :Igen STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} kliens diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 27a97d1270..283221e8fb 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1487,9 +1487,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Leyft, sérsni STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Staðsetning trjáa í leik: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Stjórnar hvernig tré birtast meðan á leiknum stendur. Þessi stilling getur haft áhrif á iðnað sem byggir á trjám, til dæmis timburverksmiðjur -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Engin {RED}(skemmir timburverksmiðjur) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :aðeins í regnskógum -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :allstaðar STR_CONFIG_SETTING_TOOLBAR_POS :Staðsetning tækjasláar: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Lárétt staða aðal tækjasláar efst á skjánum @@ -1778,8 +1775,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Tengjast STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Endurnýja þjón STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Endurnýja upplýsingar um þjón -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Finna þjón -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Leita að þjónum á neti STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Bæta við þjóni STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Bætir þjóni við listann, hann mun alltaf vera athugaður þegar leitað er eftir leikjum í gangi STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Hefja þjón diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index d74b18ec99..dbf51e6df2 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1606,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linier STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Penempatan pohon dalam permainan: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Mengendalikan kemunculan pohon dalam permainan. Ini akan berefek pada industri yang memerlukan pohon, contohnya pengolahan kayu gelondongan -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Tidak ada {RED}(memotong Pabrik Pengolahan Kayu Gelondongan) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Hanya pada hutan hujan -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Dimanapun STR_CONFIG_SETTING_TOOLBAR_POS :Posisi toolbar utama: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posisi horizontal toolbar utama di bagian atas layar @@ -1930,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Ubah das # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Bermain bersama -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Diiklankan -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Pilih antara permainan diiklankan (internet) dan tidak diiklankan (Jaringan wilayah lokal, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Tidak -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ya STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nama pemain: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Ini adalah nama yang akan terlihat oleh pemain lain @@ -1974,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bergabun STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Cek server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Periksa lagi status server -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Cari server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Cari jaringan server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Tambah server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Daftarkan server baru yang akan dipantau aktivitasnya STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Mulai server @@ -1992,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Nama per STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Atur kata sandi STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Lindungi permainan ini dengan kata kunci jika anda tidak ingin membiarkannya terbuka untuk umum +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Diiklankan +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Pilih antara permainan diiklankan (internet) dan tidak diiklankan (Jaringan wilayah lokal, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Tidak STR_NETWORK_START_SERVER_ADVERTISED :Ya STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klien diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 1bd2cc2413..63fbce5b6e 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -1553,9 +1553,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :ceadaithe, leag STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Áit a chuirtear crainnte sa chluiche: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Rialaigh an áit a gcuirfear na crainn go fánach i rith an chluiche. D'fhéadfadh tionchar a bheith aige seo ar thionscail a bhíonn ag brath ar fhás na gcrann, muilte adhmaid mar shampla -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :ná dean{RED}(bristear an muileann adhmaid) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :i bhforaois bháistí amháin -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :gach áit STR_CONFIG_SETTING_TOOLBAR_POS :Suíomh an phríomhbharra uirlisí: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Suíomh cothrománach an phríomhbharra uirlise ag barr an scáileáin @@ -1875,10 +1872,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Athraigh # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Ilimreoirí -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Fógartha -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Roghnaigh idir cluiche fógartha (idirlín) agus cluiche neamhfhógartha (Líonra Achair Logánta, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Níl -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Tá STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ainm imreora: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Seo an t-ainm faoina mbeidh imreoirí eile in ann tú a aithint @@ -1919,8 +1912,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Téigh i STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Athnuaigh an freastalaí STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Athnuaigh faisnéis an fhreastalaí -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Aimsigh freastalaí -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Cuardaigh líonra le haghaidh freastalaí STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Cuir freastalaí leis STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Cuirtear freastalaí leis an liosta a sheiceálfar i gcónaí le haghaidh cluichí ar rith. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Tosaigh freastalaí @@ -1937,6 +1928,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Taispeá STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Socraigh pasfhocal STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Cosain do chluiche le pasfhocal más mian leat nach mbeidh rochtain phoiblí air +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Fógartha +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Roghnaigh idir cluiche fógartha (idirlín) agus cluiche neamhfhógartha (Líonra Achair Logánta, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Níl STR_NETWORK_START_SERVER_ADVERTISED :Tá STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} {P ch ch ch gc c}lia{P "" "" "" "" i}nt diff --git a/src/lang/italian.txt b/src/lang/italian.txt index c78fd56183..f25f4dc493 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1630,9 +1630,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineare STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Collocazione di alberi durante la partita: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controlla la comparsa casuale di alberi durante una partita. Può influenzare le industrie che dipendono dalla crescita degli alberi, come le segherie -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nessuna {RED}(funzionamento errato segherie) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Solo nelle foreste pluviali -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Ovunque STR_CONFIG_SETTING_TOOLBAR_POS :Posizione barra degli strumenti principale: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posizione orizzontale della barra degli strumenti principale sul bordo superiore dello schermo @@ -1954,10 +1951,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambia l # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multigiocatore -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Pubblico -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Sceglie fra partita pubblica (su Internet) o privata (su rete locale, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sì STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome giocatore: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Questo è il nome con cui si verrà identificati dagli altri giocatori @@ -1998,8 +1991,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Entra ne STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Aggiorna STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Aggiorna le informazioni sul server -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Trova server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Cerca un server sulla rete STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Aggiungi server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Aggiunge un server alla lista di server in cui cercare sempre partite in corso STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Avvia server @@ -2016,6 +2007,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Il nome STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Imposta password STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protegge la partita con una password in modo che non sia accessibile pubblicamente +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Pubblico +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Sceglie fra partita pubblica (su Internet) o privata (su rete locale, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Sì STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 27df32cc5c..d94701aa88 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1553,9 +1553,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :有効(道路 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :樹木の自然成長: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :ゲーム中、ランダムに生えてくる樹種を設定します。設定によっては樹木の生育に依存する産業に悪影響が生じる可能性があります(「不可」にした場合、亜熱帯地域の伐採所を機能させ続けるためには手動で植林し続ける必要があります) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :不能 {RED}(亜熱帯地域の伐採所に影響) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :熱帯雨林地帯のみ -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :全地域 STR_CONFIG_SETTING_TOOLBAR_POS :メインツールバーの位置: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :画面上のメインツールバーの位置を決めます @@ -1875,10 +1872,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}ネク # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}マルチプレイヤーゲーム -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}ゲーム公示 -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}ゲームを公示(インターネット)するか、非公示(LAN)にするかを選びます -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :非公示 -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :公示 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}プレイヤー名: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}他のプレーヤーがあなたを特定するために使う名前です @@ -1919,8 +1912,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}ゲー STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}サーバーを更新 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}サーバー情報を更新します -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}サーバーを検索 -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}ネットワーク上のサーバーを検索します STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}サーバーを追加 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}検索時、常に稼働確認するサーバーのリストに追加します STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}サーバーを開始 @@ -1937,6 +1928,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}ゲー STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}パスワードを設定 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}ゲームをパスワードで保護することができます。一般から公然とアクセスされたくない場合等に設定します +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}ゲーム公示 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}ゲームを公示(インターネット)するか、非公示(LAN)にするかを選びます STR_NETWORK_START_SERVER_UNADVERTISED :非公示 STR_NETWORK_START_SERVER_ADVERTISED :公示 STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}接続者数: {NUM} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index e3135c023a..33382de3f6 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1621,9 +1621,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :선형 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :게임 진행 중에 나무가 자동적으로 번식: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :게임 중에 나무가 자동적으로 번식하는지 여부를 조절합니다. 이 설정을 조정하면, 아열대 기후의 벌목소처럼 나무의 성장에 의존하는 산업시설에 영향을 끼칠 수 있습니다. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :자라지 않음 {RED}(제재소에 의해 벌목될 수 있음) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :열대 우림 지역에서만 -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :어디서나 STR_CONFIG_SETTING_TOOLBAR_POS :주메뉴의 위치: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :주 메뉴가 화면 상단의 어느 위치에 표시될지를 선택합니다. @@ -1947,10 +1944,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}넥타 # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}멀티 플레이 -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}공개 여부 -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}공개된 게임(인터넷)과 비공개된 게임(LAN) 중에서 선택하십시오. -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :아니요 -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :예 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}플레이어 이름: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}다른 사람들에게 보여줄 당신의 이름입니다. @@ -1991,8 +1984,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}게임 STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}새로고침 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}서버 정보를 새로 고칩니다. -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}서버 검색 -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}네트워크에 등록되어 있는 서버를 검색합니다. STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}서버 추가 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}서버를 목록에 수동으로 추가합니다. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}서버 열기 @@ -2009,6 +2000,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}멀티 STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}비밀번호 설정 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}서버에 공개적으로 접근하는 것을 막고 싶을 때 비밀번호를 걸어 보호합니다. +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}공개 여부 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}공개된 게임(인터넷)과 비공개된 게임(LAN) 중에서 선택하십시오. STR_NETWORK_START_SERVER_UNADVERTISED :아니요 STR_NETWORK_START_SERVER_ADVERTISED :예 STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM}명 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index d218e55b7e..98ebc4fc04 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -1770,9 +1770,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linearis STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Positio arborum in ludo: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Quomodo arbores apparent intra ludum. Forsitan industriae afficiuntur quibus necesse sunt arbores, e.g. castra lignatorum -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nulla {RED}(rumpit castra lignatorum) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Modo in silvis plivualibus -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Ubique STR_CONFIG_SETTING_TOOLBAR_POS :Locus primariae arcae instrumentorum: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Locus horizontalis arcae instrumentorum primariae apud apicem fenestrae @@ -2094,10 +2091,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Mutare f # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Modus Plurium Lusorum -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Ostensum -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Eligere servatrum ostensum (interretis) aut non ostensum (LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Non -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ita STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nomen lusoris: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Hoc est nomen tuum aliis lusoribus visibile @@ -2138,8 +2131,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Ludum iu STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Servatrum instaurare STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Iterum arcessere indicia servatri -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Servatrum quaerere -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Quarere servatrum in rete STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Addere servatrum STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Addit servatrum indici quod semper inspicetur si ludus activus insit STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Servatrum incohare @@ -2156,6 +2147,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Hoc ludi STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Elige tesseram STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Custodire tessera ludum tuum, si non vis publicos iungere +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Ostensum +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Eligere servatrum ostensum (interretis) aut non ostensum (LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Non STR_NETWORK_START_SERVER_ADVERTISED :Ita STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} clien{P s tes} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 863a52f2a3..175367f5a2 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1614,9 +1614,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineārs STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Koku izvietojums spēlē: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Vadīt nejaušu koku parādīšanos spēles laikā. Tas var ietekmēt no kokaudzēšanas atkarīgas ražotnes, piemēram kokzāģētavas -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :nav {RED}(nedarbosies kokzāģētavas) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :tikai lietusmežos -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :visur STR_CONFIG_SETTING_TOOLBAR_POS :Galvenās rīkjoslas novietojums: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Galvenās rīkjoslas horizontālais novietojums ekrāna augšējā daļā @@ -1942,10 +1939,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Mainīt # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Vairākspēlētāju spēle -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Izsludināt -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Izvēlieties starp reklamēto (interneta) un nereklamēto (lokālā tīkla, LAN) spēli -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nē -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Jā STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spēlētāja vārds: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Pēc šā vārda jūs atpazīs citi spēlētāji @@ -1986,8 +1979,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Pievieno STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Atsvaidzināt serveri STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Atsvaidzināt servera informāciju -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Atrast serveri -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Meklēt serveri tīklā STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Pievienot serveri STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Pievienot serveri sarakstam, kurš vienmēr tiks pārbaudīts vai tajā nav palaistas spēles STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Palaist serveri @@ -2004,6 +1995,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Spēles STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Uzstādīt paroli STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Aizsargā jūsu spēli ar paroli, ja nevēlaties lai tā būtu publiski pieejama +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Izsludināt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Izvēlieties starp reklamēto (interneta) un nereklamēto (lokālā tīkla, LAN) spēli STR_NETWORK_START_SERVER_UNADVERTISED :Nē STR_NETWORK_START_SERVER_ADVERTISED :Jā STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} spēlētāj{P s i u} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index f211546ea7..d1916d07d8 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1768,9 +1768,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Leista, pasirin STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Savaiminis medžių atsiradimas: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Savaiminio medžių išdygimo nuostatos. Atkreipkite dėmesį, kad šios nuostatos gali paveikti kai kurių pramonės įmonių, pvz., lentpjūvių, darbą -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :nėra {RED}(trukdo lentpjūvėms) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :tik tropiniuose miškuose -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Visur STR_CONFIG_SETTING_TOOLBAR_POS :Pagrindinės įrankių juostos pozicija: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Pagrindinės įrankių lentelės horizontali padėtis ekrano viršuje @@ -2104,10 +2101,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Pakeisti # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Žaidimas tinkle -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Reklamuoti -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Pasirinkite tarp reklamuojamo (internetas) ir nereklamuojamo (Vietinis Tinklas, LAN) žaidimo -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Taip STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Žaidėjo vardas: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Tai vardas, pagal kurį kiti žaidėjai jus atpažins @@ -2148,8 +2141,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Jungtis STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Atnaujinti serverį STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Atnaujinti serverio informaciją -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Rasti serveri -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Ieškoti serverio STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Pridėti serverį STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Prideda serverį į sąrašą, kuris tikrinamas ieškant žaidimų STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Sukurti serverį @@ -2166,6 +2157,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Žaidimo STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Nustatyti slaptažodi STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Apsaugokite savo žaidimą slaptažodžiu, jei nenorite, kad jis būtų viešai prieinamas +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Reklamuoti +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Pasirinkite tarp reklamuojamo (internetas) ir nereklamuojamo (Vietinis Tinklas, LAN) žaidimo STR_NETWORK_START_SERVER_UNADVERTISED :Ne STR_NETWORK_START_SERVER_ADVERTISED :Taip STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P as ai ų} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 749c7e12ba..3fc8b4afcd 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1605,9 +1605,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Bamplazéirung: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontrolléiert zoufälleg Optauche vu Beem während dem Spill. Dëst kann Industrie beaflossen, déi op d'Wuessen vu Beem ugewisen sinn -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Keng{RED}(zerstéiert Bauholzfabrik) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Nëmmen am Reebësch -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Iwwerall STR_CONFIG_SETTING_TOOLBAR_POS :Positioun vun der Haapt-Toolbar: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontal Positioun vun der Haapt-Toolbar uewen um Schierm @@ -1929,10 +1926,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Krawatt # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Ugekënnegt -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Wiel tëschent engem ugekënnegten (Internet) an net ugekënnegten (LAN) Spill -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Jo STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spillernumm: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Daat ass den Numm mat deem iech déi aner Spiller Identifizéieren kënnen @@ -1973,8 +1966,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Spill b STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Server erneieren STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Serverinfo erneieren -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Server sichen -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Am Netzwierk no engem Server sichen STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Server bäisetzen STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Setzt en Server op d'Lëscht wou ëmmer no enger Partie gesicht gëtt STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Server starten @@ -1991,6 +1982,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Den Numm STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Passwuert setzen STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}En Passwuert fir d'Spill setzen, dass et net Public accessibel ass +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Ugekënnegt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Wiel tëschent engem ugekënnegten (Internet) an net ugekënnegten (LAN) Spill STR_NETWORK_START_SERVER_UNADVERTISED :Nee STR_NETWORK_START_SERVER_ADVERTISED :Jo STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} Spiller diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 0b61bdaf56..cdd0056ade 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -1395,9 +1395,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Dibenarkan STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Dibenarkan, susunan bandar sendiri STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Peletakan pokok-pokok dalam permainan: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Tiada {RED}(kilang kayu tidak berfungsi) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Hanya di hutan hujan -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Setiap tempat STR_CONFIG_SETTING_TOOLBAR_POS :Kedudukan palang alat utama: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :Kedudukan bar status: {STRING} @@ -1677,8 +1674,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Sertai p STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Kemaskini STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Kemaskini maklumat pelayan -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Cari pelayan -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Cari rangkaian untuk pelayan STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Tambah pelayan STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Memasukkan pelayan ke dalam senarai yang sentiasa akan disemak untuk permainan yang sedang berjalan. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Mulakan pelayan diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 4dd19b613a..b715bd6c29 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1607,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineær STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plassering av trær i spillet: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontroll tilfeldige utseender til tre under spillet. Dette kan påvirke industrier som avhenger av trevekst, for eksempel trelast -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ingen {RED}(ødelegger sagbruk) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Kun i regnskog -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Overalt STR_CONFIG_SETTING_TOOLBAR_POS :Plassering av hovedverktøylinje: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horisontal posisjon av hoved verktøylinjen på toppen av skjermen @@ -1931,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Endre sl # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Flerspiller -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Annonsert -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Velg mellom et utlyst (internett) og et ikke utlyst (Lokalnettverk, LAN) spill -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nei -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spillernavn: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Dette er navnet andre spillere vil identifisere deg med @@ -1975,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bli med STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Oppdater tjener STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Oppdater tjenerinfo -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Finn tjenere -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Søk på nettverket etter en tjener STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Legg til tjener STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Legger til en tjener til listen som alltid vil bli sjekket for aktive spill. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tjener @@ -1993,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Spillnav STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Sett passord STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Beskytt ditt spill med et passord hvis du ikke vil at hvem som helst skal bli med på det +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Annonsert +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Velg mellom et utlyst (internett) og et ikke utlyst (Lokalnettverk, LAN) spill STR_NETWORK_START_SERVER_UNADVERTISED :Nei STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" er} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 51ca5aa742..d380c3bf3d 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1489,9 +1489,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :tillete STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :tillete, eigendefinert oppsett av by STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plassering av tre i spelet: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :ingen {RED}(øydelegg sagbruk) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :kun i regnskogen -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :over alt STR_CONFIG_SETTING_TOOLBAR_POS :Plassering av hovudverktøylinje: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Plassering av verktøylinja øvst på skjermen @@ -1799,10 +1796,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Byt slip # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Fleirspelar -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Kunngjort -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vel mellom spel på internett (kunngjort) og spel på lokalt nett (ikkje kunngjort) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nei -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spelarnamn: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Dette er namnet andre spelarar vil identifisere deg med @@ -1843,8 +1836,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bli med STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Oppdater tenar STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Oppdater tenarinformasjon -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Finn tenar -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Søk på nettverket etter ein tenar STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Legg til tenar STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Legg til ein tenar i lista over tenarar som alltid vil verte sjekka for aktive spel. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tenar @@ -1861,6 +1852,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Spelnamn STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Set passord STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Beskytt spelet ditt med passord så ikkje kven som helst kan verte med på det +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Kunngjort +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vel mellom spel på internett (kunngjort) og spel på lokalt nett (ikkje kunngjort) STR_NETWORK_START_SERVER_UNADVERTISED :Nei STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" er} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index c20f2894a0..7aa527522a 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1992,9 +1992,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Liniowy STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Rozmieszczenie drzew w grze: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Losowe pojawianie się drzew podczas gry. Może mieć to wpływ na zakłady opierające się na wyrastaniu drzew, np. tartaki -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Brak {RED}(tartaki nie działają) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Tylko w lasach deszczowych -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Wszędzie STR_CONFIG_SETTING_TOOLBAR_POS :Pozycja głównego paska narzędzi: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Pozioma pozycja głównego paska narzędzi na górze ekranu @@ -2318,10 +2315,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Zmień k # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Gra wieloosobowa -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publiczny -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Wybierz między rozgrywkami reklamowanymi (internetowymi) a niereklamowanymi (w sieci lokalnej LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nie -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Tak STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nazwa gracza: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}To jest nazwa pod którą będą Cię widzieć inni gracze @@ -2362,8 +2355,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Przyłą STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Odśwież serwer STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Odśwież informacje o serwerze -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Znajdź serwery -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Przeszukuje sieć w poszukiwaniu serwera STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Dodaj serwer STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Dodaj serwer do listy, która będzie przeszukiwana w poszukiwaniu uruchomionych gier STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Uruchom serwer @@ -2380,6 +2371,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Nazwa gr STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Ustaw hasło STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Zabezpiecz grę hasłem jeśli nie chcesz, by była publicznie dostępna +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publiczny +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Wybierz między rozgrywkami reklamowanymi (internetowymi) a niereklamowanymi (w sieci lokalnej LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Nie STR_NETWORK_START_SERVER_ADVERTISED :Tak STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" ów ów} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 1619365a93..c5a64b04af 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1594,9 +1594,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Criação de árvores no decorrer do jogo: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controlar o aparecimento aleatório de árvores durante o jogo. Isto poderá afectar indústrias que dependem do crescimento de árvores, como as madeireiras -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nenhuma {RED}(Serrações ficam inactivas) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Apenas em florestas húmidas -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Em todo o lado STR_CONFIG_SETTING_TOOLBAR_POS :Posição da barra de ferramentas principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posição horizontal da barra de ferramentas principal no topo do ecrã @@ -1918,10 +1915,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Mudar gr # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multi-jogador -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciado -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escolher entre jogo público (internet) e privado (Área de Rede Local, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Não -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sim STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nome do jogador: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Este é o nome pelo qual os outros jogadores o irão identificar @@ -1962,8 +1955,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Entrar n STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Renovar servidor STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Renovar a informação do servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Localizar servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Pesquisar por um servidor na rede STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Adicionar servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adiciona um servidor à lista que será sempre verificado se existem jogos a decorrer. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Iniciar servidor @@ -1980,6 +1971,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}O nome d STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Definir palavra-chave STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Proteja o jogo com uma senha se não desejar que pessoas indesejadas se juntem +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Anunciado +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Escolher entre jogo público (internet) e privado (Área de Rede Local, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Não STR_NETWORK_START_SERVER_ADVERTISED :Sim STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} cliente{P "" s} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 132b9bc32a..671c754fef 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1558,9 +1558,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :permis, aspect STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Poziţionarea copacilor în joc: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controlează apariția aleatoare a copacilor în joc. Este posibil ca această opțiune să afecteze industrii care depind de creșterea copacilor, cum ar fi fabricile de cherestea -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :niciunul {RED}(afectează producţia fabricii de cherestea) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :doar în pădurile tropicale -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :peste tot STR_CONFIG_SETTING_TOOLBAR_POS :Poziţia barei principale de instrumente: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Poziţia orizontală a barei principale în partea de sus a ecranului @@ -1868,10 +1865,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Schimbă # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publicat -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Alege între un joc publicat (prin Internet) și unul privat (reț) game -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nu -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Numele jucătorului: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Acesta este numele prin care te vor identifica ceilalţi @@ -1912,8 +1905,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Intră STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Actualizează serverul STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Actualizează informaţiile despre server -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Caută server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Caută un server în reţea STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Adaugă un server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adaugă un server la lista care va fi verificată pentru jocuri active STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Porneşte serverul @@ -1930,6 +1921,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Numele j STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Pune parolă STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protejează-ţi jocul cu o parolă dacă nu vrei să intre jucători neautorizaţi +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publicat +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Alege între un joc publicat (prin Internet) și unul privat (reț) game STR_NETWORK_START_SERVER_UNADVERTISED :Nu STR_NETWORK_START_SERVER_ADVERTISED :Da STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} clien{P t ţi} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index e4d40051da..cb62c61674 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1764,9 +1764,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :линейна STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Размножение деревьев в игре: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Настройка возможности самостоятельного размножения деревьев в игре. Это может влиять на работоспособность некоторых предприятий, например, лесопилок. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :отключена {RED}(лесопилки не смогут работать) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :только в тропических лесах -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :везде STR_CONFIG_SETTING_TOOLBAR_POS :Положение главной панели инструментов: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Горизонтальное расположение основной панели инструментов в верхней части экрана @@ -2090,10 +2087,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Изме # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Сетевая игра -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Интернет -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Выберите между игрой через Интернет, либо в локальной сети -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Нет -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Да STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Имя игрока: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Это имя, которое будет видно другим игрокам @@ -2134,8 +2127,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Прис STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Обновить сервер STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Обновить информацию о сервере -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Обновить -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Обновить список серверов, которые сейчас есть в сети STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Добавить сервер STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Добавить сервер в список, который будет автоматически проверяться на идущие игры STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Запуск сервера @@ -2152,6 +2143,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Назв STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Установить пароль STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Защитите вашу игру паролем, если не хотите, чтобы к ней могли подключиться посторонние. +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Интернет +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Выберите между игрой через Интернет, либо в локальной сети STR_NETWORK_START_SERVER_UNADVERTISED :Нет STR_NETWORK_START_SERVER_ADVERTISED :Да STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} клиент{P "" а ов} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 5fb756a846..0ae68ef944 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1760,9 +1760,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :dozvoljeno, zas STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Rasejavanje drveća tokom partije: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontrola nasumične pojave drveća u toku igre. Ovo može uticati na industrije koje zavise o rastu drveća, na primer pilana -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :{G=srednji}nikakvo {RED}(onesposobljava rad drvnih kombinata) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :samo u tropskim šumama -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :svuda STR_CONFIG_SETTING_TOOLBAR_POS :Lokacija glavne trake sa alatima: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontalna pozicija glavne trake s alatkama na vrhu ekrana @@ -2082,10 +2079,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Promena # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Mrežna partija -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK} Sa reklamama -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Odaberite između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ime igrača: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Sa ovim imenom će Vas drugi igrači (pre)poznavati @@ -2126,8 +2119,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Priklju STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Ažuriranje servera STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Ažurirajte podatke sa servera -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Pronađi server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Pretražuje mrežu kako bi pronašao servere STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Dodaj server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Dodaje server na spisak na kojem se uvek proverava za aktivne partije STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Pokreni server @@ -2144,6 +2135,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Naziv pa STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Postavi lozinku STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Ukoliko ne želite da bude javno dostupna zaštitite Vašu partiju lozinkom +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK} Sa reklamama +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Odaberite između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Ne STR_NETWORK_START_SERVER_ADVERTISED :Da STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} igrač{P "" a a} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index e9dd7b7bbf..dd83159435 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1606,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :线性 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :树木自动生长： {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :控制游戏中数目的随机生长，这将影响依赖树木的工业，比如木材厂 -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :无 {RED}(损坏伐木场) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :仅在雨林中 -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :任意地点 STR_CONFIG_SETTING_TOOLBAR_POS :主工具栏位置：{STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :主工具栏在屏幕上方的位置 @@ -1930,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}选择 # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}联机游戏 -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}发布到互联网 -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}选择是否将游戏发布到官方服务器列表。发布的话，可以让互联网上的玩家找到你的服务器并加入游戏，否则进行局域网内的游戏。 -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :否 -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :是 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}玩家名称： STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}其他玩家将通过该名字来认识您 @@ -1974,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}加入 STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}刷新服务器 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}刷新服务器信息 -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}搜索服务器 -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}在网络上搜索服务器 STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}添加服务器 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}添加一个永远显示在列表中的服务器 STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}启动服务器 @@ -1992,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}游戏 STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}设置密码： STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}如果不希望你的游戏被外人加入，请设置一个密码 +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}发布到互联网 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}选择是否将游戏发布到官方服务器列表。发布的话，可以让互联网上的玩家找到你的服务器并加入游戏，否则进行局域网内的游戏。 STR_NETWORK_START_SERVER_UNADVERTISED :否 STR_NETWORK_START_SERVER_ADVERTISED :是 STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} 客户端 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 34546b11ef..5cae9d56ca 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1680,9 +1680,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineárne STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Umiestnenie stromov počas hry: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Riadi náhodný výskyt stromov počas hry. Toto môže ovplyvniť priemysel úzko spojený s rastom stromov ako napríklad Píla. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :žiadne {RED}(znefunkční pílu) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Len v dažďových pralesoch -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :všade STR_CONFIG_SETTING_TOOLBAR_POS :Pozícia hlavného menu: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontálna poloha hlavného ovládacieho panela na vrchu obrazovky @@ -2006,10 +2003,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Zmeniť # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hra pre viac hráčov -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Zverejnené -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vyberte medzi zverejnenou (internet) alebo nezverejnenou (lokálna sieť, LAN) hrou -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nie -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Áno STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Meno hráča: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Toto je meno podla ktoreho vas ostatny identifikuju @@ -2050,8 +2043,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Pripojit STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Obnoviť server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Obnovit info o serveri -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Nájsť server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Hladať server po sieti STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Pridať server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Pridá server do zoznamu, v ktorom sa vždy budú hľadať prebiehajúce hry STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Spustiť server @@ -2068,6 +2059,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Názov h STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Nastaviť heslo STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Zabezpeč hru heslom, ak nechceš povoliť verejný prístup +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Zverejnené +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Vyberte medzi zverejnenou (internet) alebo nezverejnenou (lokálna sieť, LAN) hrou STR_NETWORK_START_SERVER_UNADVERTISED :Nie STR_NETWORK_START_SERVER_ADVERTISED :Áno STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" i ov} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index c493b1d239..c5fffee40f 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1708,9 +1708,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Dovoljeno, obli STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Sajenje dreves znotraj igre: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Nadziraj naključne vrste dreves med igro. To lahko vpliva na industrije, ki so odvisne od rasti dreves, na primer gozdarski obrat. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Nikjer {RED}(onemogoči gozdarski obrat) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Samo v deževnih gozovih -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Povsod STR_CONFIG_SETTING_TOOLBAR_POS :Pozicija glavne orodne vrstice: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Vodoravna pozicija glavne orodne vrstice na vrhu zaslona. @@ -2031,10 +2028,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Spremeni # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Več igralcev -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Oglaševano -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Izberi med oglaševano (internet) in neoglaševano (Local Area Network, LAN) igro -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ne -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Da STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ime igralca: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}To je ime, po katerem te prepoznajo drugi igralci @@ -2075,8 +2068,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Pridruž STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Osveži strežnik STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Osveži informacije strežnika -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Najdi strežnik -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Poišči strežnik na mreži STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Dodaj strežnik STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Doda strežnik na seznam, ki bo vedno preverjen za pognane igre STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Poženi strežnik @@ -2093,6 +2084,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Ime bo p STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Nastavi geslo STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Zaščiti igro z geslom, če želiš preprečiti dostop nepovabljenim +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Oglaševano +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Izberi med oglaševano (internet) in neoglaševano (Local Area Network, LAN) igro STR_NETWORK_START_SERVER_UNADVERTISED :Ne STR_NETWORK_START_SERVER_ADVERTISED :Da STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} gost{P "" a i ov} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 662a067452..0de446fce2 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1607,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineal STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Crecimiento de árboles durante el juego: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controla la aparición aleatoria de árboles durante la partida. Esto puede afectar a industrias que dependen del crecimiento de árboles, como los aserraderos -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ninguno {RED}(rompe aserradero subtropical) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Solo en selva -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Cualquier parte STR_CONFIG_SETTING_TOOLBAR_POS :Posición de la barra de herramientas principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posicionamiento horizontal de la barra de herramientas principal en la parte superior de la pantalla @@ -1931,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambiar # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijugador -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Público -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Permite escoger entre una partida pública (internet) y una partida privada (LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sí STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nombre del jugador: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Este es el nombre con el que otros jugadores le identificarán @@ -1975,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Unirme a STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Recargar servidor STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Recargar información del servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Buscar servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Buscar en la red servidores STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Añadir servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Añade el servidor a una lista que siempre será comprobada para buscar juegos en marcha STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Comenzar servidor @@ -1993,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}La parti STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Establecer contraseña STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protege tu juego con una contraseña si no quieres que otras personas se unan a él +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Público +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Permite escoger entre una partida pública (internet) y una partida privada (LAN) STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Sí STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} cliente{P "" s} diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index ab4340fb46..0f4038bb7b 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -1607,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineal STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Crecimiento de árboles durante la partida: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controlar la aparición aleatoria de árboles durante la partida. Esto puede afectar industrias que dependen del crecimiento de árboles, como los aserraderos -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Ninguno {RED}(inutiliza aserraderos) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Solo en selva -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Cualquier parte STR_CONFIG_SETTING_TOOLBAR_POS :Posición de la barra de herramientas principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posición horizontal de la barra de herramientas principal en la parte superior de la pantalla @@ -1931,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Cambiar # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multijugador -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Público -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Permitir escoger entre una partida pública (Internet) y una partida privada (LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Sí STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Nombre del jugador: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Nombre con el que otros jugadores te identificarán @@ -1975,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Unirse a STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Volver a cargar servidor STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Volver a cargar información del servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Buscar servidor -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Buscar servidor en la red STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Añadir servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Añadir el servidor a una lista que siempre será analizada en busca de partidas activas STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Iniciar servidor @@ -1993,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}La parti STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Establecer contraseña STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Proteger la partida con una contraseña para prevenir el acceso a otras personas +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Público +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Permitir escoger entre una partida pública (Internet) y una partida privada (LAN) STR_NETWORK_START_SERVER_UNADVERTISED :No STR_NETWORK_START_SERVER_ADVERTISED :Sí STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} cliente{P "" s} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 3380d9985b..4e815f3d9a 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1606,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linjär STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Placering av träd i spelläge: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontrollera den slumpmässiga uppkomsten av träd under spelets gång. Detta kan påverka industrier som är beroende av växande träd, till exempel sågverk -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Inga {RED}(förstör sågverk) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Bara i regnskogar -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Överallt STR_CONFIG_SETTING_TOOLBAR_POS :Verktygsradens position: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Verktygsradens horisontella position i skärmens överkant @@ -1930,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Ändra s # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Flera spelare -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publikt -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Välj mellan ett publikt (internet) eller icke publikt (Local Area Network. LAN) spel -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nej -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Spelarnamn: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Namnet som andra spelare kommer se dej som @@ -1974,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Gå med STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Uppdatera server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Uppdatera server info -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Leta server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Sök i nätverket efter en server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Lägg till server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Lägg till en server till listan som alltid kommer kontrolleras för aktiva spel STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Starta server @@ -1992,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Namnet p STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Bestäm lösenord STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Skydda spelet med ett lösenord så att inte andra än dem som har lösenordet kan gå med i spelet +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Publikt +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Välj mellan ett publikt (internet) eller icke publikt (Local Area Network. LAN) spel STR_NETWORK_START_SERVER_UNADVERTISED :Nej STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" er} diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 8d6f31b66b..d40a5fe1db 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -1446,9 +1446,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :நேரிய STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :ஆட்டத்தின் போது மரங்களை நடுதல்: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :விளையாட்டின் போது மரங்களின் சீரற்ற தோற்றத்தைக் கட்டுப்படுத்தவும். இது மர வளர்ச்சியை நம்பியுள்ள தொழில்களை பாதிக்கலாம், எடுத்துக்காட்டாக மரம் வெட்டுதல் ஆலைகள் -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :ஒன்றுமில்லை {RED}(மர மில்லை உடைக்கும்) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :மழைக் காடுகளில் மட்டும் -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :எங்கும் STR_CONFIG_SETTING_TOOLBAR_POS :முக்கிய toolbarஇன் அமைப்பு இடம்: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :status barஇன் அமைப்பு இடம்: {STRING} @@ -1720,9 +1717,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Tie அ # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}பல்வீரர் -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}விளம்பரப்படுத்தப்பட்ட -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :இல்லை -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :ஆம் STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}விளையாடுபவரின் பெயர்: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}இந்தப் பெயரில் பிறர் உன்னை அறிவர் @@ -1762,8 +1756,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}ஆட STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}சர்வரினை புதுப்பிக்கவும் STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}சர்வரின் விவரத்தினை புதுப்பிக்கவும் -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}சர்வரினைத் தேடு -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}சர்வரினை இணையத்தில் தேடு STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}சர்வரினை இணை STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}சர்வரினை ஆரம்பி STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP :{BLACK}தங்களின் சர்வரினை ஆரம்பிக்கவும் @@ -1776,6 +1768,7 @@ STR_NETWORK_START_SERVER_CAPTION :{WHITE}பு STR_NETWORK_START_SERVER_NEW_GAME_NAME :{BLACK}விளையாட்டு பெயர்: STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}கடவுச்சொல்லினை அமைக்கவும் +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}விளம்பரப்படுத்தப்பட்ட STR_NETWORK_START_SERVER_UNADVERTISED :இல்லை STR_NETWORK_START_SERVER_ADVERTISED :ஆம் STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} விளையாடுபவர்{P "" கள்} diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 6974910256..f22411433d 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -1514,9 +1514,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :ยอม, ร STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :การปลูกป่า: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :ควบคุมการสุ่มการเจริญเติบโตของต้นไม้ระหว่างเล่นเกม -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :ไม่มี {RED}(ไม่มีโรงเลื่อยไม้) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :เฉพาะในป่าฝนเท่านั้น -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :ทุกหนทุกแห่ง STR_CONFIG_SETTING_TOOLBAR_POS :ตำแหน่งแถบเครื่องมือหลัก: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :ตำแหน่งของปุ่มเครื่องมือต่างๆด้านบนของจอภาพ @@ -1824,10 +1821,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}เป # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}เล่นหลายคน -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}การประกาศ -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}เลือกระหว่างการโฆษณา (internet) หรือไม่โฆษณา (Local Area Network, LAN) เกม -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :ไม่ใช่ -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :ใช่ STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}ชื่อผู้เล่น: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}เป็นชื่อที่ผู้เล่นคนอื่นจะมองเห็น @@ -1868,8 +1861,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}เข STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}เรียกดูเซิร์ฟเวอร์ใหม่ STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}เรียกดูข้อมูลเซิร์ฟเวอร์ใหม่ -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}หาเซิร์ฟเวอร์ -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}ค้นหาเซิร์ฟเวอร์ในเครือข่าย STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}เพิ่มเซิร์ฟเวอร์ STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}เพิ่มเซิร์ฟเวอร์เข้าไปในรายการซึ่งจะถูกตรวจสอบเพื่อเข้าเล่นเกม STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}เริ่มเซิร์ฟเวอร์ใหม่ @@ -1886,6 +1877,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}ชื STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}กำหนดรหัสผ่าน STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}ป้องกันเกมด้วยรหัสผ่านหากไม่ต้องการให้มีการเข้าร่วมจากบุคคลทั่วไป +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}การประกาศ +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}เลือกระหว่างการโฆษณา (internet) หรือไม่โฆษณา (Local Area Network, LAN) เกม STR_NETWORK_START_SERVER_UNADVERTISED :ไม่ใช่ STR_NETWORK_START_SERVER_ADVERTISED :ใช่ STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} ลูกข่าย diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 4378e68def..6a1bc71d61 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1555,9 +1555,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :允許，可自 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :遊戲中產生樹木的地點：{STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :控制遊戲內是否隨意種植樹木。此選項可能會影響一些依賴樹木的工業 (例如熱帶氣候的伐木場) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :不產生 {RED}(伐木場會停止運作) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :只在雨林區產生 -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :到處產生 STR_CONFIG_SETTING_TOOLBAR_POS :主工具列位置：{STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :設定主工具列在螢幕頂部的位置 @@ -1878,10 +1875,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}改變 # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}多人遊戲 -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}已啟用宣傳 -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}選擇是否在互聯網上宣傳此遊戲 -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :否 -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :是 STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}玩家名稱： STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}這是其他玩家辨認您的名稱 @@ -1922,8 +1915,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}加入 STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}更新伺服器 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}更新伺服器資訊 -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}尋找伺服器 -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}尋找網路上的伺服器 STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}新增伺服器 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}在清單新增會檢查遊戲進行的伺服器 STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}起動伺服器 @@ -1940,6 +1931,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}遊戲 STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}設定密碼 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}如果您不想讓大眾連線的話，可以用密碼保護遊戲 +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}已啟用宣傳 +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}選擇是否在互聯網上宣傳此遊戲 STR_NETWORK_START_SERVER_UNADVERTISED :否 STR_NETWORK_START_SERVER_ADVERTISED :是 STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} 玩家 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index dabcf38102..d050df7cdc 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1607,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Doğrusal STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Oyunda ağaç dikme: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Oyundaki rastgele ağaçların görünümünü kontrol eder. Bu, ağaçların büyümesine bağımlı olan endüstrileri etkileyebilir, örneğin keresteciler gibi -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Hiçbiri {RED}(kauçuk fabrikasını yok eder) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Yalnız yağmur ormanlarında -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Her yerde STR_CONFIG_SETTING_TOOLBAR_POS :Ana araç çubuğu konumu: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Ekranın üst kısmındaki ana araç çubuğunun yatay konumu @@ -1931,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Kravatı # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Çok Oyunculu -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Duyurulan -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Duyurulan (internet) ve duyurulmayan (yerel ağ, LAN) oyun türlerinden birini seçin -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Hayır -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Evet STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Oyuncu adı: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Oyuncuların görecegi adınızı seçin @@ -1975,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Oyuna gi STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Sunucuyu tazele STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Sunucu bilgisini tazele -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Sunucu bul -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Sunucu bulmak için bir agi ara STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Sunucu ekle STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Her zaman çalışan oyunlarına bakabilmek için bir sunucu ekle STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Sunucu başlat @@ -1993,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Bu oyun STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Parola koy STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Erişimi kısıtlamak için oyuna parola koy +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Duyurulan +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Duyurulan (internet) ve duyurulmayan (yerel ağ, LAN) oyun türlerinden birini seçin STR_NETWORK_START_SERVER_UNADVERTISED :Hayır STR_NETWORK_START_SERVER_ADVERTISED :Evet STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} istemci diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 80957f3b30..20fd218ae5 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1734,9 +1734,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :лінійна STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Поява дерев під час гри: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Налаштування випадкової появи дерев на карті в процесі гри. Ця настройка також впливає на відповідні підприємства, такі як лісопилки. -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Відсутня {RED}(зупиняє лісопилки) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Тільки у тропіках -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Скрізь STR_CONFIG_SETTING_TOOLBAR_POS :Позиція головного меню: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Горизонтальна позиція основної панелі інструментів. @@ -2058,10 +2055,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Змін # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Мережева гра -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Інтернет -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Вибір між рекламованою (інтернет) і не рекламованою (локальна мережа, LAN) грою -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Ні -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Так STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Ім'я гравця: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Ім'я, за яким тебе розпізнаватимуть інші гравці @@ -2102,8 +2095,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Приє STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Оновити сервер STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Оновити інформацію про сервер -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Знайти сервер -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Пошук мережі для сервера STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Додати сервер STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Додає сервер до списку, який завжди буде перевірятись на поточні ігри STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Створити сервер @@ -2120,6 +2111,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Назв STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Встановити пароль STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Захистіть вашу гру паролем, якщо не бажаєте загального доступу +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Інтернет +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Вибір між рекламованою (інтернет) і не рекламованою (локальна мережа, LAN) грою STR_NETWORK_START_SERVER_UNADVERTISED :Ні STR_NETWORK_START_SERVER_ADVERTISED :Так STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} клієнт{P "" а ів} diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index 58b66ecfdf..2c340098e1 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -611,8 +611,6 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT :чӑн STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID :2x2 STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID :3x3 -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :ҫук {RED}(breaks lumber mill) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :таҫта та STR_CONFIG_SETTING_TOWN_GROWTH_NONE :Ҫук STR_CONFIG_SETTING_TOWN_GROWTH_SLOW :Вӑрах @@ -755,7 +753,6 @@ STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}ХИР STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Сервер ҫӗнет -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Сервер туп STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Сервер хуш STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Сервер пуҫ diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index cf8cbb22a2..d6fa9b60d6 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1527,9 +1527,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Tastean STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Tastean, oanpast strittepatroan STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Bouen fan beamen yn it spul: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Gjin {RED}(brekt houtseachmûne) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Allinich yn reinwâlden -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Oerol STR_CONFIG_SETTING_TOOLBAR_POS :Plak fan de haad wurkbalk: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :Posysje fan statusbalke: {STRING} @@ -1800,10 +1797,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Feroarje # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertearre -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tusken in advertearre (ynternet) of in net-advertearre (LAN) spul -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Nee -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ja STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Namme fan spieler: STR_NETWORK_SERVER_LIST_GAME_NAME :{BLACK}Namme @@ -1835,7 +1828,6 @@ STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}FERKEAR STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Meidwaan mei spul STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Laad tsjinner ynfo opnij -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Server sykje STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Tsjinner tafoegje STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tsjinner STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP :{BLACK}Start dien eigen tsjinner @@ -1849,6 +1841,8 @@ STR_NETWORK_START_SERVER_CAPTION :{WHITE}Start in STR_NETWORK_START_SERVER_NEW_GAME_NAME :{BLACK}Spulnamme: STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Wachtwurd ynstelle +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Advertearre +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Kies tusken in advertearre (ynternet) of in net-advertearre (LAN) spul STR_NETWORK_START_SERVER_UNADVERTISED :Nee STR_NETWORK_START_SERVER_ADVERTISED :Ja STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} kliïnt{P "" en} diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 4637e7369f..0deccf4c09 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -555,7 +555,6 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Violkolora -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :omnube diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 186f60e93a..05a2131cb5 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -1340,9 +1340,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :مجاز STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :آزاد و با نمایه دلخواه STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :محل قرارگرفتن درخت‌ها: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :هیچکدام{RED}(سبب تعطیلی صنعت چوب والوار می‌شود) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :فقط در جنگلهای بارانی -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :همه جا STR_CONFIG_SETTING_TOOLBAR_POS :محل نوار ابزار اصلی: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :محل نوار وضعیت: {STRING} @@ -1590,9 +1587,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}تغیی # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}چندنفره -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}تبلیغ دار -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :خیر -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :بله STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}نام بازیگر: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}این نامی است که بقیه بازیگران شما را به آن نام می شناسند @@ -1633,8 +1627,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}الحا STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}تازه سازی سرویس دهنده STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}تازه سازی اطلاعات سرویس دهنده -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}جستجوی سرویس دهنده -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}جستجو در شبکه برای سرویس دهنده STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}اضافه کردن سرویس دهنده STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}اضافه کردن یک سرویس دهنده به لیست که هربار برای بازی در حال اجرا آزمایش می گردد STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}اجرای سرویس دهنده @@ -1651,6 +1643,7 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}بازی STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}ثبت رمز STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}اگر بازی برای استفاده همگان نیست، بازی خود را با رمز محافظت کنید +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}تبلیغ دار STR_NETWORK_START_SERVER_UNADVERTISED :خیر STR_NETWORK_START_SERVER_ADVERTISED :بله STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} سرویس گیرنده diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 481ceb13be..4197bb681b 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -1267,9 +1267,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :اجازت ہے STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :اپنی مرضی کے شہر کے پھیلاو کی اجازت ہے STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :کھیل میں درخت لگانے کی اجازت: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :کوئی نہیں {RED}(لکڑ مل ٹوٹ گئی) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :صرف بارش کے جنگلوں میں -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :ہر جگہ STR_CONFIG_SETTING_TOOLBAR_POS :بنیادی ٹول بار کی جگہ: {STRING} STR_CONFIG_SETTING_STATUSBAR_POS :حالات کی پٹی: {STRING} @@ -1526,8 +1523,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}کھیل STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}سرور کو تازہ کریں STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}سرور کی معلومات کو تازہ کریں -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}سرور ڈھونڈیں -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}سرور کے لئے نیٹ ورک تلاش کریں STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}سرور شامل کریں STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}سرور کو اس فہرست میں شامل کریں جو ہمیشہ کھیل شروع کرنے کے لئے پرکھی جاتی ہے STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}سرور شروع کریں diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 2d02f45952..ecfa0bdf79 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1608,9 +1608,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Tuyến tính STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Trồng cây trong trò chơi: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Điều khiển sự xuất hiện tự dộng của cây cối khi đang chơi. Điều này có thể ảnh hưởng đến những nhà máy dựa vào cây cối, ví dự như nhà máy chế biến gỗgỗ -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :không có {RED}(nhà máy chế biến gỗ bị ngưng) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Chỉ trong rừng nhiệt đới -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Mọi nơi STR_CONFIG_SETTING_TOOLBAR_POS :Vị trí của thanh công cụ chính: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Vị trí nằm ngang của thanh công cụ chính ở phía trên màn hình @@ -1932,10 +1929,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Thay đ # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Ván Chơi Mạng -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Đã quảng bá -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Lựa chọn ván chơi quảng bá (ra ngoài internet) và không quảng bá (Local Area Network, LAN) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Không -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Có STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Tên người chơi: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Đây là tên khác mà người chơi sẽ nhận ra bạn @@ -1976,8 +1969,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Vào gam STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Refresh server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Refresh thông tin server -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Tìm server -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Tìm server trong mạng STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Thêm server STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Thêm server vào danh sách luôn được chọn khi chạy game. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Tạo server @@ -1994,6 +1985,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Tên c STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Đặt mật khẩu STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Bảo vệ game của bạn bằng mật khẩu nếu bạn không muốn người khác vào tùy tiện +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Đã quảng bá +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Lựa chọn ván chơi quảng bá (ra ngoài internet) và không quảng bá (Local Area Network, LAN) STR_NETWORK_START_SERVER_UNADVERTISED :Không STR_NETWORK_START_SERVER_ADVERTISED :Có STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} máy trạm diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 2f6048c31c..fea52d6ffd 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1559,9 +1559,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Caniatáu, cynl STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Gosod coed mewn gêm: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Rheoli ymddangosiad coed ar hap yn ystod y gêm. Gall hyn effeithio ar ddiwydiannau sy'n ddibynnol ar dyfiant coed, megis melinau coed -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :Dim {RED}(yn torri'r felin goed) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :Mewn glawgoedwigoedd yn unig -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :Pob man STR_CONFIG_SETTING_TOOLBAR_POS :Safle'r prif far offer: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Lleoliad llorweddol y brif bar offer ar frig y sgrin @@ -1883,10 +1880,6 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Newid te # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Amlchwaraewr -STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Hysbys -STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Dewis rhwyd gêm a hysbysebir (rhyngrwyd) neu un anhysbys (rhwydwaith leol) -STR_NETWORK_SERVER_LIST_ADVERTISED_NO :Na -STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Ia STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Enw chwaraewr: STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Byddwch chi'n ymddangos i'r chwaraewyr eraill dan yr enw hwn @@ -1927,8 +1920,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Ymuno â STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Adnewyddu'r gweinydd STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Adnewyddu'r wybodaeth am y gweinydd -STR_NETWORK_SERVER_LIST_FIND_SERVER :{BLACK}Canfod gweinydd -STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP :{BLACK}Chwilio'r rhwydwaith am weinydd STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Ychwanegu gweinydd STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Ychwanegu gweinydd i'r rhestr a gaiff ei wirio bob tro am gemau sy'n rhedeg STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Dechrau gweinydd @@ -1945,6 +1936,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Bydd y g STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Gosod cyfrinair STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Diogelwch eich gêm â chyfrinair os nad ydych am i fynediad ato fod yn gyhoeddus +STR_NETWORK_START_SERVER_ADVERTISED_LABEL :{BLACK}Hysbys +STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP :{BLACK}Dewis rhwyd gêm a hysbysebir (rhyngrwyd) neu un anhysbys (rhwydwaith leol) STR_NETWORK_START_SERVER_UNADVERTISED :Na STR_NETWORK_START_SERVER_ADVERTISED :Ia STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} gwestai From 8c0e4ab07fdd01c0fe7eba9e74214289195cd238 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Fri, 25 Dec 2020 17:03:31 +0100 Subject: [PATCH 32/38] Doc: for over 10 years now, we do not load the exact AI version first (#8431) See commit fae34ee7 for details. The documentation simply never got updated. --- src/script/api/script_controller.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.hpp index 79cb65a74f..c6b07232db 100644 --- a/src/script/api/script_controller.hpp +++ b/src/script/api/script_controller.hpp @@ -23,7 +23,6 @@ * script that matches to the specified version as close as possible. It tries * (from first to last, stopping as soon as the attempt succeeds) * - * - load the exact same version of the same script, * - load the latest version of the same script that supports loading data from * the saved version (the version of saved data must be equal or greater * than ScriptInfo::MinVersionToLoad), From 29e3331055a784ead663b62a67ef13b0112af1df Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Fri, 25 Dec 2020 14:44:28 +0100 Subject: [PATCH 33/38] Codechange: move block a bit lower to increase readability It was rather confusing that "library_name" was calculated, and then not used to do the FindLibrary() call. Flipping those two blocks around makes it a bit more sane to read. --- src/script/api/script_controller.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp index 461a6c61be..adfcf2acdc 100644 --- a/src/script/api/script_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -111,11 +111,6 @@ ScriptController::~ScriptController() Squirrel *engine = ScriptObject::GetActiveInstance()->engine; HSQUIRRELVM vm = engine->GetVM(); - /* Internally we store libraries as 'library.version' */ - char library_name[1024]; - seprintf(library_name, lastof(library_name), "%s.%d", library, version); - strtolower(library_name); - ScriptInfo *lib = ScriptObject::GetActiveInstance()->FindLibrary(library, version); if (lib == nullptr) { char error[1024]; @@ -123,6 +118,11 @@ ScriptController::~ScriptController() throw sq_throwerror(vm, error); } + /* Internally we store libraries as 'library.version' */ + char library_name[1024]; + seprintf(library_name, lastof(library_name), "%s.%d", library, version); + strtolower(library_name); + /* Get the current table/class we belong to */ HSQOBJECT parent; sq_getstackobj(vm, 1, &parent); From 4319d31036a243cce860511a1b543461c9677f41 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Fri, 25 Dec 2020 15:22:40 +0100 Subject: [PATCH 34/38] Fix #6468: don't store version of AIs-started-via-console in name You can do: "startai myai.3", which starts version 3 of "myai". This is very useful for testing save/load code between different versions of your AI. However, when using this syntax, the AI got saved as "myai.3" as name of the AI, instead of "myai". This caused several problems, like indicating to the user the AI could not be found, but still load the AI. But in all cases, the AI never got the chance to load the saved data, making the whole reason this exists pointless. By splitting the name and version already in the console command, the code becomes simpler and AIs started this way now follow the normal flow after initialization. --- src/ai/ai_scanner.cpp | 16 +++++----------- src/console_cmds.cpp | 19 ++++++++++++++++++- src/game/game_scanner.cpp | 16 +++++----------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp index ee14fd2147..aeb5b50fae 100644 --- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -101,20 +101,10 @@ AIInfo *AIScannerInfo::FindInfo(const char *nameParam, int versionParam, bool fo strecpy(ai_name, nameParam, lastof(ai_name)); strtolower(ai_name); - AIInfo *info = nullptr; - int version = -1; - if (versionParam == -1) { /* We want to load the latest version of this AI; so find it */ if (this->info_single_list.find(ai_name) != this->info_single_list.end()) return static_cast(this->info_single_list[ai_name]); - - /* If we didn't find a match AI, maybe the user included a version */ - char *e = strrchr(ai_name, '.'); - if (e == nullptr) return nullptr; - *e = '\0'; - e++; - versionParam = atoi(e); - /* Continue, like we were calling this function with a version. */ + return nullptr; } if (force_exact_match) { @@ -123,8 +113,12 @@ AIInfo *AIScannerInfo::FindInfo(const char *nameParam, int versionParam, bool fo seprintf(ai_name_tmp, lastof(ai_name_tmp), "%s.%d", ai_name, versionParam); strtolower(ai_name_tmp); if (this->info_list.find(ai_name_tmp) != this->info_list.end()) return static_cast(this->info_list[ai_name_tmp]); + return nullptr; } + AIInfo *info = nullptr; + int version = -1; + /* See if there is a compatible AI which goes by that name, with the highest * version which allows loading the requested version */ ScriptInfoList::iterator it = this->info_list.begin(); diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 2f678b2fc7..e87232b365 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -1172,7 +1172,24 @@ DEF_CONSOLE_CMD(ConStartAI) AIConfig *config = AIConfig::GetConfig((CompanyID)n); if (argc >= 2) { - config->Change(argv[1], -1, true); + config->Change(argv[1], -1, false); + + /* If the name is not found, and there is a dot in the name, + * try again with the assumption everything right of the dot is + * the version the user wants to load. */ + if (!config->HasScript()) { + char *name = stredup(argv[1]); + char *e = strrchr(name, '.'); + if (e != nullptr) { + *e = '\0'; + e++; + + int version = atoi(e); + config->Change(name, version, true); + } + free(name); + } + if (!config->HasScript()) { IConsoleWarning("Failed to load the specified AI"); return true; diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp index 68efa350c2..6bcba4455e 100644 --- a/src/game/game_scanner.cpp +++ b/src/game/game_scanner.cpp @@ -40,20 +40,10 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo strecpy(game_name, nameParam, lastof(game_name)); strtolower(game_name); - GameInfo *info = nullptr; - int version = -1; - if (versionParam == -1) { /* We want to load the latest version of this Game script; so find it */ if (this->info_single_list.find(game_name) != this->info_single_list.end()) return static_cast(this->info_single_list[game_name]); - - /* If we didn't find a match Game script, maybe the user included a version */ - char *e = strrchr(game_name, '.'); - if (e == nullptr) return nullptr; - *e = '\0'; - e++; - versionParam = atoi(e); - /* Continue like we were calling this function with a version. */ + return nullptr; } if (force_exact_match) { @@ -62,8 +52,12 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo seprintf(game_name_tmp, lastof(game_name_tmp), "%s.%d", game_name, versionParam); strtolower(game_name_tmp); if (this->info_list.find(game_name_tmp) != this->info_list.end()) return static_cast(this->info_list[game_name_tmp]); + return nullptr; } + GameInfo *info = nullptr; + int version = -1; + /* See if there is a compatible Game script which goes by that name, with the highest * version which allows loading the requested version */ ScriptInfoList::iterator it = this->info_list.begin(); From 9add62796c91c8eb7dd971cb21c8cdeba49cadfa Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 25 Dec 2020 18:16:29 +0000 Subject: [PATCH 35/38] Update: Translations from eints finnish: 10 changes by hpiirai --- src/lang/finnish.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 254621dce4..6a81b13454 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1619,7 +1619,11 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL :Neliöllinen (a STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineaarinen STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Puiden istutus pelissä: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Määrittää puiden sattumanvaraisen luomisen. Tämä voi vaikuttaa teollisuuslaitoksiin jotka ovat riippuvaisia puiden kasvamisesta, esimerkiksi sahat +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Määrittää puiden sattumanvaraisen luomisen. Tämä voi vaikuttaa teollisuuslaitoksiin, jotka ovat riippuvaisia puiden kasvamisesta, esimerkiksi sahat. +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Puut kasvavat, mutta eivät leviä {RED}(rikkoo sahan) +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Puut kasvavat, mutta leviävät vain sademetsissä +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Puut kasvavat ja leviävät kaikkialla +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Puut eivät kasva eivätkä leviä {RED}(rikkoo sahan) STR_CONFIG_SETTING_TOOLBAR_POS :Päätyökalupalkin sijainti: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Ruudun yläreunassa olevan työkalupalkin sijainti vaakasuunnassa @@ -1983,6 +1987,10 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Liity pe STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Päivitä STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Päivitä palvelintiedot +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :{BLACK}Etsi internetistä +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Etsi julkisia palvelimia internetistä +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN :{BLACK}Etsi lähiverkosta +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Etsi palvelimia lähiverkosta STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Lisää palvelin STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Lisää palvelin listaan, joka käydään läpi aina uusia pelejä haettaessa STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Käynnistä palvelin @@ -4720,7 +4728,7 @@ STR_INDUSTRY_NAME_WATER_SUPPLY :Lähde STR_INDUSTRY_NAME_WATER_TOWER :Vesitorni STR_INDUSTRY_NAME_FACTORY_2 :Tehdas STR_INDUSTRY_NAME_FARM_2 :Maatila -STR_INDUSTRY_NAME_LUMBER_MILL :Hakkuualue +STR_INDUSTRY_NAME_LUMBER_MILL :Saha STR_INDUSTRY_NAME_COTTON_CANDY_FOREST :Hattarametsä STR_INDUSTRY_NAME_CANDY_FACTORY :Karkkitehdas STR_INDUSTRY_NAME_BATTERY_FARM :Paristomaatila From f66baa444ff5575b2b40e3bfd514cdb463f6f560 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Fri, 25 Dec 2020 19:38:18 +0100 Subject: [PATCH 36/38] Codechange: use C++11 constructs for for-each loops (#8432) --- src/ai/ai_gui.cpp | 25 +++++++++-------- src/ai/ai_scanner.cpp | 17 ++++++----- src/game/game_scanner.cpp | 13 ++++----- src/script/api/script_controller.cpp | 12 ++++---- src/script/script_config.cpp | 42 ++++++++++++++-------------- src/script/script_info.cpp | 32 ++++++++++----------- src/script/script_scanner.cpp | 25 ++++++++--------- 7 files changed, 81 insertions(+), 85 deletions(-) diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index d61cfea0dc..078bde4e14 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -87,8 +87,8 @@ struct AIListWindow : public Window { if (GetConfig(slot)->HasScript()) { ScriptInfo *info = GetConfig(slot)->GetInfo(); int i = 0; - for (ScriptInfoList::const_iterator it = this->info_list->begin(); it != this->info_list->end(); it++, i++) { - if ((*it).second == info) { + for (const auto &item : *this->info_list) { + if (item.second == info) { this->selected = i; break; } @@ -127,10 +127,11 @@ struct AIListWindow : public Window { DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_ORANGE); y += this->line_height; } - ScriptInfoList::const_iterator it = this->info_list->begin(); - for (int i = 1; it != this->info_list->end(); i++, it++) { + int i = 1; + for (const auto &item : *this->info_list) { + i++; if (this->vscroll->IsVisible(i)) { - DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, (*it).second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_ORANGE); + DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, item.second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_ORANGE); y += this->line_height; } } @@ -138,9 +139,10 @@ struct AIListWindow : public Window { } case WID_AIL_INFO_BG: { AIInfo *selected_info = nullptr; - ScriptInfoList::const_iterator it = this->info_list->begin(); - for (int i = 1; selected_info == nullptr && it != this->info_list->end(); i++, it++) { - if (this->selected == i - 1) selected_info = static_cast((*it).second); + int i = 1; + for (const auto &item : *this->info_list) { + i++; + if (this->selected == i - 1) selected_info = static_cast(item.second); } /* Some info about the currently selected AI. */ if (selected_info != nullptr) { @@ -334,11 +336,10 @@ struct AISettingsWindow : public Window { { visible_settings.clear(); - ScriptConfigItemList::const_iterator it = this->ai_config->GetConfigList()->begin(); - for (; it != this->ai_config->GetConfigList()->end(); it++) { - bool no_hide = (it->flags & SCRIPTCONFIG_DEVELOPER) == 0; + for (const auto &item : *this->ai_config->GetConfigList()) { + bool no_hide = (item.flags & SCRIPTCONFIG_DEVELOPER) == 0; if (no_hide || _settings_client.gui.ai_developer_tools) { - visible_settings.push_back(&(*it)); + visible_settings.push_back(&item); } } diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp index aeb5b50fae..1431a2820b 100644 --- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -61,8 +61,8 @@ void AIScannerInfo::RegisterAPI(class Squirrel *engine) AIInfo *AIScannerInfo::SelectRandomAI() const { uint num_random_ais = 0; - for (ScriptInfoList::const_iterator it = this->info_single_list.begin(); it != this->info_single_list.end(); it++) { - AIInfo *i = static_cast((*it).second); + for (const auto &item : info_single_list) { + AIInfo *i = static_cast(item.second); if (i->UseAsRandomAI()) num_random_ais++; } @@ -121,11 +121,10 @@ AIInfo *AIScannerInfo::FindInfo(const char *nameParam, int versionParam, bool fo /* See if there is a compatible AI which goes by that name, with the highest * version which allows loading the requested version */ - ScriptInfoList::iterator it = this->info_list.begin(); - for (; it != this->info_list.end(); it++) { - AIInfo *i = static_cast((*it).second); + for (const auto &item : this->info_list) { + AIInfo *i = static_cast(item.second); if (strcasecmp(ai_name, i->GetName()) == 0 && i->CanLoadFromVersion(versionParam) && (version == -1 || i->GetVersion() > version)) { - version = (*it).second->GetVersion(); + version = item.second->GetVersion(); info = i; } } @@ -158,8 +157,8 @@ AILibrary *AIScannerLibrary::FindLibrary(const char *library, int version) strtolower(library_name); /* Check if the library + version exists */ - ScriptInfoList::iterator iter = this->info_list.find(library_name); - if (iter == this->info_list.end()) return nullptr; + ScriptInfoList::iterator it = this->info_list.find(library_name); + if (it == this->info_list.end()) return nullptr; - return static_cast((*iter).second); + return static_cast((*it).second); } diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp index 6bcba4455e..1935b78137 100644 --- a/src/game/game_scanner.cpp +++ b/src/game/game_scanner.cpp @@ -60,11 +60,10 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo /* See if there is a compatible Game script which goes by that name, with the highest * version which allows loading the requested version */ - ScriptInfoList::iterator it = this->info_list.begin(); - for (; it != this->info_list.end(); it++) { - GameInfo *i = static_cast((*it).second); + for (const auto &item : this->info_list) { + GameInfo *i = static_cast(item.second); if (strcasecmp(game_name, i->GetName()) == 0 && i->CanLoadFromVersion(versionParam) && (version == -1 || i->GetVersion() > version)) { - version = (*it).second->GetVersion(); + version = item.second->GetVersion(); info = i; } } @@ -97,8 +96,8 @@ GameLibrary *GameScannerLibrary::FindLibrary(const char *library, int version) strtolower(library_name); /* Check if the library + version exists */ - ScriptInfoList::iterator iter = this->info_list.find(library_name); - if (iter == this->info_list.end()) return nullptr; + ScriptInfoList::iterator it = this->info_list.find(library_name); + if (it == this->info_list.end()) return nullptr; - return static_cast((*iter).second); + return static_cast((*it).second); } diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp index adfcf2acdc..e74f27e4a4 100644 --- a/src/script/api/script_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -77,9 +77,9 @@ ScriptController::ScriptController(CompanyID company) : ScriptController::~ScriptController() { - for (LoadedLibraryList::iterator iter = this->loaded_library.begin(); iter != this->loaded_library.end(); iter++) { - free((*iter).second); - free((*iter).first); + for (const auto &item : this->loaded_library) { + free(item.second); + free(item.first); } this->loaded_library.clear(); @@ -129,9 +129,9 @@ ScriptController::~ScriptController() char fake_class[1024]; - LoadedLibraryList::iterator iter = controller->loaded_library.find(library_name); - if (iter != controller->loaded_library.end()) { - strecpy(fake_class, (*iter).second, lastof(fake_class)); + LoadedLibraryList::iterator it = controller->loaded_library.find(library_name); + if (it != controller->loaded_library.end()) { + strecpy(fake_class, (*it).second, lastof(fake_class)); } else { int next_number = ++controller->loaded_library_count; diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp index 4ebd049161..8de141e662 100644 --- a/src/script/script_config.cpp +++ b/src/script/script_config.cpp @@ -32,9 +32,9 @@ void ScriptConfig::Change(const char *name, int version, bool force_exact_match, if (_game_mode == GM_NORMAL && this->info != nullptr) { /* If we're in an existing game and the Script is changed, set all settings * for the Script that have the random flag to a random value. */ - for (ScriptConfigItemList::const_iterator it = this->info->GetConfigList()->begin(); it != this->info->GetConfigList()->end(); it++) { - if ((*it).flags & SCRIPTCONFIG_RANDOM) { - this->SetSetting((*it).name, InteractiveRandomRange((*it).max_value + 1 - (*it).min_value) + (*it).min_value); + for (const auto &item : *this->info->GetConfigList()) { + if (item.flags & SCRIPTCONFIG_RANDOM) { + this->SetSetting(item.name, InteractiveRandomRange(item.max_value + 1 - item.min_value) + item.min_value); } } this->AddRandomDeviation(); @@ -49,8 +49,8 @@ ScriptConfig::ScriptConfig(const ScriptConfig *config) this->config_list = nullptr; this->is_random = config->is_random; - for (SettingValueList::const_iterator it = config->settings.begin(); it != config->settings.end(); it++) { - this->settings[stredup((*it).first)] = (*it).second; + for (const auto &item : config->settings) { + this->settings[stredup(item.first)] = item.second; } this->AddRandomDeviation(); } @@ -79,24 +79,24 @@ const ScriptConfigItemList *ScriptConfig::GetConfigList() void ScriptConfig::ClearConfigList() { - for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) { - free((*it).first); + for (const auto &item : this->settings) { + free(item.first); } this->settings.clear(); } void ScriptConfig::AnchorUnchangeableSettings() { - for (ScriptConfigItemList::const_iterator it = this->GetConfigList()->begin(); it != this->GetConfigList()->end(); it++) { - if (((*it).flags & SCRIPTCONFIG_INGAME) == 0) { - this->SetSetting((*it).name, this->GetSetting((*it).name)); + for (const auto &item : *this->GetConfigList()) { + if ((item.flags & SCRIPTCONFIG_INGAME) == 0) { + this->SetSetting(item.name, this->GetSetting(item.name)); } } } int ScriptConfig::GetSetting(const char *name) const { - SettingValueList::const_iterator it = this->settings.find(name); + const auto it = this->settings.find(name); if (it == this->settings.end()) return this->info->GetSettingDefaultValue(name); return (*it).second; } @@ -111,7 +111,7 @@ void ScriptConfig::SetSetting(const char *name, int value) value = Clamp(value, config_item->min_value, config_item->max_value); - SettingValueList::iterator it = this->settings.find(name); + const auto it = this->settings.find(name); if (it != this->settings.end()) { (*it).second = value; } else { @@ -121,17 +121,17 @@ void ScriptConfig::SetSetting(const char *name, int value) void ScriptConfig::ResetSettings() { - for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) { - free((*it).first); + for (const auto &item : this->settings) { + free(item.first); } this->settings.clear(); } void ScriptConfig::AddRandomDeviation() { - for (ScriptConfigItemList::const_iterator it = this->GetConfigList()->begin(); it != this->GetConfigList()->end(); it++) { - if ((*it).random_deviation != 0) { - this->SetSetting((*it).name, InteractiveRandomRange((*it).random_deviation * 2 + 1) - (*it).random_deviation + this->GetSetting((*it).name)); + for (const auto &item : *this->GetConfigList()) { + if (item.random_deviation != 0) { + this->SetSetting(item.name, InteractiveRandomRange(item.random_deviation * 2 + 1) - item.random_deviation + this->GetSetting(item.name)); } } } @@ -186,16 +186,16 @@ void ScriptConfig::SettingsToString(char *string, const char *last) const { char *s = string; *s = '\0'; - for (SettingValueList::const_iterator it = this->settings.begin(); it != this->settings.end(); it++) { + for (const auto &item : this->settings) { char no[10]; - seprintf(no, lastof(no), "%d", (*it).second); + seprintf(no, lastof(no), "%d", item.second); /* Check if the string would fit in the destination */ - size_t needed_size = strlen((*it).first) + 1 + strlen(no); + size_t needed_size = strlen(item.first) + 1 + strlen(no); /* If it doesn't fit, skip the next settings */ if (string + needed_size > last) break; - s = strecat(s, (*it).first, last); + s = strecat(s, item.first, last); s = strecat(s, "=", last); s = strecat(s, no, last); s = strecat(s, ",", last); diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp index 53a8fb30ef..4eebd548d3 100644 --- a/src/script/script_info.cpp +++ b/src/script/script_info.cpp @@ -20,14 +20,14 @@ ScriptInfo::~ScriptInfo() { /* Free all allocated strings */ - for (ScriptConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) { - free((*it).name); - free((*it).description); - if (it->labels != nullptr) { - for (auto &lbl_map : *(*it).labels) { + for (const auto &item : this->config_list) { + free(item.name); + free(item.description); + if (item.labels != nullptr) { + for (auto &lbl_map : *item.labels) { free(lbl_map.second); } - delete it->labels; + delete item.labels; } } this->config_list.clear(); @@ -232,8 +232,8 @@ SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm) ValidateString(setting_name); ScriptConfigItem *config = nullptr; - for (ScriptConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) { - if (strcmp((*it).name, setting_name) == 0) config = &(*it); + for (auto &item : this->config_list) { + if (strcmp(item.name, setting_name) == 0) config = &item; } if (config == nullptr) { @@ -284,22 +284,22 @@ const ScriptConfigItemList *ScriptInfo::GetConfigList() const const ScriptConfigItem *ScriptInfo::GetConfigItem(const char *name) const { - for (ScriptConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) { - if (strcmp((*it).name, name) == 0) return &(*it); + for (const auto &item : this->config_list) { + if (strcmp(item.name, name) == 0) return &item; } return nullptr; } int ScriptInfo::GetSettingDefaultValue(const char *name) const { - for (ScriptConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) { - if (strcmp((*it).name, name) != 0) continue; + for (const auto &item : this->config_list) { + if (strcmp(item.name, name) != 0) continue; /* The default value depends on the difficulty level */ switch (GetGameSettings().script.settings_profile) { - case SP_EASY: return (*it).easy_value; - case SP_MEDIUM: return (*it).medium_value; - case SP_HARD: return (*it).hard_value; - case SP_CUSTOM: return (*it).custom_value; + case SP_EASY: return item.easy_value; + case SP_MEDIUM: return item.medium_value; + case SP_HARD: return item.hard_value; + case SP_CUSTOM: return item.custom_value; default: NOT_REACHED(); } } diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp index e33f233f7b..dc3feb58c7 100644 --- a/src/script/script_scanner.cpp +++ b/src/script/script_scanner.cpp @@ -103,14 +103,12 @@ void ScriptScanner::RescanDir() void ScriptScanner::Reset() { - ScriptInfoList::iterator it = this->info_list.begin(); - for (; it != this->info_list.end(); it++) { - free((*it).first); - delete (*it).second; + for (const auto &item : this->info_list) { + free(item.first); + delete item.second; } - it = this->info_single_list.begin(); - for (; it != this->info_single_list.end(); it++) { - free((*it).first); + for (const auto &item : this->info_single_list) { + free(item.first); } this->info_list.clear(); @@ -171,9 +169,8 @@ char *ScriptScanner::GetConsoleList(char *p, const char *last, bool newest_only) { p += seprintf(p, last, "List of %s:\n", this->GetScannerName()); const ScriptInfoList &list = newest_only ? this->info_single_list : this->info_list; - ScriptInfoList::const_iterator it = list.begin(); - for (; it != list.end(); it++) { - ScriptInfo *i = (*it).second; + for (const auto &item : list) { + ScriptInfo *i = item.second; p += seprintf(p, last, "%10s (v%d): %s\n", i->GetName(), i->GetVersion(), i->GetDescription()); } p += seprintf(p, last, "\n"); @@ -273,16 +270,16 @@ static bool IsSameScript(const ContentInfo *ci, bool md5sum, ScriptInfo *info, S bool ScriptScanner::HasScript(const ContentInfo *ci, bool md5sum) { - for (ScriptInfoList::iterator it = this->info_list.begin(); it != this->info_list.end(); it++) { - if (IsSameScript(ci, md5sum, (*it).second, this->GetDirectory())) return true; + for (const auto &item : this->info_list) { + if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return true; } return false; } const char *ScriptScanner::FindMainScript(const ContentInfo *ci, bool md5sum) { - for (ScriptInfoList::iterator it = this->info_list.begin(); it != this->info_list.end(); it++) { - if (IsSameScript(ci, md5sum, (*it).second, this->GetDirectory())) return (*it).second->GetMainScript(); + for (const auto &item : this->info_list) { + if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return item.second->GetMainScript(); } return nullptr; } From e6e91a345c1d802f0bb1da04e1d6f4ed843e4c8a Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Fri, 25 Dec 2020 19:57:13 +0100 Subject: [PATCH 37/38] Fix f66baa44: index was off by one (#8433) i++ in the 3rd part of a for() is post, not pre. Oops. --- src/ai/ai_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 078bde4e14..23d1e81b70 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -127,7 +127,7 @@ struct AIListWindow : public Window { DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_ORANGE); y += this->line_height; } - int i = 1; + int i = 0; for (const auto &item : *this->info_list) { i++; if (this->vscroll->IsVisible(i)) { @@ -139,7 +139,7 @@ struct AIListWindow : public Window { } case WID_AIL_INFO_BG: { AIInfo *selected_info = nullptr; - int i = 1; + int i = 0; for (const auto &item : *this->info_list) { i++; if (this->selected == i - 1) selected_info = static_cast(item.second); From 79cb9efa7f7adb250fd25bee2200165ddd77817e Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Fri, 25 Dec 2020 20:36:14 +0100 Subject: [PATCH 38/38] Change: Always apply inflation from 1920 to 2090, no matter the game start year. (#7589) --- src/economy.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/economy.cpp b/src/economy.cpp index 5e53334a0e..3af220d96a 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -722,7 +722,7 @@ bool AddInflation(bool check_year) * inflation doesn't add anything after that either; it even makes playing * it impossible due to the diverging cost and income rates. */ - if (check_year && (_cur_year - _settings_game.game_creation.starting_year) >= (ORIGINAL_MAX_YEAR - ORIGINAL_BASE_YEAR)) return true; + if (check_year && (_cur_year < ORIGINAL_BASE_YEAR || _cur_year >= ORIGINAL_MAX_YEAR)) return true; if (_economy.inflation_prices == MAX_INFLATION || _economy.inflation_payment == MAX_INFLATION) return true; @@ -914,6 +914,14 @@ void StartupEconomy() _economy.infl_amount_pr = max(0, _settings_game.difficulty.initial_interest - 1); _economy.fluct = GB(Random(), 0, 8) + 168; + if (_settings_game.economy.inflation) { + /* Apply inflation that happened before our game start year. */ + int months = (min(_cur_year, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR) * 12; + for (int i = 0; i < months; i++) { + AddInflation(false); + } + } + /* Set up prices */ RecomputePrices();