From 6e689e2038f7e34cc66b04b64e46f76206c1804e Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Mon, 7 Dec 2020 22:39:22 +0000 Subject: [PATCH 01/16] Fix: FreeType is still required on macOS --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cee0a4fb2..39cfffc019 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,13 +44,13 @@ find_package(PNG) if(NOT WIN32) find_package(Allegro) + find_package(Freetype) if(NOT APPLE) find_package(SDL2) if(NOT SDL2_FOUND) find_package(SDL) endif() find_package(Fluidsynth) - find_package(Freetype) find_package(Fontconfig) find_package(ICU OPTIONAL_COMPONENTS i18n lx) find_package(XDG_basedir) From 2864d019f05b8c8bb3159f2c8913ed834e487698 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 8 Dec 2020 10:24:59 +0100 Subject: [PATCH 02/16] Fix: useless warning with -snull and no BaseSounds available (#8361) If I explicitly tell the system I do not want sound, I still get presented a nice message I do not have any BaseSounds available on my system, and that I should download one to enjoy sound. Well, let me tell you, with "-snull" that is really really not going to help. So please, be quiet, and let me enjoy the game without "boooooo" and "DING DING DING". Thank you. --- src/openttd.cpp | 2 +- src/sound/null_s.h | 1 + src/sound/sound_driver.hpp | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 337bcda4da..d20e88cd86 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -1111,7 +1111,7 @@ void SwitchToMode(SwitchMode new_mode) case SM_MENU: // Switch to game intro menu LoadIntroGame(); - if (BaseSounds::ini_set.empty() && BaseSounds::GetUsedSet()->fallback) { + if (BaseSounds::ini_set.empty() && BaseSounds::GetUsedSet()->fallback && SoundDriver::GetInstance()->HasOutput()) { ShowErrorMessage(STR_WARNING_FALLBACK_SOUNDSET, INVALID_STRING_ID, WL_CRITICAL); BaseSounds::ini_set = BaseSounds::GetUsedSet()->name; } diff --git a/src/sound/null_s.h b/src/sound/null_s.h index c01eae32a6..9bc660b92d 100644 --- a/src/sound/null_s.h +++ b/src/sound/null_s.h @@ -19,6 +19,7 @@ public: void Stop() override { } const char *GetName() const override { return "null"; } + bool HasOutput() const override { return false; } }; /** Factory for the null sound driver. */ diff --git a/src/sound/sound_driver.hpp b/src/sound/sound_driver.hpp index 6de66d74e9..062e7704d5 100644 --- a/src/sound/sound_driver.hpp +++ b/src/sound/sound_driver.hpp @@ -18,6 +18,17 @@ public: /** Called once every tick */ virtual void MainLoop() {} + /** + * Whether the driver has an output from which the user can hear sound. + * Or in other words, whether we should warn the user if no soundset is + * loaded and that loading one would fix the sound problems. + * @return True for all drivers except null. + */ + virtual bool HasOutput() const + { + return true; + } + /** * Get the currently active instance of the sound driver. */ From 535e18b54ecdae164b761c3146a50d5820bc6b36 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Tue, 8 Dec 2020 21:07:08 +0000 Subject: [PATCH 03/16] Change: Don't display OS name when the user is exiting the game --- src/intro_gui.cpp | 13 ------------- src/lang/english.txt | 10 +--------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 1fea69ea5b..7b02448f95 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -285,19 +285,6 @@ static void AskExitGameCallback(Window *w, bool confirmed) void AskExitGame() { -#if defined(_WIN32) - SetDParam(0, STR_OSNAME_WINDOWS); -#elif defined(__APPLE__) - SetDParam(0, STR_OSNAME_OSX); -#elif defined(__HAIKU__) - SetDParam(0, STR_OSNAME_HAIKU); -#elif defined(__OS2__) - SetDParam(0, STR_OSNAME_OS2); -#elif defined(SUNOS) - SetDParam(0, STR_OSNAME_SUNOS); -#else - SetDParam(0, STR_OSNAME_UNIX); -#endif ShowQuery( STR_QUIT_CAPTION, STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD, diff --git a/src/lang/english.txt b/src/lang/english.txt index c055f54a05..510e29279b 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1807,18 +1807,10 @@ STR_INTRO_TRANSLATION :{BLACK}This tra # Quit window STR_QUIT_CAPTION :{WHITE}Exit -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}? +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD? STR_QUIT_YES :{BLACK}Yes STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandon Game STR_ABANDON_GAME_QUERY :{YELLOW}Are you sure you want to abandon this game? From 819ce1bf4961c39ee97c98a4e0c890692842166a Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 9 Dec 2020 13:42:08 +0000 Subject: [PATCH 04/16] Update: Translations from eints slovak: 30 changes by FuryPapaya lithuanian: 37 changes by devastatorius --- src/lang/afrikaans.txt | 9 ---- src/lang/arabic_egypt.txt | 9 ---- src/lang/basque.txt | 9 ---- src/lang/belarusian.txt | 9 ---- src/lang/brazilian_portuguese.txt | 9 ---- src/lang/bulgarian.txt | 9 ---- src/lang/catalan.txt | 9 ---- src/lang/croatian.txt | 9 ---- src/lang/czech.txt | 9 ---- src/lang/danish.txt | 9 ---- src/lang/dutch.txt | 9 ---- src/lang/english_AU.txt | 9 ---- src/lang/english_US.txt | 9 ---- src/lang/esperanto.txt | 9 ---- src/lang/estonian.txt | 9 ---- src/lang/faroese.txt | 9 ---- src/lang/finnish.txt | 9 ---- src/lang/french.txt | 9 ---- src/lang/gaelic.txt | 9 ---- src/lang/galician.txt | 9 ---- src/lang/german.txt | 9 ---- src/lang/greek.txt | 9 ---- src/lang/hebrew.txt | 9 ---- src/lang/hungarian.txt | 9 ---- src/lang/icelandic.txt | 9 ---- src/lang/indonesian.txt | 9 ---- src/lang/irish.txt | 9 ---- src/lang/italian.txt | 9 ---- src/lang/japanese.txt | 9 ---- src/lang/korean.txt | 9 ---- src/lang/latin.txt | 9 ---- src/lang/latvian.txt | 9 ---- src/lang/lithuanian.txt | 46 ++++++++++++++++---- src/lang/luxembourgish.txt | 9 ---- src/lang/malay.txt | 9 ---- src/lang/norwegian_bokmal.txt | 9 ---- src/lang/norwegian_nynorsk.txt | 9 ---- src/lang/polish.txt | 9 ---- src/lang/portuguese.txt | 9 ---- src/lang/romanian.txt | 9 ---- src/lang/russian.txt | 9 ---- src/lang/serbian.txt | 9 ---- src/lang/simplified_chinese.txt | 9 ---- src/lang/slovak.txt | 69 +++++++++++++----------------- src/lang/slovenian.txt | 9 ---- src/lang/spanish.txt | 9 ---- src/lang/spanish_MX.txt | 9 ---- src/lang/swedish.txt | 9 ---- src/lang/tamil.txt | 8 ---- src/lang/thai.txt | 9 ---- src/lang/traditional_chinese.txt | 9 ---- src/lang/turkish.txt | 9 ---- src/lang/ukrainian.txt | 9 ---- src/lang/unfinished/chuvash.txt | 8 ---- src/lang/unfinished/frisian.txt | 9 ---- src/lang/unfinished/ido.txt | 3 -- src/lang/unfinished/macedonian.txt | 8 ---- src/lang/unfinished/maltese.txt | 2 - src/lang/unfinished/marathi.txt | 2 - src/lang/unfinished/persian.txt | 9 ---- src/lang/unfinished/urdu.txt | 9 ---- src/lang/vietnamese.txt | 9 ---- src/lang/welsh.txt | 9 ---- 63 files changed, 67 insertions(+), 574 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 3bb4a680b1..215c4dfcba 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1798,18 +1798,9 @@ STR_INTRO_TRANSLATION :{BLACK}Die vert # Quit window STR_QUIT_CAPTION :{WHITE}Verlaat -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Is u seker u wil OpenTTD verlaat en terug keer na {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nee -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Verlaat Spel STR_ABANDON_GAME_QUERY :{YELLOW}Is jy seker jy wil die speletjie verlaat? diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 64d0491380..36d0fcd69a 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1426,18 +1426,9 @@ STR_INTRO_TRANSLATION :{BLACK}هذة # Quit window STR_QUIT_CAPTION :{WHITE}انهاء -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}هل تود اغلاق النسخة المفتوحة و العودة لـ {STRING}? STR_QUIT_YES :{BLACK}نعم STR_QUIT_NO :{BLACK}لا -# Supported OSes -STR_OSNAME_WINDOWS :ويندوز -STR_OSNAME_UNIX :يونكس -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :هايكو -STR_OSNAME_OS2 :او اس/2 -STR_OSNAME_SUNOS :صن - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}إغلاق اللعبه STR_ABANDON_GAME_QUERY :{YELLOW}أمتأكد من رغبتك فى إغلاق اللعبه؟ diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 4850567875..d42ff546a4 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -1674,18 +1674,9 @@ STR_INTRO_TRANSLATION :{BLACK}Itzultze # Quit window STR_QUIT_CAPTION :{WHITE}Irten -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Zihur zaude OpenTTD-tik irten nahi duzula eta {STRING}-ra itzuli? STR_QUIT_YES :{BLACK}Bai STR_QUIT_NO :{BLACK}Ez -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Jokoa Utzi STR_ABANDON_GAME_QUERY :{YELLOW}Ziur zaude joko hau utzi nahi duzula? diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 19f88d555e..1230e327c9 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -2108,18 +2108,9 @@ STR_INTRO_TRANSLATION :{BLACK}На г # Quit window STR_QUIT_CAPTION :{WHITE}Выхад -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Вы ўпэўнены, што жадаеце перапыніць гульню й вярнуцца ў {STRING}? STR_QUIT_YES :{BLACK}Так STR_QUIT_NO :{BLACK}Не -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}У галоўнае мэню STR_ABANDON_GAME_QUERY :{YELLOW}Вы сапраўды жадаеце пакінуць гульню? diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 27ea2d1a1e..ee695d2385 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}Faltam { # Quit window STR_QUIT_CAPTION :{WHITE}Sair -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}? STR_QUIT_YES :{BLACK}Sim STR_QUIT_NO :{BLACK}Não -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandonar jogo STR_ABANDON_GAME_QUERY :{YELLOW}Você tem certeza que deseja abandonar este jogo? diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 5196ae47ef..9987253fc4 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1720,18 +1720,9 @@ STR_INTRO_TRANSLATION :{BLACK}На т # Quit window STR_QUIT_CAPTION :{WHITE}Изход -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Желаете ли да прекъснете играта и да се върнете към {STRING}? STR_QUIT_YES :{BLACK}Да STR_QUIT_NO :{BLACK}Не -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Прекъсване на играта STR_ABANDON_GAME_QUERY :{YELLOW}Искате ли да прекъснете играта? diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index d068164d7d..0d9aa9bece 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1808,18 +1808,9 @@ 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 abandonar aquesta partida i tornar a {STRING}? STR_QUIT_YES :{BLACK}Sí STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandona la partida STR_ABANDON_GAME_QUERY :{YELLOW}Esteu segur que voleu abandonar la partida? diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 1a81252d4a..42734c289f 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1903,18 +1903,9 @@ STR_INTRO_TRANSLATION :{BLACK}Ovom pri # Quit window STR_QUIT_CAPTION :{WHITE}Izlaz -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e? STR_QUIT_YES :{BLACK}Da STR_QUIT_NO :{BLACK}Ne -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Napusti igru STR_ABANDON_GAME_QUERY :{YELLOW}Doista želiš napustiti ovu igru? diff --git a/src/lang/czech.txt b/src/lang/czech.txt index c00ccfbac6..8b55d4db7e 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1894,18 +1894,9 @@ STR_INTRO_TRANSLATION :{BLACK}Tento p # Quit window STR_QUIT_CAPTION :{WHITE}Konec -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {STRING}? STR_QUIT_YES :{BLACK}Ano STR_QUIT_NO :{BLACK}Ne -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unixu -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Konec hry STR_ABANDON_GAME_QUERY :{YELLOW}Opravdu chceš ukončit tuto hru? diff --git a/src/lang/danish.txt b/src/lang/danish.txt index c9de1ecefe..eadbe1b088 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}Denne ov # Quit window STR_QUIT_CAPTION :{WHITE}Afslut -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nej -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Forlad spillet STR_ABANDON_GAME_QUERY :{YELLOW}Er du sikker på du vil forlade dette spil ? diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index c1e3acc5d7..b2fcf6260d 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}Deze ver # Quit window STR_QUIT_CAPTION :{WHITE}Afsluiten -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Weet je zeker dat je OpenTTD wilt verlaten en terug wilt keren naar {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nee -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Spel sluiten STR_ABANDON_GAME_QUERY :{YELLOW}Weet je zeker dat je dit spel wilt sluiten? diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 17a9659fbe..3b1f923fc4 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -1730,18 +1730,9 @@ STR_INTRO_TRANSLATION :{BLACK}This tra # Quit window STR_QUIT_CAPTION :{WHITE}Exit -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}? STR_QUIT_YES :{BLACK}Yes STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandon Game STR_ABANDON_GAME_QUERY :{YELLOW}Are you sure you want to abandon this game? diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 4eeb8b8fb9..e9ac45f263 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1805,18 +1805,9 @@ STR_INTRO_TRANSLATION :{BLACK}This tra # Quit window STR_QUIT_CAPTION :{WHITE}Quit -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}? STR_QUIT_YES :{BLACK}Yes STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandon Game STR_ABANDON_GAME_QUERY :{YELLOW}Are you sure you want to abandon this game? diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index a515912d3f..cb2bb5a3d2 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1413,18 +1413,9 @@ STR_INTRO_TRANSLATION :{BLACK}Ĉi tiu # Quit window STR_QUIT_CAPTION :{WHITE}Forlasi -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {STRING}? STR_QUIT_YES :{BLACK}Jes STR_QUIT_NO :{BLACK}Ne -# Supported OSes -STR_OSNAME_WINDOWS :Vindozo -STR_OSNAME_UNIX :Unikso -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Foriri de la ludo STR_ABANDON_GAME_QUERY :{YELLOW}Ĉu vi certas ke vi volas foriri? diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index c74293382a..6fd55dc426 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1821,18 +1821,9 @@ STR_INTRO_TRANSLATION :{BLACK}{NUM} t # Quit window STR_QUIT_CAPTION :{WHITE}Mängust väljumine -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}? STR_QUIT_YES :{BLACK}Jah STR_QUIT_NO :{BLACK}Ei -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Mängu lõpetamine STR_ABANDON_GAME_QUERY :{YELLOW}Kas lõpetada mäng? diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 6ee2502fba..80805b1301 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -1577,18 +1577,9 @@ STR_INTRO_TRANSLATION :{BLACK}Hesi ums # Quit window STR_QUIT_CAPTION :{WHITE}Gevst -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er tú vís/vísur í at tú vil gevast at spæla OpenTTD og fara aftur til {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nei -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Far frá spæli STR_ABANDON_GAME_QUERY :{YELLOW}Er tú vís/vísur í at tú vil fara frá hesum spæli? diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index ebf5765400..f85a203b1c 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}Tästä # Quit window STR_QUIT_CAPTION :{WHITE}Sulje -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Suljetaanko peli ja palataan {STRING}-järjestelmään? STR_QUIT_YES :{BLACK}Kyllä STR_QUIT_NO :{BLACK}Ei -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Pelin lopetus STR_ABANDON_GAME_QUERY :{YELLOW}Lopetetaanko peli? diff --git a/src/lang/french.txt b/src/lang/french.txt index 226e28b9e1..4efbe83b31 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}Il manqu # Quit window STR_QUIT_CAPTION :{WHITE}Quitter -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Êtes-vous sûr de vouloir quitter OpenTTD et retourner à {STRING}{NBSP}? STR_QUIT_YES :{BLACK}Oui STR_QUIT_NO :{BLACK}Non -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandonner la partie STR_ABANDON_GAME_QUERY :{YELLOW}Êtes-vous sûr de vouloir abandonner cette partie{NBSP}? diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 0c47be5d26..f00a366680 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -1964,18 +1964,9 @@ STR_INTRO_TRANSLATION :{BLACK}Tha {NUM # Quit window STR_QUIT_CAPTION :{WHITE}Fàg an-seo -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}A bheil thu cinnteach gu bheil thu airson OpenTTD fhàgail is tilleadh dha {STRING}? STR_QUIT_YES :{BLACK}Tha STR_QUIT_NO :{BLACK}Chan eil -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Fàg an geama STR_ABANDON_GAME_QUERY :{YELLOW}A bheil thu cinnteach gu bheil thu airson an geama seo fhàgail? diff --git a/src/lang/galician.txt b/src/lang/galician.txt index f4b6779ed9..4ee552731e 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1800,18 +1800,9 @@ STR_INTRO_TRANSLATION :{BLACK}A ista t # Quit window STR_QUIT_CAPTION :{WHITE}Saír -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Estás seguro de que queres saír e voltar a {STRING}? STR_QUIT_YES :{BLACK}Si STR_QUIT_NO :{BLACK}Non -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Saír da partida STR_ABANDON_GAME_QUERY :{YELLOW}Estás seguro de que queres saír desta partida? diff --git a/src/lang/german.txt b/src/lang/german.txt index 46d3afcf8c..1660f010ef 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1793,18 +1793,9 @@ STR_INTRO_TRANSLATION :{BLACK}Dieser # Quit window STR_QUIT_CAPTION :{WHITE}Verlassen -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}OpenTTD wirklich beenden und zu{}{STRING} zurückkehren? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nein -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Spiel beenden STR_ABANDON_GAME_QUERY :{YELLOW}Das Spiel wirklich beenden? diff --git a/src/lang/greek.txt b/src/lang/greek.txt index ba8956b94d..9f567b9c50 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1893,18 +1893,9 @@ STR_INTRO_TRANSLATION :{BLACK}Λείπ # Quit window STR_QUIT_CAPTION :{WHITE}Έξοδος -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Είστε σίγουροι ότι θέλετε να εγκαταλείψετε το OpenTTD και να επιστρέψετε στο λειτουργικό {STRING}; STR_QUIT_YES :{BLACK}Ναι STR_QUIT_NO :{BLACK}Όχι -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Εγκατάλειψη Παιχνιδιού STR_ABANDON_GAME_QUERY :{YELLOW}Είστε σίγουροι ότι θέλετε να εγκαταλείψετε το παιχνίδι; diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 2f47bf3d67..eebb7d78a9 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1779,18 +1779,9 @@ STR_INTRO_TRANSLATION :{BLACK}בתרג # Quit window STR_QUIT_CAPTION :{WHITE}צא -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}אתה בטוח שברצונך לצאת ולחזור ל{STRING}? STR_QUIT_YES :{BLACK}כן STR_QUIT_NO :{BLACK}לא -# Supported OSes -STR_OSNAME_WINDOWS :חלונות -STR_OSNAME_UNIX :יוניקס -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :הייקו -STR_OSNAME_OS2 :מערכת הפעלה או.אס שתיים -STR_OSNAME_SUNOS :סולריס - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}עזיבת משחק STR_ABANDON_GAME_QUERY :{YELLOW}?האם אתה בטוח שברצונך לעזוב את המשחק diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index c3ea4dec4d..4dbbbf8e9b 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1871,18 +1871,9 @@ STR_INTRO_TRANSLATION :{BLACK}Ebből a # Quit window STR_QUIT_CAPTION :{WHITE}Kilépés -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Biztosan bezárod ezt a programot és kilépsz a {STRING}ba? STR_QUIT_YES :{BLACK}Igen STR_QUIT_NO :{BLACK}Nem -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Kilépés a játékból STR_ABANDON_GAME_QUERY :{YELLOW}Biztosan kilépsz ebből a játékból? diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 02ce073089..1cdc2c3c9d 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1618,18 +1618,9 @@ STR_INTRO_TRANSLATION :{BLACK}Það va # Quit window STR_QUIT_CAPTION :{WHITE}Hætta -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ertu viss um að þú viljir hætta í OpenTTD og fara aftur í {STRING}? STR_QUIT_YES :{BLACK}Já STR_QUIT_NO :{BLACK}Nei -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Hætta leik STR_ABANDON_GAME_QUERY :{YELLOW}Ertu viss um að þú viljir hætta í þessum leik ? diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 3c285aa980..e5e1fae79b 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}Terjemah # Quit window STR_QUIT_CAPTION :{WHITE}Keluar -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Anda yakin ingin keluar dari OpenTTD dan kembali ke {STRING}? STR_QUIT_YES :{BLACK}Ya STR_QUIT_NO :{BLACK}Tidak -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Batalkan Permainan STR_ABANDON_GAME_QUERY :{YELLOW}Apakah anda yakin untuk meninggalkan permainan? diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 1729a3fcb8..63de2d9172 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -1753,18 +1753,9 @@ STR_INTRO_TRANSLATION :{BLACK}Tá {NUM # Quit window STR_QUIT_CAPTION :{WHITE}Scoir -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}An bhfuil tú cinnte gur mhaith leat dul amach as OpenTTD agus filleadh ar {STRING}? STR_QUIT_YES :{BLACK}Tá STR_QUIT_NO :{BLACK}Níl -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Fág an Cluiche STR_ABANDON_GAME_QUERY :{YELLOW}An bhfuil tú cinnte gur mhaith leat an cluiche seo a fhágáil? diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 9855a0150a..04d9da9b22 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1831,18 +1831,9 @@ STR_INTRO_TRANSLATION :{BLACK}A questa # Quit window STR_QUIT_CAPTION :{WHITE}Esci -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Si è sicuri di voler uscire da OpenTTD e tornare a {STRING}? STR_QUIT_YES :{BLACK}Sì STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abbandona partita STR_ABANDON_GAME_QUERY :{YELLOW}Si è sicuri di voler abbandonare la partita in corso? diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index b2e28bc669..9a1a148e21 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1753,18 +1753,9 @@ STR_INTRO_TRANSLATION :{BLACK}この # Quit window STR_QUIT_CAPTION :{WHITE}終了 -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}このゲームを終了し、{}{STRING}に戻ってもよろしいですか? STR_QUIT_YES :{BLACK}はい STR_QUIT_NO :{BLACK}いいえ -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}ゲームを放棄 STR_ABANDON_GAME_QUERY :{YELLOW}このゲームを終了してもよろしいですか? diff --git a/src/lang/korean.txt b/src/lang/korean.txt index f050da5b0e..e4236da6d7 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}이 버 # Quit window STR_QUIT_CAPTION :{WHITE}종료 -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}정말 이 게임을 끝내고 {STRING}{G 0 "으" ""}로 돌아가시겠습니까? STR_QUIT_YES :{BLACK}예 STR_QUIT_NO :{BLACK}아니요 -# Supported OSes -STR_OSNAME_WINDOWS :{G=f}Windows -STR_OSNAME_UNIX :{G=f}Unix -STR_OSNAME_OSX :{G=f}OS{NBSP}X -STR_OSNAME_HAIKU :{G=f}Haiku -STR_OSNAME_OS2 :{G=f}OS/2 -STR_OSNAME_SUNOS :{G=f}SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}게임 그만하기 STR_ABANDON_GAME_QUERY :{YELLOW}정말 이 게임을 종료하고 메인으로 이동하시겠습니까? diff --git a/src/lang/latin.txt b/src/lang/latin.txt index e1b73679cf..fc0aa1e5f1 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -1971,18 +1971,9 @@ STR_INTRO_TRANSLATION :{BLACK}In hac i # Quit window STR_QUIT_CAPTION :{WHITE}Exire -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Esne certus te velle exire OpenTTD et redire ad {STRING}? STR_QUIT_YES :{BLACK}Ita STR_QUIT_NO :{BLACK}Non -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Relinquere Ludum STR_ABANDON_GAME_QUERY :{YELLOW}Esne certus te velle ludum relinquere? diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index bb7ee967d0..fc0d6b3bcd 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1811,18 +1811,9 @@ 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 jūs tiešām vēlaties iziet no OpenTTD un atgriezties uz {STRING}? STR_QUIT_YES :{BLACK}Jā STR_QUIT_NO :{BLACK}Nē -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Pamest spēli STR_ABANDON_GAME_QUERY :{YELLOW}Vai tiešām vēlaties pamest šo spēli? diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 4fb65486fd..0a5619885b 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -382,6 +382,7 @@ STR_COLOUR_ORANGE :Oranžinė STR_COLOUR_BROWN :Ruda STR_COLOUR_GREY :Pilka STR_COLOUR_WHITE :Balta +STR_COLOUR_DEFAULT :Numatytas # Units used in OpenTTD STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mph @@ -863,6 +864,7 @@ STR_PLAYLIST_TRACK_INDEX :{TINY_FONT}{BLA STR_PLAYLIST_PROGRAM :{TINY_FONT}{BLACK}Programa - „{STRING}“ STR_PLAYLIST_CLEAR :{TINY_FONT}{BLACK}Išvalyti STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1 :{BLACK}Panaikinti esamą programą (tik „Speciali 1“ arba „Speciali 2“) +STR_PLAYLIST_TOOLTIP_CHANGE_SET :{BLACK}Pakeiskite muzikos pasirinkimą į kitą įdiegtą rinkinį STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK :{BLACK}Paspauskite ant garso takelio, norėdami įtraukti į sąrašą (tik „Speciali 1“ arba „Speciali 2“) STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK :{BLACK}Spragtelėjus takelį, jis pašalinamas iš dabartinės programos (tik „Speciali 1“ ir „Speciali 2“) @@ -1121,6 +1123,8 @@ STR_GAME_OPTIONS_CURRENCY_ZAR :Pietų Afrikos STR_GAME_OPTIONS_CURRENCY_CUSTOM :Kita... STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijos Laris (GEL) STR_GAME_OPTIONS_CURRENCY_IRR :Irano Rialas (IRR) +STR_GAME_OPTIONS_CURRENCY_CNY :Kinų renminbi (CNY) +STR_GAME_OPTIONS_CURRENCY_HKD :Honkongo doleris (HKD) ############ end of currency region STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME :{BLACK}Automobilių eismas @@ -1184,6 +1188,9 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Dvigubas STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Trigubas +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL :Normalus +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM :Dvigubas dydis +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM :Keturių dydžių STR_GAME_OPTIONS_BASE_GRF :{BLACK}Bazinis grafikos rinkinys STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}Pasirinkti naudojimui bazinę grafikos rinkinį @@ -1536,6 +1543,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT :Reljefo spalva STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Žalia STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Tamsiai žalia STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Violetinė +STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Perkelkite peržiūros sritį su RMB, pelės padėtis užrakinta STR_CONFIG_SETTING_SMOOTH_SCROLLING :Tolydi vaizdo slinktis: {STRING} STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Įjungus šią nuostatą ir pakeitus pagrindinio lango rodomą vietą (pvz., spragtelėjus žemėlapyje), vaizdas slinksis tolydžiai. Priešingu atveju vaizdas pasikeis akimirksniu, šuoliškai. STR_CONFIG_SETTING_MEASURE_TOOLTIP :Rodyti matavimo pastabą, kai naudojami įvairūs statybų įrankiai: {STRING} @@ -1567,6 +1575,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Command+Click STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+Click STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Išjungta +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Uždaro langą dešiniuoju pelės klavišu spustelėdami jo vidų. Išjungia patarimą dešiniuoju pelės mygtuku spustelėjimu! STR_CONFIG_SETTING_AUTOSAVE :Automatinis saugojimas: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Laiko tarpsnis tarp automatinių žaidimo išsaugojimų @@ -1973,18 +1982,9 @@ STR_INTRO_TRANSLATION :{BLACK}Šiam ve # Quit window STR_QUIT_CAPTION :{WHITE}Baigti -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ar jūs tikrai norite sustabdyti žaidimą ir grįžti į {STRING}? STR_QUIT_YES :{BLACK}Taip STR_QUIT_NO :{BLACK}Ne -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Palikti Žaidimą STR_ABANDON_GAME_QUERY :{YELLOW}Ar tikrai norite išeiti iš žaidimo? @@ -2609,6 +2609,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL :{BLACK}Statyti STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD :{BLACK}Aktyvinti automobilių kelių ir stotelių šalinimo veikseną STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Aktyvinti tramvajaus bėgių ir stotelių šalinimo veikseną +STR_ROAD_NAME_TRAM :Tramvajus # Road depot construction window STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION :{WHITE}Pasirinkite garažo kryptį @@ -2792,6 +2793,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Oro uost STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}Plėtinys: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Krovinys priimtas: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) +STR_LANG_AREA_INFORMATION_ROAD_TYPE :{BLACK}Kelio tipas: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Geležinkelių greičio limitas: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Kelio greičio limitas: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT :{BLACK}Tramvajaus greičio limitas: {LTBLUE}{VELOCITY} @@ -2894,9 +2896,18 @@ STR_ABOUT_VERSION :{BLACK}OpenTTD STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-{STRING} OpenTTD komanda # Framerate display window +STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK} Per sekundę pateiktų vaizdo kadrų skaičius. +STR_FRAMERATE_MEMORYUSE :{WHITE}Atmintis +STR_FRAMERATE_DATA_POINTS :{BLACK} Duomenys pagrįsti {COMMA} matavimais +STR_FRAMERATE_BYTES_BAD :{RED}{BYTES} ############ Leave those lines in this order!! +STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Nuorodos grafiko vėlavimas: +STR_FRAMERATE_VIDEO :{BLACK}Vaizdo išvestis +STR_FRAMERATE_GAMESCRIPT :{BLACK} Žaidimo skriptas: ############ End of leave-in-this-order ############ Leave those lines in this order!! +STR_FRAMETIME_CAPTION_GL_LINKGRAPH :Nuorodos grafiko vėlavimas +STR_FRAMETIME_CAPTION_ALLSCRIPTS :GS/AI Iš viso skriptų ############ End of leave-in-this-order @@ -2922,6 +2933,7 @@ STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Žaidimo STR_SAVELOAD_DETAIL_NOT_AVAILABLE :{BLACK}Nėra informacijos STR_SAVELOAD_DETAIL_COMPANY_INDEX :{SILVER}{COMMA}: {WHITE}{STRING} STR_SAVELOAD_DETAIL_GRFSTATUS :{SILVER}Plėtiniai: {WHITE}{STRING} +STR_SAVELOAD_FILTER_TITLE :{BLACK} Filtro eilutė: STR_SAVELOAD_OVERWRITE_TITLE :{WHITE}Perrašyti bylą STR_SAVELOAD_OSKTITLE :{BLACK}Įveskite išsaugomo žaidimo vardą @@ -3185,6 +3197,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Įrašyk STR_TOWN_DIRECTORY_CAPTION :{WHITE}Miestai STR_TOWN_DIRECTORY_NONE :{ORANGE}Nėra STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA}) +STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Miestas){BLACK} ({COMMA}) STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Spragtelėjus ant pavadinimo, miestas bus parodytas ekrano centre. Spragtelėjus laikant nuspaudus „Ctrl“ klavišą, bus atvertas papildomas peržiūros langas į pasirinktą miestą STR_TOWN_POPULATION :{BLACK}Pasaulio populiacija: {COMMA} @@ -3216,6 +3229,7 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON :Pervardinti mie # Town local authority window STR_LOCAL_AUTHORITY_CAPTION :{WHITE}{TOWN} vietinė valdžia +STR_LOCAL_AUTHORITY_ZONE_TOOLTIP :{BLACK}Rodyti zoną vietos valdžios ribose STR_LOCAL_AUTHORITY_COMPANY_RATINGS :{BLACK}Transporto kompanijų reitingai: STR_LOCAL_AUTHORITY_COMPANY_RATING :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING} STR_LOCAL_AUTHORITY_ACTIONS_TITLE :{BLACK}Galimi veiksmai: @@ -3559,6 +3573,7 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Iškelti visas STR_GROUP_RENAME_CAPTION :{BLACK}Pervadinti grupę STR_GROUP_PROFIT_THIS_YEAR :Šio mėnesio pelnas: +STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Nauji lokomotyvai @@ -3570,6 +3585,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION :Nauji automobil ############ range for vehicle availability starts STR_BUY_VEHICLE_TRAIN_ALL_CAPTION :Nauji lokomotyvai +STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION :Naujos kelių transporto priemonės STR_BUY_VEHICLE_SHIP_CAPTION :Nauji laivai STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Nauji lėktuvai ############ range for vehicle availability ends @@ -3611,6 +3627,8 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Pirkti p STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Pirkti pažymėtą laivą. Spragtelėjus laikant nuspaustą Shift klavišą, bus parodyta pirkinio kaina nieko realiai nenuperkant STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Pirkti pažymėtą lėktuvą. Spragtelėjus laikant nuspaustą Shift klavišą, bus parodyta pirkinio kaina nieko realiai nenuperkant +STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK} Pirkti ir paruošti pažymėtą laivą. Shift+paspaudimas rodo numatomą kainą be pirkimo +STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Pirkti ir paruošti pažymėtą lėktuvą. Shift+paspaudimas rodo numatomą kainą be pirkimo STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Pervardinti STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Pervardinti @@ -3728,6 +3746,7 @@ STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kam :lokomotyvui STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.ka :lokomotyvą STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kuo :lokomotyvu STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kur :lokomotyve +STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE :elektrinis geležinkelio lokomotyvas STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE :vienbėgis lokomotyvas STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.kas :vienbėgis lokomotyvas STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.ko :vienbėgio lokomotyvo @@ -3750,6 +3769,7 @@ STR_ENGINE_PREVIEW_ROAD_VEHICLE.kam :automobiliui STR_ENGINE_PREVIEW_ROAD_VEHICLE.ka :automobilį STR_ENGINE_PREVIEW_ROAD_VEHICLE.kuo :automobiliu STR_ENGINE_PREVIEW_ROAD_VEHICLE.kur :automobilyje +STR_ENGINE_PREVIEW_TRAM_VEHICLE :tramvajaus transporto priemonė STR_ENGINE_PREVIEW_AIRCRAFT :lėktuvas STR_ENGINE_PREVIEW_AIRCRAFT.kas :lėktuvas @@ -3769,6 +3789,7 @@ STR_ENGINE_PREVIEW_SHIP.kur :laive STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Kaina: {CURRENCY_LONG} Svoris: {WEIGHT_SHORT}{}Greitis: {VELOCITY} Galia: {POWER}{}Eksploatavimo išlaidos: {CURRENCY_LONG} per metus{}Talpa: {CARGO_LONG} STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Kaina: {CURRENCY_LONG} Svoris: {WEIGHT_SHORT}{}Greitis: {VELOCITY} Galia: {POWER} Maks. T.E.: {6:FORCE}{}Einamosios išlaidos: {4:CURRENCY_LONG}/yr{}Talpa: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Kaina: {CURRENCY_LONG} Didž. Greitis: {VELOCITY}{}Talpa: {CARGO_LONG}{}Eksploatacijos išlaidos: {CURRENCY_LONG}/metams +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}Kaina: {CURRENCY_LONG} Didž. greitis: {VELOCITY}{}Lėktuvo tipas: {STRING} Nuotolis: {COMMA} tiles{}Talpa: {CARGO_LONG}, {CARGO_LONG}{}Eksploatacijos išlaidos: {CURRENCY_LONG}/metams # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}Keisti tr. priemones {STRING} - {STRING} @@ -3802,6 +3823,7 @@ STR_REPLACE_ENGINES :Varikliai STR_REPLACE_WAGONS :Vagonai STR_REPLACE_HELP_RAILTYPE :{BLACK}Pasirinkite bėgio tipą, kur dėl variklio norėtumėte pakeisti +STR_REPLACE_HELP_ROADTYPE :{BLACK}Pasirinkite kelio tipą, kurio automobilius norite pakeisti STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Kaireje lango dalyje pazymeta tr. priemone bus pakeista tr. priemone, kuri yra pazymeta desineje lango puseje STR_REPLACE_RAIL_VEHICLES :Paprasti traukiniai STR_REPLACE_ELRAIL_VEHICLES :Elektrifikuoti Traukiniai @@ -3893,6 +3915,7 @@ STR_VEHICLE_INFO_AGE :{COMMA} met{P a STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} met{P ai ai ų} ({COMMA}) STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Didž. greitis: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}Maks. greitis: {LTBLUE}{VELOCITY} {BLACK}Lėktuvo tipas: {LTBLUE}{STRING} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Svoris: {LTBLUE}{WEIGHT_SHORT} {BLACK}Galia: {LTBLUE}{POWER}{BLACK} Didž. greitis: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Svoris: {LTBLUE}{WEIGHT_SHORT} {BLACK}Galia: {LTBLUE}{POWER}{BLACK} Didž. greitis: {LTBLUE}{VELOCITY} {BLACK}Didž. traukos jėga: {LTBLUE}{FORCE} @@ -4274,6 +4297,9 @@ STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Pasirink STR_AI_LIST_CANCEL :{BLACK}Atšaukti STR_AI_LIST_CANCEL_TOOLTIP :{BLACK}Nekeisti skripto +STR_SCREENSHOT_CAPTION :{WHITE}Padaryti ekrano nuotrauką +STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT :{BLACK}Aukščių žemėlapio ekrano nuotrauka +STR_SCREENSHOT_MINIMAP_SCREENSHOT :{BLACK}Mini žemėlapio ekrano kopija # AI Parameters STR_AI_SETTINGS_CAPTION :{WHITE}{STRING} Parametrai @@ -4566,6 +4592,8 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM :{WHITE}Šio kel STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Neįmanoma pašalinti tramvajaus... STR_ERROR_THERE_IS_NO_ROAD :{WHITE}... nėra kelio STR_ERROR_THERE_IS_NO_TRAMWAY :{WHITE}... nėra kelio tramvajui +STR_ERROR_CAN_T_CONVERT_TRAMWAY :{WHITE}Čia negalima konvertuoti tramvajaus tipo... +STR_ERROR_NO_SUITABLE_ROAD :{WHITE} Nėra tinkamo kelio # Waterway construction errors STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Neimanoma cia iskasti kanalu... diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index b465025b57..638e1b49b4 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1806,18 +1806,9 @@ STR_INTRO_TRANSLATION :{BLACK}Dës Iww # Quit window STR_QUIT_CAPTION :{WHITE}Eraus -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Bass du sécher, dass du aus OpenTTD eraus wëlls, an an den {STRING} zeréck? STR_QUIT_YES :{BLACK}Jo STR_QUIT_NO :{BLACK}Nee -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Spill ofbriechen STR_ABANDON_GAME_QUERY :{YELLOW}Bass du sécher, dass du des Partie ofbrieche wëlls? diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 8c8cf0746d..4358dfdaf8 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -1514,18 +1514,9 @@ STR_INTRO_TRANSLATION :{BLACK}Terjemah # Quit window STR_QUIT_CAPTION :{WHITE}Keluar -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Adakah anda pasti untuk keluar dari OpenTTD dan kembali ke {STRING}? STR_QUIT_YES :{BLACK}Ya STR_QUIT_NO :{BLACK}Tidak -# Supported OSes -STR_OSNAME_WINDOWS :Tetingkap -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Tinggalkan Permainan STR_ABANDON_GAME_QUERY :{YELLOW}Pastikah anda mahu keluar dari permainan ini? diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index ea51d4ccd9..f8e19bcef2 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}Denne ov # Quit window STR_QUIT_CAPTION :{WHITE}Avslutt -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå tilbake til {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nei -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Avslutt spill STR_ABANDON_GAME_QUERY :{YELLOW}Er du sikker på at du vil avslutte dette spillet? diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 5eb0d5b8a7..5845a10491 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1676,18 +1676,9 @@ STR_INTRO_TRANSLATION :{BLACK}Denne ny # Quit window STR_QUIT_CAPTION :{WHITE}Avslutt -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå attende til {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nei -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Avslutt spel STR_ABANDON_GAME_QUERY :{YELLOW}Er du sikker på at du vil forlata spelet? diff --git a/src/lang/polish.txt b/src/lang/polish.txt index f92c600731..aeab9e3058 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2187,18 +2187,9 @@ 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 zakończyć tę grę i wrócić do {STRING}? STR_QUIT_YES :{BLACK}Tak STR_QUIT_NO :{BLACK}Nie -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Wyjście STR_ABANDON_GAME_QUERY :{YELLOW}Czy jesteś pewien, że chcesz skończyć tę grę? diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index d39767aa49..6af854ea69 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1795,18 +1795,9 @@ STR_INTRO_TRANSLATION :{BLACK}Faltam { # Quit window STR_QUIT_CAPTION :{WHITE}Sair -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}? STR_QUIT_YES :{BLACK}Sim STR_QUIT_NO :{BLACK}Não -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandonar jogo STR_ABANDON_GAME_QUERY :{YELLOW}Tem a certeza que deseja abandonar este jogo? diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index f4372d3311..79c3a4706c 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1745,18 +1745,9 @@ STR_INTRO_TRANSLATION :{BLACK}Acestei # Quit window STR_QUIT_CAPTION :{WHITE}Ieşire din joc -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Eşti sigur că vrei să abandonezi jocul curent şi să revii în {STRING}? STR_QUIT_YES :{BLACK}Da STR_QUIT_NO :{BLACK}Nu -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Ieşire din joc STR_ABANDON_GAME_QUERY :{YELLOW}Eşti sigur că vrei să renunţi la acest joc? diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 266fdad22f..e7d922855b 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1959,18 +1959,9 @@ STR_INTRO_TRANSLATION :{BLACK}На э # Quit window STR_QUIT_CAPTION :{WHITE}Выход -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Вы уверены, что хотите прервать игру и вернуться в {STRING}? STR_QUIT_YES :{BLACK}Да STR_QUIT_NO :{BLACK}Нет -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}В главное меню STR_ABANDON_GAME_QUERY :{YELLOW}Вы действительно хотите выйти из игры? diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 839269d696..dc7bf9cb7b 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1960,18 +1960,9 @@ STR_INTRO_TRANSLATION :{BLACK}Ovom pre # Quit window STR_QUIT_CAPTION :{WHITE}Izlaz -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Da li ste sigurni da želite da napustite OpenTTD i vratite se u {STRING}? STR_QUIT_YES :{BLACK}Da STR_QUIT_NO :{BLACK}Ne -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Napuštanje partije STR_ABANDON_GAME_QUERY :{YELLOW}Da li stvarno želite da napustite ovu partiju? diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index d3aa2d98b9..3977294b37 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}中文 # Quit window STR_QUIT_CAPTION :{WHITE}退出 -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}你确定要放弃当前游戏并{}退出到 {STRING} 吗？ STR_QUIT_YES :{BLACK}是 STR_QUIT_NO :{BLACK}否 -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}放弃游戏 STR_ABANDON_GAME_QUERY :{YELLOW}你确定要放弃当前的游戏吗？ diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index c2a65d874e..09a3afa042 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1180,30 +1180,30 @@ STR_CONFIG_SETTING_FILTER_TITLE :{BLACK}Filtrova STR_CONFIG_SETTING_EXPAND_ALL :{BLACK}Rozbaliť všetko STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Zabaliť všetko STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(nie je dostupné vysvetlenie) -STR_CONFIG_SETTING_DEFAULT_VALUE :{LTBLUE}Pôvodná hodnota: {ORANGE}{STRING} +STR_CONFIG_SETTING_DEFAULT_VALUE :{LTBLUE}Predvolená hodnota: {ORANGE}{STRING} STR_CONFIG_SETTING_TYPE :{LTBLUE}Nastavenie typu: {ORANGE}{STRING} -STR_CONFIG_SETTING_TYPE_CLIENT :Nastavenia klienta (neuchovávané v uložených hrách; ovplyvní všetky hry) -STR_CONFIG_SETTING_TYPE_GAME_MENU :Nastavenia hry (uložia sa; ovplyvní iba nové hry) -STR_CONFIG_SETTING_TYPE_GAME_INGAME :Nastavenia hry (uložia sa; ovplyvní iba aktuálnu hru) -STR_CONFIG_SETTING_TYPE_COMPANY_MENU :Nastavenia spoločnosti (uložia sa; ovplyvní iba nové hry) -STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Nastavenia spoločnosti (uložia sa; ovplyvní iba aktuálnu firmu) +STR_CONFIG_SETTING_TYPE_CLIENT :Nastavenie klienta (neukladané v uložených hrách; ovplyvní všetky hry) +STR_CONFIG_SETTING_TYPE_GAME_MENU :Nastavenie hry (ukladané v uložených hrách; ovplyvní iba nové hry) +STR_CONFIG_SETTING_TYPE_GAME_INGAME :Nastavenie hry (ukladané v uložených hrách; ovplyvní iba aktuálnu hru) +STR_CONFIG_SETTING_TYPE_COMPANY_MENU :Nastavenie spoločnosti (ukladané v uložených hrách; ovplyvní iba nové hry) +STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Nastavenie spoločnosti (ukladané v uložených hrách; ovplyvní iba aktuálnu spoločnosť) STR_CONFIG_SETTING_RESTRICT_CATEGORY :{BLACK}Kategória: STR_CONFIG_SETTING_RESTRICT_TYPE :{BLACK}Typ: STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Obmedzuje zoznam nižšie podľa definovaných nastavení STR_CONFIG_SETTING_RESTRICT_BASIC :Základné (zobrazí iba dôležité nastavenia) STR_CONFIG_SETTING_RESTRICT_ADVANCED :Pokročilé (zobrazí väčšinu nastavení) -STR_CONFIG_SETTING_RESTRICT_ALL :Odborné (zobrazí všetky nastavenia, vrátane tých podivných) +STR_CONFIG_SETTING_RESTRICT_ALL :Odborné (zobrazí všetky nastavenia, vrátane podivných) STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Nastavenia s odlišnou hodnotou ako je predvolená STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Nastavenia s odlišnou hodnotou než aké má tvoja nová hra STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT :{BLACK}Obmedzuje zoznam nižšie na niektoré typy nastavení STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL :Všetky typy nastavení -STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :Nastavenia klienta (nieje uložené; ovplyvní všetky hry) -STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :Nastavenia hry (uložené v uložených hrách; ovplyvní iba nové hry) -STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :Nastavenia hry (uložené v uložených hrách; ovplyvní iba aktuálnu hru) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :Nastavenia spoločnosti (uložené v uložených hrách; ovplyvní iba nové hry) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :Nastavenia spoločnosti (uchované v uloženej hre; ovplyvnia iba aktuálnu spoločnosť) +STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :Nastavenia klienta (neukladané v uložených hrách; ovplyvnia všetky hry) +STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :Nastavenia hry (ukladané v uložených hrách; ovplyvnia iba nové hry) +STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :Nastavenia hry (ukladané v uložených hrách; ovplyvnia iba aktuálnu hru) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :Nastavenia spoločnosti (ukladané v uložených hrách; ovplyvnia iba nové hry) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :Nastavenia spoločnosti (ukladané v uložených hrách; ovplyvnia iba aktuálnu spoločnosť) STR_CONFIG_SETTING_CATEGORY_HIDES :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING} STR_CONFIG_SETTING_TYPE_HIDES :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia @@ -1377,7 +1377,7 @@ STR_CONFIG_SETTING_HOVER_DELAY_DISABLED :Klik pravým tl STR_CONFIG_SETTING_POPULATION_IN_LABEL :Zobraziť počet obyvateľov mesta v jeho názve: {STRING} STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Zobrazí populáciu mesta v jeho názve. STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Hrúbka čiar v grafe: {STRING} -STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Hrúbka čiar v grafe. Tenké čiary sú presnejšie, hrubšie zase lepšie viditeľné. +STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Hrúbka čiar v grafe. Tenké čiary sú presnejšie, hrubšie zasa lepšie viditeľné STR_CONFIG_SETTING_SHOW_NEWGRF_NAME :Zobraziť názov NewGRF v okne vozidiel: {STRING} STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT :Pridá riadok do zoznamu vozidiel, ktorý ukazuje z akého NewGRF vozidlo pochádza. @@ -1425,8 +1425,8 @@ STR_CONFIG_SETTING_SERVICEATHELIPAD :Automatické op STR_CONFIG_SETTING_SERVICEATHELIPAD_HELPTEXT :Servisovať helikoptéry po každom dosadnutí aj ked nie je na letisku žiadny hangár. STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR :Otvárať panel úprav terénu s panelmi výstavby: {STRING} STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR_HELPTEXT :Otvoriť panel na úpravu terénu spolu s panelom na stavbu (cesty, železnice...) -STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR :Farba krajiny použitá na malej mape: {STRING} -STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT :Farby terénu na minimape +STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR :Farba krajiny použitá na minimape: {STRING} +STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT :Farba terénu na minimape STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Zelená STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Tmavozelená STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Fialová @@ -1510,17 +1510,17 @@ STR_CONFIG_SETTING_EXPENSES_LAYOUT :Zoskupiť výda STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Definujte rozloženie okna s financiami. STR_CONFIG_SETTING_SOUND_TICKER :Oznamovač správ: {STRING} -STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Prehrať zvuk pre zhrnuté novinové správy +STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Prehrať zvuk pri zhrnutých správach STR_CONFIG_SETTING_SOUND_NEWS :Noviny: {STRING} STR_CONFIG_SETTING_SOUND_NEWS_HELPTEXT :Prehrať zvuk pri zobrazení novín STR_CONFIG_SETTING_SOUND_NEW_YEAR :Koniec roka: {STRING} -STR_CONFIG_SETTING_SOUND_NEW_YEAR_HELPTEXT :Prehrávať zvukové efekty na konci roku zhŕňajúce výkon spoločnosti počas roku v porovnaní s minulým rokom -STR_CONFIG_SETTING_SOUND_CONFIRM :Stavba: {STRING} -STR_CONFIG_SETTING_SOUND_CONFIRM_HELPTEXT :Hrať zvukovú správu pri úspešnej stavbe alebo pri iných akciách +STR_CONFIG_SETTING_SOUND_NEW_YEAR_HELPTEXT :Prehrať zvuk na konci roku pri zobrazení zhrnutia výkonu spoločnosti počas roka v porovnaní s minulým rokom +STR_CONFIG_SETTING_SOUND_CONFIRM :Výstavba: {STRING} +STR_CONFIG_SETTING_SOUND_CONFIRM_HELPTEXT :Prehrať zvuk pri úspešnej výstavbe alebo pri iných akciách STR_CONFIG_SETTING_SOUND_CLICK :Kliknutia na tlačidlá: {STRING} -STR_CONFIG_SETTING_SOUND_CLICK_HELPTEXT :Pípať pri kliknutí na tlačidlá -STR_CONFIG_SETTING_SOUND_DISASTER :Havárie/zrážky: {STRING} -STR_CONFIG_SETTING_SOUND_DISASTER_HELPTEXT :Prehrávať zvukové efekty nehôd a katastrôf +STR_CONFIG_SETTING_SOUND_CLICK_HELPTEXT :Pípať pri klikaní na tlačidlá +STR_CONFIG_SETTING_SOUND_DISASTER :Katastrofy/nehody: {STRING} +STR_CONFIG_SETTING_SOUND_DISASTER_HELPTEXT :Prehrávať zvukové efekty nehôd a katastrof STR_CONFIG_SETTING_SOUND_VEHICLE :Vozidlá: {STRING} STR_CONFIG_SETTING_SOUND_VEHICLE_HELPTEXT :Prehrávať zvukové efekty vozidiel STR_CONFIG_SETTING_SOUND_AMBIENT :Prostredie: {STRING} @@ -1691,15 +1691,15 @@ STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT :Počet otvoren STR_CONFIG_SETTING_SOFT_LIMIT_VALUE :{COMMA} STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED :vypnuté STR_CONFIG_SETTING_ZOOM_MIN :Maximálna úroveň priblíženia: {STRING} -STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT :Maximálna úroveň priblíženia pre pozorovanie. Uvedomte si že čím vyššie je možné priblíženie, tým rastie požiadavka na pamäť. +STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT :Maximálna úroveň priblíženia pohľadu. Vyššie úrovne priblíženia zvyšujú požiadavky na pamäť STR_CONFIG_SETTING_ZOOM_MAX :Maximálna úroveň oddialenia: {STRING} -STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT :Maximálna úroveň oddialenia pre pozorovanie. Uvedomte si že čím vyššie je možné oddialenie, tým rastie požiadavka na pamäť. -STR_CONFIG_SETTING_ZOOM_LVL_MIN :4krát -STR_CONFIG_SETTING_ZOOM_LVL_IN_2X :Dvojnásobný -STR_CONFIG_SETTING_ZOOM_LVL_NORMAL :Normálny -STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X :Dvojnásobný -STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X :4krát -STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X :8krát +STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT :Maximálna úroveň oddialenia pohľadu. Vyššie úrovne oddialenia môžu pri používaní spôsobovať oneskorenie +STR_CONFIG_SETTING_ZOOM_LVL_MIN :4-krát +STR_CONFIG_SETTING_ZOOM_LVL_IN_2X :2-krát +STR_CONFIG_SETTING_ZOOM_LVL_NORMAL :Normálna +STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X :2-krát +STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X :4-krát +STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X :8-krát STR_CONFIG_SETTING_TOWN_GROWTH :Rozvoj miest: {STRING} STR_CONFIG_SETTING_TOWN_GROWTH_HELPTEXT :Rýchlosť rastu miest STR_CONFIG_SETTING_TOWN_GROWTH_NONE :žiadny @@ -1875,18 +1875,9 @@ STR_INTRO_TRANSLATION :{BLACK}V prekla # Quit window STR_QUIT_CAPTION :{WHITE}Koniec -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ste si istý, že chcete ukončiť hru a vrátiť sa do {STRING}? STR_QUIT_YES :{BLACK}Áno STR_QUIT_NO :{BLACK}Nie -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Opustiť hru STR_ABANDON_GAME_QUERY :{YELLOW}Ste si istý, že chcete opustiť túto hru? diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index f07f071ff8..a8b288f5a8 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1908,18 +1908,9 @@ STR_INTRO_TRANSLATION :{BLACK}Temu pre # Quit window STR_QUIT_CAPTION :{WHITE}Izhod -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Zagotovo želiš zapustiti igro in se vrniti v {STRING}? STR_QUIT_YES :{BLACK}Da STR_QUIT_NO :{BLACK}Ne -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Zapusti igro STR_ABANDON_GAME_QUERY :{YELLOW}Zagotovo želiš zapustiti igro? diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index efe012ed15..12acd9a383 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}A esta t # Quit window STR_QUIT_CAPTION :{WHITE}Salir -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}¿Está seguro de abandonar OpenTTD y regresar a {STRING}? STR_QUIT_YES :{BLACK}Sí STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Abandonar Juego STR_ABANDON_GAME_QUERY :{YELLOW}¿Está seguro de que desea abandonar este juego? diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 5571c32f5f..64344f42ef 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}A esta t # Quit window STR_QUIT_CAPTION :{WHITE}Salir -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}¿Estás seguro de salir de OpenTTD y regresar a {STRING}? STR_QUIT_YES :{BLACK}Sí STR_QUIT_NO :{BLACK}No -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Salir de la partida STR_ABANDON_GAME_QUERY :{YELLOW}¿Estás seguro de que deseas salir de esta partida? diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 23f557ec07..65b1ee1ec2 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}Den här # Quit window STR_QUIT_CAPTION :{WHITE}Avsluta -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Är du säker på att du vill avsluta OpenTTD och återvända till {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nej -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Avsluta spelet STR_ABANDON_GAME_QUERY :{YELLOW}Är du säker på att du vill avsluta spelet? diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 0b6a8a396c..4bad1f00b1 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -1607,14 +1607,6 @@ STR_QUIT_CAPTION :{WHITE}வெ STR_QUIT_YES :{BLACK}ஆமாம் STR_QUIT_NO :{BLACK}இல்லை -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}ஆட்டத்தை கைவிடு STR_ABANDON_GAME_QUERY :{YELLOW}நீங்கள் இந்த ஆட்டத்தினை விட்டு வெளியேறுவதில் உறுதியா? diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 258be30a15..cb00ecdd59 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -1704,18 +1704,9 @@ STR_INTRO_TRANSLATION :{BLACK} กา # Quit window STR_QUIT_CAPTION :{WHITE}ออกจากเกม -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}คุณแน่ใจว่าจะออกจากเกม OpenTTD แล้วกลับสู่ {STRING}? STR_QUIT_YES :{BLACK}ใช่ STR_QUIT_NO :{BLACK}ไม่ -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :ระบบปฏิบัติการ Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}ออกไปสู่เมนูหลัก STR_ABANDON_GAME_QUERY :{YELLOW}เกมยังดำเนินอยู่แน่ใจหรือไม่ว่าจะกลับไปสู่เมนูหลัก? diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index d530adbad3..6b6dc6b87d 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1755,18 +1755,9 @@ STR_INTRO_TRANSLATION :{BLACK}此段 # Quit window STR_QUIT_CAPTION :{WHITE}離開 -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}您確定要放棄進行中的遊戲{}返回 {STRING}？ STR_QUIT_YES :{BLACK}是 STR_QUIT_NO :{BLACK}否 -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}放棄遊戲 STR_ABANDON_GAME_QUERY :{YELLOW}你要放棄這個遊戲嗎？ diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 9d5129571a..240b3041d8 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1808,18 +1808,9 @@ STR_INTRO_TRANSLATION :{BLACK}Bu çevi # Quit window STR_QUIT_CAPTION :{WHITE}Çıkış -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Oyundan çıkıp {STRING} sisteminize dönmek istediğinizden emin misiniz? STR_QUIT_YES :{BLACK}Evet STR_QUIT_NO :{BLACK}Hayır -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Ana Menüye Dön STR_ABANDON_GAME_QUERY :{YELLOW}Oyunu bitirmek istediğinizden emin misiniz? diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 012a569f9a..6b9545d1a9 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1935,18 +1935,9 @@ STR_INTRO_TRANSLATION :{BLACK}Пере # Quit window STR_QUIT_CAPTION :{WHITE}Вийти -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ви дійсно бажаєте вийти до {STRING}? STR_QUIT_YES :{BLACK}Так STR_QUIT_NO :{BLACK}Ні -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Покинути гру STR_ABANDON_GAME_QUERY :{YELLOW}Ви дійсно хочете покинути гру? diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index 44deeae30f..e0608c3e3d 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -655,14 +655,6 @@ STR_QUIT_CAPTION :{WHITE}Вӗҫл STR_QUIT_YES :{BLACK}Ийя STR_QUIT_NO :{BLACK}Ҫук -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Вӑййи ан килӗш diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 8f41c2ff22..fd8b8e1e64 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1687,18 +1687,9 @@ STR_INTRO_TOOLTIP_QUIT :{BLACK}Slút 'O # Quit window STR_QUIT_CAPTION :{WHITE}Ôfslúte -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Witte jo seker dat jo dit spul ôfslúte wolle en werom gean wolle nei {STRING}? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nee -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Ferlit Spul STR_ABANDON_GAME_QUERY :{YELLOW}Wolsto echt dit lânskip slúte? diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index b48ddf424b..8807e62bb6 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -583,12 +583,9 @@ STR_INTRO_GAME_OPTIONS :{BLACK}Ludo Sel # Quit window STR_QUIT_CAPTION :{WHITE}Livas -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Kad tu esas certa ke tu volas livar OpenTTD ed rivenar a {STRING}? STR_QUIT_YES :{BLACK}Yes STR_QUIT_NO :{BLACK}Ne -# Supported OSes - # Abandon game # Cheat window diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 5f182a1007..340bb0818c 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -938,17 +938,9 @@ STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Пока # Quit window STR_QUIT_CAPTION :{WHITE}Напушти -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Дали сте сигурни дека сакате да ја напуштите OpenTTD и да се вратите во {STRING}? STR_QUIT_YES :{BLACK}Да STR_QUIT_NO :{BLACK}Не -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Напушти ја Играта STR_ABANDON_GAME_QUERY :{YELLOW}Дали сте сигурни дека сакате да ја напуштите играта? diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index 2728fd297f..ea06945bb1 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -510,8 +510,6 @@ STR_INTRO_CAPTION :{WHITE}OpenTTD # Quit window -# Supported OSes - # Abandon game # Cheat window diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 6ef399f161..25cae04d3e 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -840,8 +840,6 @@ STR_INTRO_CAPTION :{WHITE}ओप # Quit window -# Supported OSes - # Abandon game # Cheat window diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 2865d4e461..30af9b9364 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -1470,18 +1470,9 @@ STR_INTRO_TRANSLATION :{BLACK}این # Quit window STR_QUIT_CAPTION :{WHITE}خروج -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}آیا می‌خواهید از بازی خارج شوید و برگردید به{STRING}? STR_QUIT_YES :{BLACK}بله STR_QUIT_NO :{BLACK}خیر -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :هایکو -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}رها کردن بازی STR_ABANDON_GAME_QUERY :{YELLOW}آیا مطمئن هستی که میخواهی این بازی را از بین ببری؟ diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 9d5e65753c..61ed5a2d93 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -1367,18 +1367,9 @@ STR_INTRO_TRANSLATION :{BLACK}اس ت # Quit window STR_QUIT_CAPTION :{WHITE}باہر نکلو -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}کیا آپ واقعی OpenTTD کو چھوڑ کر واپس {STRING} میں جانا چاہتے ہیں؟ STR_QUIT_YES :{BLACK}ہاں STR_QUIT_NO :{BLACK}نہیں -# Supported OSes -STR_OSNAME_WINDOWS :ونڈوز -STR_OSNAME_UNIX :یونیکس -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}کھیل چھوڑ دو STR_ABANDON_GAME_QUERY :{YELLOW}کیا آپ کو یقین ہے کہ آپ اس کھیل کو چھوڑنا چاہ رہے ہیں؟ diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 45b00a0361..0211530fef 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1807,18 +1807,9 @@ STR_INTRO_TRANSLATION :{BLACK}Bản d # Quit window STR_QUIT_CAPTION :{WHITE}Thoát -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Bạn có chắc chắn muốn thoát khỏi OpenTTD và trở lại {STRING}? STR_QUIT_YES :{BLACK}Đồng ý STR_QUIT_NO :{BLACK}Không đồng ý -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Thoát STR_ABANDON_GAME_QUERY :{YELLOW}Bạn có chắc chắn muốn thoát khỏi trò chơi không? diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index cd5a116d35..e905391461 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1760,18 +1760,9 @@ STR_INTRO_TRANSLATION :{BLACK}Mae'r cy # Quit window STR_QUIT_CAPTION :{WHITE}Gadael -STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ydych chi eisiau gadael y gêm a dychwelyd i {STRING}? STR_QUIT_YES :{BLACK}Iawn STR_QUIT_NO :{BLACK}Na -# Supported OSes -STR_OSNAME_WINDOWS :Windows -STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS{NBSP}X -STR_OSNAME_HAIKU :Haiku -STR_OSNAME_OS2 :OS/2 -STR_OSNAME_SUNOS :SunOS - # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Rhoi'r gorau i Gêm STR_ABANDON_GAME_QUERY :{YELLOW}Ydych chi'n siwr eich bod chi eisiau rhoi'r gorau i'r gêm? From 20151e41ea0b504f94fab44f729c7c1e6cf88928 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 9 Dec 2020 17:50:24 +0000 Subject: [PATCH 05/16] Update: Translations from eints korean: 1 change by telk5093 french: 1 change by glx22 --- src/lang/french.txt | 1 + src/lang/korean.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lang/french.txt b/src/lang/french.txt index 4efbe83b31..2c025c586e 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1808,6 +1808,7 @@ STR_INTRO_TRANSLATION :{BLACK}Il manqu # Quit window STR_QUIT_CAPTION :{WHITE}Quitter +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Êtes-vous sûr de vouloir quitter OpenTTD{NBSP}? STR_QUIT_YES :{BLACK}Oui STR_QUIT_NO :{BLACK}Non diff --git a/src/lang/korean.txt b/src/lang/korean.txt index e4236da6d7..aaee99eae3 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1808,6 +1808,7 @@ STR_INTRO_TRANSLATION :{BLACK}이 버 # Quit window STR_QUIT_CAPTION :{WHITE}종료 +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}정말 게임을 종료하시겠습니까? STR_QUIT_YES :{BLACK}예 STR_QUIT_NO :{BLACK}아니요 From e2eafd86de01abe0aac06f369c09808c758e025c Mon Sep 17 00:00:00 2001 From: glx22 Date: Thu, 10 Dec 2020 00:31:03 +0100 Subject: [PATCH 06/16] Fix: Prevent infinite recursion in commit checker --- .github/workflows/commit-checker.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/commit-checker.yml b/.github/workflows/commit-checker.yml index d2546ab30b..d83183a467 100644 --- a/.github/workflows/commit-checker.yml +++ b/.github/workflows/commit-checker.yml @@ -24,6 +24,12 @@ jobs: # the log between HEAD^ and HEAD^2 will be the commits in the pull-request. DEPTH=4 while [ -z "$(git merge-base HEAD^ HEAD^2)" ]; do + # Prevent infinite recursion + if [ ${DEPTH} -gt 256 ]; then + echo "No common parent between '${GITHUB_HEAD_REF}' and '${GITHUB_BASE_REF}'." >&2 + exit 1 + fi + git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --deepen=${DEPTH} origin HEAD DEPTH=$(( ${DEPTH} * 4 )) done From 7f5afbfdf5ac288da188276430c30b3ed0af99f8 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 10 Dec 2020 17:53:08 +0000 Subject: [PATCH 07/16] Update: Translations from eints slovak: 2 changes by FuryPapaya --- src/lang/slovak.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 09a3afa042..b1b3bf1cde 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1874,7 +1874,8 @@ STR_INTRO_BASESET :{BLACK}Vo vybra STR_INTRO_TRANSLATION :{BLACK}V preklade chýba {NUM} reťaz{P ec ce cov}. Prosím pomôžte urobiť OpenTTD lepším a prihláste sa ako prekladateľ. Viac detailov v readme.txt # Quit window -STR_QUIT_CAPTION :{WHITE}Koniec +STR_QUIT_CAPTION :{WHITE}Ukončiť +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ste si istý, že chcete ukončiť OpenTTD? STR_QUIT_YES :{BLACK}Áno STR_QUIT_NO :{BLACK}Nie From 6fae0b83d9f0ddc28d6f1cadf3c8aef126004429 Mon Sep 17 00:00:00 2001 From: glx22 Date: Thu, 10 Dec 2020 23:57:27 +0100 Subject: [PATCH 08/16] Add: [CMake] targets to generate documentation --- CMakeLists.txt | 21 +++++++++++++++++++ Doxyfile => Doxyfile.in | 8 +++---- cmake/scripts/FindVersion.cmake | 12 +++++++++++ src/script/api/CMakeLists.txt | 17 +++++++++++++++ .../api/{Doxyfile_AI => Doxyfile_AI.in} | 14 ++++--------- .../api/{Doxyfile_Game => Doxyfile_GS.in} | 14 ++++--------- 6 files changed, 61 insertions(+), 25 deletions(-) rename Doxyfile => Doxyfile.in (98%) rename src/script/api/{Doxyfile_AI => Doxyfile_AI.in} (96%) rename src/script/api/{Doxyfile_Game => Doxyfile_GS.in} (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39cfffc019..a8f7aa071a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,10 @@ find_package(Xaudio2) find_package(Grfcodec) +if(UNIX) + find_package(Doxygen) +endif() + # IPO is only properly supported from CMake 3.9. Despite the fact we are # CMake 3.5, still enable IPO if we detect we are 3.9+. if(POLICY CMP0069) @@ -130,6 +134,23 @@ add_custom_target(find_version # An empty target for the tools add_custom_target(tools) +# Documentation +if(DOXYGEN_EXECUTABLE) + add_custom_target(docs) + add_custom_target(docs_source + ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/docs + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Generating documentation for source" + ) + add_dependencies(docs_source + find_version + ) + add_dependencies(docs + docs_source + ) +endif() + include(SourceList) include(Endian) add_endian_definition() diff --git a/Doxyfile b/Doxyfile.in similarity index 98% rename from Doxyfile rename to Doxyfile.in index e288ffbd87..8727594771 100644 --- a/Doxyfile +++ b/Doxyfile.in @@ -8,10 +8,10 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "OpenTTD Source" -PROJECT_NUMBER = $(VERSION) +PROJECT_NUMBER = ${REV_VERSION} PROJECT_BRIEF = PROJECT_LOGO = -OUTPUT_DIRECTORY = docs/source/ +OUTPUT_DIRECTORY = ${CPACK_BINARY_DIR}/docs/source/ CREATE_SUBDIRS = YES ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = English @@ -306,16 +306,14 @@ SKIP_FUNCTION_MACROS = YES # Configuration options related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = objs/openttd.tag +GENERATE_TAGFILE = ${CPACK_BINARY_DIR}/docs/openttd.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES -PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = DIA_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO diff --git a/cmake/scripts/FindVersion.cmake b/cmake/scripts/FindVersion.cmake index bb754fc5b3..c920e6b8c7 100644 --- a/cmake/scripts/FindVersion.cmake +++ b/cmake/scripts/FindVersion.cmake @@ -137,4 +137,16 @@ else() message(STATUS "Generating CPackProperties.cmake") configure_file("${CMAKE_SOURCE_DIR}/CPackProperties.cmake.in" "${CPACK_BINARY_DIR}/CPackProperties.cmake" @ONLY) + + message(STATUS "Generating Doxyfile") + configure_file("${CMAKE_SOURCE_DIR}/Doxyfile.in" + "${CPACK_BINARY_DIR}/Doxyfile") + + message(STATUS "Generating Doxyfile_AI") + configure_file("${CMAKE_SOURCE_DIR}/src/script/api/Doxyfile_AI.in" + "${CPACK_BINARY_DIR}/Doxyfile_AI") + + message(STATUS "Generating Doxyfile_GS") + configure_file("${CMAKE_SOURCE_DIR}/src/script/api/Doxyfile_GS.in" + "${CPACK_BINARY_DIR}/Doxyfile_GS") endif() diff --git a/src/script/api/CMakeLists.txt b/src/script/api/CMakeLists.txt index e294cfd05c..9bc4183f19 100644 --- a/src/script/api/CMakeLists.txt +++ b/src/script/api/CMakeLists.txt @@ -100,6 +100,23 @@ foreach(API "ai;AI" "game;GS" "template;Template") add_dependencies(script_api script_${APILC}_includes ) + + # Documentation + if(DOXYGEN_EXECUTABLE) + add_custom_target(docs_${APILC} + ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/docs + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile_${APIUC} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Generating documentation for ${APILC} API" + ) + add_dependencies(docs_${APILC} + find_version + script_window + ) + add_dependencies(docs + docs_${APILC} + ) + endif() else() add_dependencies(script_api script_${APILC} diff --git a/src/script/api/Doxyfile_AI b/src/script/api/Doxyfile_AI.in similarity index 96% rename from src/script/api/Doxyfile_AI rename to src/script/api/Doxyfile_AI.in index fb0abc0567..f0707e0d86 100644 --- a/src/script/api/Doxyfile_AI +++ b/src/script/api/Doxyfile_AI.in @@ -10,8 +10,8 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "OpenTTD AI API" -PROJECT_NUMBER = $(VERSION) -OUTPUT_DIRECTORY = ../../../docs/aidocs/ +PROJECT_NUMBER = ${REV_VERSION} +OUTPUT_DIRECTORY = ${CPACK_BINARY_DIR}/docs/ai-api/ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -76,7 +76,6 @@ GENERATE_DEPRECATEDLIST= NO ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = NO -SHOW_DIRECTORIES = NO FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages @@ -91,7 +90,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = . $(GENERATED_API_DIR) +INPUT = . ${FIND_VERSION_BINARY_DIR}/script/api INPUT_ENCODING = UTF-8 FILE_PATTERNS = script_*.hpp \ ai_*.hpp @@ -133,7 +132,6 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO HTML_DYNAMIC_SECTIONS = NO CHM_FILE = @@ -181,8 +179,6 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output @@ -211,15 +207,13 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = ../../../objs/openttd_noai.tag +GENERATE_TAGFILE = ${CPACK_BINARY_DIR}/docs/openttd_ai_api.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO CLASS_GRAPH = YES diff --git a/src/script/api/Doxyfile_Game b/src/script/api/Doxyfile_GS.in similarity index 96% rename from src/script/api/Doxyfile_Game rename to src/script/api/Doxyfile_GS.in index 83f8ad0e87..7dae7aad66 100644 --- a/src/script/api/Doxyfile_Game +++ b/src/script/api/Doxyfile_GS.in @@ -10,8 +10,8 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "OpenTTD GameScript API" -PROJECT_NUMBER = $(VERSION) -OUTPUT_DIRECTORY = ../../../docs/gamedocs/ +PROJECT_NUMBER = ${REV_VERSION} +OUTPUT_DIRECTORY = ${CPACK_BINARY_DIR}/docs/gs-api/ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -76,7 +76,6 @@ GENERATE_DEPRECATEDLIST= NO ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = NO -SHOW_DIRECTORIES = NO FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages @@ -91,7 +90,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = . $(GENERATED_API_DIR) +INPUT = . ${FIND_VERSION_BINARY_DIR}/script/api INPUT_ENCODING = UTF-8 FILE_PATTERNS = script_*.hpp \ game_*.hpp @@ -133,7 +132,6 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO HTML_DYNAMIC_SECTIONS = NO CHM_FILE = @@ -181,8 +179,6 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output @@ -211,15 +207,13 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = ../../../objs/openttd_nogo.tag +GENERATE_TAGFILE = ${CPACK_BINARY_DIR}/docs/openttd_gs_api.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO CLASS_GRAPH = YES From 40edc2863ccec78eac80ee2918188f1e1d605ce0 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 12 Dec 2020 17:52:42 +0000 Subject: [PATCH 09/16] Update: Translations from eints finnish: 1 change by hpiirai --- src/lang/finnish.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index f85a203b1c..dd1670ccb2 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1807,6 +1807,7 @@ STR_INTRO_TRANSLATION :{BLACK}Tästä # Quit window STR_QUIT_CAPTION :{WHITE}Sulje +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Haluatko varmasti poistua OpenTTD:stä? STR_QUIT_YES :{BLACK}Kyllä STR_QUIT_NO :{BLACK}Ei From c66bd18a1087d4b34d79faf68afb9ff8fea89be4 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 13 Dec 2020 16:28:06 +0100 Subject: [PATCH 10/16] Add: save openttd.cfg immediately on changing a setting (#8358) Formally it was only done on exit. This means that if it crashes changes in settings were not stored. This is often rather frustrating. Additionally, targets (like emscripten) where people are unlike to use "Exit Game", will never see their configuration stored. The drawback is that on every setting change there is some minor I/O of writing the ini file to disk again. --- src/openttd.cpp | 18 +++++++----------- src/openttd.h | 1 + src/settings.cpp | 6 ++++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index d20e88cd86..6db4ce8d7d 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -84,6 +84,7 @@ bool HandleBootstrap(); extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY); extern void ShowOSErrorBox(const char *buf, bool system); extern char *_config_file; +extern bool _save_config = false; /** * Error handling for fatal user errors. @@ -178,7 +179,7 @@ static void ShowHelp() " -S sounds_set = Force the sounds set (see below)\n" " -M music_set = Force the music set (see below)\n" " -c config_file = Use 'config_file' instead of 'openttd.cfg'\n" - " -x = Do not automatically save to config file on exit\n" + " -x = Never save configuration changes to disk\n" " -q savegame = Write some information about the savegame and exit\n" "\n", lastof(buf) @@ -395,19 +396,16 @@ struct AfterNewGRFScan : NewGRFScanCallback { char *network_conn; ///< Information about the server to connect to, or nullptr. const char *join_server_password; ///< The password to join the server with. const char *join_company_password; ///< The password to join the company with. - bool *save_config_ptr; ///< The pointer to the save config setting. bool save_config; ///< The save config setting. /** * Create a new callback. - * @param save_config_ptr Pointer to the save_config local variable which - * decides whether to save of exit or not. */ - AfterNewGRFScan(bool *save_config_ptr) : + AfterNewGRFScan() : startyear(INVALID_YEAR), generation_seed(GENERATE_NEW_SEED), dedicated_host(nullptr), dedicated_port(0), network_conn(nullptr), join_server_password(nullptr), join_company_password(nullptr), - save_config_ptr(save_config_ptr), save_config(true) + save_config(true) { /* Visual C++ 2015 fails compiling this line (AfterNewGRFScan::generation_seed undefined symbol) * if it's placed outside a member function, directly in the struct body. */ @@ -438,7 +436,7 @@ struct AfterNewGRFScan : NewGRFScanCallback { WindowDesc::LoadFromConfig(); /* We have loaded the config, so we may possibly save it. */ - *save_config_ptr = save_config; + _save_config = save_config; /* restore saved music volume */ MusicDriver::GetInstance()->SetVolume(_settings_client.music.music_vol); @@ -541,9 +539,7 @@ int openttd_main(int argc, char *argv[]) std::string sounds_set; std::string music_set; Dimension resolution = {0, 0}; - /* AfterNewGRFScan sets save_config to true after scanning completed. */ - bool save_config = false; - std::unique_ptr scanner(new AfterNewGRFScan(&save_config)); + std::unique_ptr scanner(new AfterNewGRFScan()); bool dedicated = false; char *debuglog_conn = nullptr; @@ -847,7 +843,7 @@ int openttd_main(int argc, char *argv[]) WaitTillGeneratedWorld(); // Make sure any generate world threads have been joined. /* only save config if we have to */ - if (save_config) { + if (_save_config) { SaveToConfig(); SaveHotkeysToConfig(); WindowDesc::SaveToConfig(); diff --git a/src/openttd.h b/src/openttd.h index 664963a5da..61cff24564 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -51,6 +51,7 @@ enum DisplayOptions { extern GameMode _game_mode; extern SwitchMode _switch_mode; extern bool _exit_game; +extern bool _save_config; /** Modes of pausing we've got */ enum PauseMode : byte { diff --git a/src/settings.cpp b/src/settings.cpp index 2966a3e22f..02cd520049 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1913,6 +1913,8 @@ CommandCost CmdChangeSetting(TileIndex tile, DoCommandFlag flags, uint32 p1, uin } SetWindowClassesDirty(WC_GAME_OPTIONS); + + if (_save_config) SaveToConfig(); } return CommandCost(); @@ -1981,12 +1983,15 @@ bool SetSettingValue(uint index, int32 value, bool force_newgame) SetWindowClassesDirty(WC_GAME_OPTIONS); + if (_save_config) SaveToConfig(); return true; } if (force_newgame) { void *var2 = GetVariableAddress(&_settings_newgame, &sd->save); Write_ValidateSetting(var2, sd, value); + + if (_save_config) SaveToConfig(); return true; } @@ -2080,6 +2085,7 @@ bool SetSettingValue(uint index, const char *value, bool force_newgame) } if (sd->desc.proc != nullptr) sd->desc.proc(0); + if (_save_config) SaveToConfig(); return true; } From 4e12aac9c0609f7a42d397106d102ad3367598bd Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 8 Dec 2020 23:11:47 +0100 Subject: [PATCH 11/16] Codechange: to create or not to create a folder, that is the question This was just weird. With XDG _personal_dir was created already, but later on it was checked if it was different from config_dir, and the creation was skipped. All this checking and validation makes my head spin .. let's make it a bit more simple. --- src/fileio.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index d40ca2136c..cc6cb30de2 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -1234,7 +1234,6 @@ void DeterminePaths(const char *exe) /* We are using the XDG configuration home for the config file, * then store the rest in the XDG data home folder. */ _personal_dir = _searchpaths[SP_PERSONAL_DIR_XDG]; - FioCreateDirectory(_personal_dir); } else #endif { @@ -1242,9 +1241,9 @@ void DeterminePaths(const char *exe) } /* Make the necessary folders */ -#if defined(WITH_PERSONAL_DIR) FioCreateDirectory(config_dir); - if (config_dir != _personal_dir) FioCreateDirectory(_personal_dir); +#if defined(WITH_PERSONAL_DIR) + FioCreateDirectory(_personal_dir); #endif DEBUG(misc, 3, "%s found as personal directory", _personal_dir); From da7c74ba7e8a89ca4e099522a8ab3564a2f1f3df Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Wed, 9 Dec 2020 00:02:39 +0100 Subject: [PATCH 12/16] Fix: change the working-dir searchpath when using '-c' Basically, with '-c' you now create a sandbox. It will still use your personal-dir and global-dir to find files you installed there, but all new files are stored with a base folder identical to the folder the configuration is in. This is a bit of an old bug, that we many have tried to solve in various of different ways. The code has grown sufficiently complex that it is hard to see what consequences of actions are. This is in my opinion the most harmless solution, while increasing the usefulness of the '-c' flag. In essence, the problem was that empty folders were always created in the directory where the configuration was, but as that directory wasn't added to any searchpath, files weren't stored there, unless by accident it was a folder already on the searchpath. For example, if you do './openttd -c local.cfg', it did work as expected. But in the more generic variant, it did not. With this patch, you can run './openttd -c /new/folder/local.cfg', and it will create and prepare that folder to receive new files. 'content_download' is also stored in the directory the configuration is in; this was already the case. Important to note that there is only one search-path for 'content_download'. In other words, when using '-c', it will not look in '~/.openttd' inside the 'content_download' folder. --- src/fileio.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/fileio.cpp b/src/fileio.cpp index cc6cb30de2..254074ef9e 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -1192,6 +1192,15 @@ void DeterminePaths(const char *exe) } else { end[1] = '\0'; } + + /* When using '-c', which sets _config_file, change the first search + * path to the folder the configuration file is in. This folder is + * also prepared to store autosaves and content you download. This + * means that by using '-c', you create an sandboxed OpenTTD + * installation as far as writing goes. For reading it still uses the + * other search paths to find files, except for content_download. + * Anything else in your personal-dir will be used if possible. */ + _searchpaths[SP_WORKING_DIR] = config_dir; } else { char personal_dir[MAX_PATH]; if (FioFindFullPath(personal_dir, lastof(personal_dir), BASE_DIR, "openttd.cfg") != nullptr) { From 5d0331ecdc406b964219a2f7abdb465679ec7f53 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 13 Dec 2020 16:56:33 +0100 Subject: [PATCH 13/16] Fix 8bef06a2: don't use "extern" when you want to implement a global (#8373) --- src/openttd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 6db4ce8d7d..4aeed39282 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -84,7 +84,8 @@ bool HandleBootstrap(); extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY); extern void ShowOSErrorBox(const char *buf, bool system); extern char *_config_file; -extern bool _save_config = false; + +bool _save_config = false; /** * Error handling for fatal user errors. From abb746fae3c47c81b5e259072ed4cbe95516b2ae Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 13 Dec 2020 22:32:44 +0100 Subject: [PATCH 14/16] Fix: [Actions] cleanup ci-build workflow to be up-to-date (#8375) Also, while at it, make it more like the upcoming release-workflow, so they look a lot more similar. Functional it should be the same, except that Windows should now also output when a test fails. --- .github/workflows/ci-build.yml | 198 ++++++++++++++++++++++----------- 1 file changed, 135 insertions(+), 63 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 8786c079be..31d0b511da 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -6,29 +6,38 @@ on: branches: - master +env: + CTEST_OUTPUT_ON_FAILURE: 1 + jobs: linux: name: Linux - runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: - compiler: [clang, gcc] include: - compiler: clang cxxcompiler: clang++ - compiler: gcc cxxcompiler: g++ + + runs-on: ubuntu-20.04 env: - CTEST_OUTPUT_ON_FAILURE: 1 CC: ${{ matrix.compiler }} CXX: ${{ matrix.cxxcompiler }} steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Install dependencies run: | + echo "::group::Update apt" sudo apt-get update + echo "::endgroup::" + + echo "::group::Install dependencies" sudo apt-get install -y --no-install-recommends \ libfontconfig-dev \ libicu-dev \ @@ -39,104 +48,167 @@ jobs: libxdg-basedir-dev \ zlib1g-dev \ # EOF - - - name: Checkout - uses: actions/checkout@v2 + echo "::endgroup::" + env: + DEBIAN_FRONTEND: noninteractive - name: Get OpenGFX run: | mkdir -p ~/.local/share/openttd/baseset cd ~/.local/share/openttd/baseset + + echo "::group::Download OpenGFX" curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip + echo "::endgroup::" + + echo "::group::Unpack OpenGFX" unzip opengfx-all.zip + echo "::endgroup::" + rm -f opengfx-all.zip - - name: CMake - run: mkdir build && cd build && cmake .. + - name: Install GCC problem matcher + uses: ammaraskar/gcc-problem-matcher@master - - uses: ammaraskar/gcc-problem-matcher@master - name: Build - run: cd build && make -j2 - - - name: Test - run: cd build && make -j2 test - - windows: - name: Windows - - runs-on: windows-latest - strategy: - fail-fast: false - matrix: - arch: [x86, x64] - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Prepare vcpkg (with cache) - uses: lukka/run-vcpkg@v4 - with: - vcpkgDirectory: 'c:/vcpkg' - doNotUpdateVcpkg: true - vcpkgArguments: 'liblzma libpng lzo zlib' - vcpkgTriplet: '${{ matrix.arch }}-windows-static' - - - uses: ammaraskar/msvc-problem-matcher@master - - name: 'Build' - uses: lukka/run-cmake@v3 - with: - cmakeListsOrSettingsJson: CMakeListsTxtBasic - useVcpkgToolchainFile: true - buildDirectory: '${{ runner.workspace }}/build' - - - name: Install OpenGFX run: | - mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset" - cd "C:/Users/Public/Documents/OpenTTD/baseset" - curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip - unzip opengfx-all.zip - rm -f opengfx-all.zip - shell: bash + mkdir build + cd build + + echo "::group::CMake" + cmake .. + echo "::endgroup::" + + echo "::group::Build" + echo "Running on $(nproc) cores" + make -j$(nproc) + echo "::endgroup::" - name: Test run: | - cd ${{ runner.workspace }}/build - ctest -C Debug + cd build + make -j$(nproc) test macos: name: Mac OS - runs-on: macos-latest strategy: fail-fast: false + matrix: + include: + - arch: x64 + full_arch: x86_64 + + runs-on: macos-latest env: - CTEST_OUTPUT_ON_FAILURE: 1 MACOSX_DEPLOYMENT_TARGET: 10.9 steps: - name: Checkout uses: actions/checkout@v2 - - name: Install dependencies - run: brew install pkg-config lzo xz libpng freetype - env: - HOMEBREW_NO_AUTO_UPDATE: 1 + - name: Prepare vcpkg (with cache) + uses: lukka/run-vcpkg@v6 + with: + vcpkgDirectory: '/usr/local/share/vcpkg' + doNotUpdateVcpkg: true + vcpkgArguments: 'freetype liblzma lzo' + vcpkgTriplet: '${{ matrix.arch }}-osx' - name: Install OpenGFX run: | mkdir -p ~/Documents/OpenTTD/baseset cd ~/Documents//OpenTTD/baseset + + echo "::group::Download OpenGFX" curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip + echo "::endgroup::" + + echo "::group::Unpack OpenGFX" unzip opengfx-all.zip + echo "::endgroup::" + rm -f opengfx-all.zip - - name: CMake - run: mkdir build && cd build && cmake .. + - name: Install GCC problem matcher + uses: ammaraskar/gcc-problem-matcher@master - - uses: ammaraskar/gcc-problem-matcher@master - name: Build - run: cd build && make -j2 + run: | + mkdir build + cd build + + echo "::group::CMake" + cmake ${GITHUB_WORKSPACE} \ + -DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \ + -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \ + -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \ + # EOF + echo "::endgroup::" + + echo "::group::Build" + echo "Running on $(sysctl -n hw.logicalcpu) cores" + make -j$(sysctl -n hw.logicalcpu) + echo "::endgroup::" - name: Test - run: cd build && make -j2 test + run: | + cd build + make -j$(sysctl -n hw.logicalcpu) test + + windows: + name: Windows + + strategy: + fail-fast: false + matrix: + include: + - arch: x86 + - arch: x64 + + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Prepare vcpkg (with cache) + uses: lukka/run-vcpkg@v6 + with: + vcpkgDirectory: 'c:/vcpkg' + doNotUpdateVcpkg: true + vcpkgArguments: 'liblzma libpng lzo zlib' + vcpkgTriplet: '${{ matrix.arch }}-windows-static' + + - name: Install OpenGFX + shell: bash + run: | + mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset" + cd "C:/Users/Public/Documents/OpenTTD/baseset" + + echo "::group::Download OpenGFX" + curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip + echo "::endgroup::" + + echo "::group::Unpack OpenGFX" + unzip opengfx-all.zip + echo "::endgroup::" + + rm -f opengfx-all.zip + + - name: Install MSVC problem matcher + uses: ammaraskar/msvc-problem-matcher@master + + - name: Build + uses: lukka/run-cmake@v3 + with: + cmakeListsOrSettingsJson: CMakeListsTxtAdvanced + useVcpkgToolchainFile: true + buildDirectory: '${{ github.workspace }}/build' + cmakeAppendedArgs: ' -GNinja' + + - name: Test + shell: bash + run: | + cd ${GITHUB_WORKSPACE}/build + ctest -C Debug From a660dce295d448ce6ef9911ee1cbd6e63af6618b Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Sun, 13 Dec 2020 19:00:25 +0100 Subject: [PATCH 15/16] Fix: [CMake, MSVC] Don't copy regression exe's into a subfolder as they need have their lang files next to them. --- cmake/scripts/Regression.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/scripts/Regression.cmake b/cmake/scripts/Regression.cmake index af473ea9f0..b38caed5c6 100644 --- a/cmake/scripts/Regression.cmake +++ b/cmake/scripts/Regression.cmake @@ -19,8 +19,8 @@ endif() # subsystem to console. The copy is needed as multiple regressions can run # at the same time. if(EDITBIN_EXECUTABLE) - execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OPENTTD_EXECUTABLE} regression/${REGRESSION_TEST}.exe) - set(OPENTTD_EXECUTABLE "regression/${REGRESSION_TEST}.exe") + execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OPENTTD_EXECUTABLE} regression_${REGRESSION_TEST}.exe) + set(OPENTTD_EXECUTABLE "regression_${REGRESSION_TEST}.exe") execute_process(COMMAND ${EDITBIN_EXECUTABLE} /nologo /subsystem:console ${OPENTTD_EXECUTABLE}) endif() From b7851e51adf0fb0d39ed34a579cf6fe68d8949be Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 13 Dec 2020 20:54:20 +0100 Subject: [PATCH 16/16] Fix: set SP_WORKING_DIR earlier with '-c' On Windows, relative folders don't work so well. So we need to lookup the full path. This is best done in DetermineBasePaths() and as a bonus that only sets SP_WORKING_DIR once. --- src/fileio.cpp | 52 ++++++++++++++++++++++------------------ src/os/windows/win32.cpp | 24 +++++++++++++++---- 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index 254074ef9e..eb529632cd 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -1116,11 +1116,32 @@ void DetermineBasePaths(const char *exe) _searchpaths[SP_SHARED_DIR] = nullptr; #endif - if (getcwd(tmp, MAX_PATH) == nullptr) *tmp = '\0'; - AppendPathSeparator(tmp, lastof(tmp)); - _searchpaths[SP_WORKING_DIR] = stredup(tmp); + char cwd[MAX_PATH]; + if (getcwd(cwd, MAX_PATH) == nullptr) *cwd = '\0'; - _do_scan_working_directory = DoScanWorkingDirectory(); + if (_config_file == nullptr) { + /* Get the path to working directory of OpenTTD. */ + if (getcwd(tmp, MAX_PATH) == nullptr) *tmp = '\0'; + AppendPathSeparator(tmp, lastof(tmp)); + _searchpaths[SP_WORKING_DIR] = stredup(tmp); + + _do_scan_working_directory = DoScanWorkingDirectory(); + } else { + /* Use the folder of the config file as working directory. */ + char *config_dir = stredup(_config_file); + char *end = strrchr(config_dir, PATHSEPCHAR); + if (end == nullptr) { + free(config_dir); + + /* _config_file is not in a folder, so use current directory. */ + if (getcwd(tmp, MAX_PATH) == nullptr) *tmp = '\0'; + AppendPathSeparator(tmp, lastof(tmp)); + _searchpaths[SP_WORKING_DIR] = stredup(tmp); + } else { + end[1] = '\0'; + _searchpaths[SP_WORKING_DIR] = config_dir; + } + } /* Change the working directory to that one of the executable */ if (ChangeWorkingDirectoryToExecutable(exe)) { @@ -1131,9 +1152,9 @@ void DetermineBasePaths(const char *exe) _searchpaths[SP_BINARY_DIR] = nullptr; } - if (_searchpaths[SP_WORKING_DIR] != nullptr) { + if (cwd[0] != '\0') { /* Go back to the current working directory. */ - if (chdir(_searchpaths[SP_WORKING_DIR]) != 0) { + if (chdir(cwd) != 0) { DEBUG(misc, 0, "Failed to return to working directory!"); } } @@ -1183,24 +1204,9 @@ void DeterminePaths(const char *exe) DEBUG(misc, 4, "%s added as search path", _searchpaths[sp]); } - char *config_dir; + const char *config_dir; if (_config_file != nullptr) { - config_dir = stredup(_config_file); - char *end = strrchr(config_dir, PATHSEPCHAR); - if (end == nullptr) { - config_dir[0] = '\0'; - } else { - end[1] = '\0'; - } - - /* When using '-c', which sets _config_file, change the first search - * path to the folder the configuration file is in. This folder is - * also prepared to store autosaves and content you download. This - * means that by using '-c', you create an sandboxed OpenTTD - * installation as far as writing goes. For reading it still uses the - * other search paths to find files, except for content_download. - * Anything else in your personal-dir will be used if possible. */ - _searchpaths[SP_WORKING_DIR] = config_dir; + config_dir = _searchpaths[SP_WORKING_DIR]; } else { char personal_dir[MAX_PATH]; if (FioFindFullPath(personal_dir, lastof(personal_dir), BASE_DIR, "openttd.cfg") != nullptr) { diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index 1bdbc3c2a8..468234391c 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -451,6 +451,7 @@ char *getcwd(char *buf, size_t size) return buf; } +extern char *_config_file; void DetermineBasePaths(const char *exe) { @@ -481,10 +482,25 @@ void DetermineBasePaths(const char *exe) _searchpaths[SP_SHARED_DIR] = nullptr; #endif - /* Get the path to working directory of OpenTTD */ - getcwd(tmp, lengthof(tmp)); - AppendPathSeparator(tmp, lastof(tmp)); - _searchpaths[SP_WORKING_DIR] = stredup(tmp); + if (_config_file == nullptr) { + /* Get the path to working directory of OpenTTD. */ + getcwd(tmp, lengthof(tmp)); + AppendPathSeparator(tmp, lastof(tmp)); + _searchpaths[SP_WORKING_DIR] = stredup(tmp); + } else { + /* Use the folder of the config file as working directory. */ + TCHAR config_dir[MAX_PATH]; + _tcsncpy(path, convert_to_fs(_config_file, path, lengthof(path)), lengthof(path)); + if (!GetFullPathName(path, lengthof(config_dir), config_dir, nullptr)) { + DEBUG(misc, 0, "GetFullPathName failed (%lu)\n", GetLastError()); + _searchpaths[SP_WORKING_DIR] = nullptr; + } else { + strecpy(tmp, convert_from_fs(config_dir, tmp, lengthof(tmp)), lastof(tmp)); + char *s = strrchr(tmp, PATHSEPCHAR); + *(s + 1) = '\0'; + _searchpaths[SP_WORKING_DIR] = stredup(tmp); + } + } if (!GetModuleFileName(nullptr, path, lengthof(path))) { DEBUG(misc, 0, "GetModuleFileName failed (%lu)\n", GetLastError());