From f6530f3c2d54373125bc0d1277b02f89222eb157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Wed, 19 Oct 2022 21:05:11 +0200 Subject: [PATCH 1/6] Codechange: [Actions] set-output is deprecated (#10089) --- .github/workflows/ci-build.yml | 4 ++-- .github/workflows/release.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index db4f1a3571..84948ad1c1 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -171,7 +171,7 @@ jobs: - name: Prepare cache key id: key run: | - echo "::set-output name=image::$ImageOS-$ImageVersion" + echo "name=image::$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 @@ -253,7 +253,7 @@ jobs: # Work around caching failure with GNU tar New-Item -Type Junction -Path vcpkg -Target c:\vcpkg - Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion" + Write-Output "name=image::$env:ImageOS-$env:ImageVersion" >> $GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8221770e15..c08e3ece59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -138,10 +138,10 @@ jobs: echo "Folder on CDN: ${FOLDER}" echo "Workflow trigger: ${TRIGGER_TYPE}" - echo "::set-output name=version::$(cat .version)" - echo "::set-output name=is_tag::${IS_TAG}" - echo "::set-output name=folder::${FOLDER}" - echo "::set-output name=trigger_type::${TRIGGER_TYPE}" + echo "name=version::$(cat .version)" >> $GITHUB_OUTPUT + echo "name=is_tag::${IS_TAG}" >> $GITHUB_OUTPUT + echo "name=folder::${FOLDER}" >> $GITHUB_OUTPUT + echo "name=trigger_type::${TRIGGER_TYPE}" >> $GITHUB_OUTPUT env: NIGHTLIES_BRANCH: master FOLDER_RELEASES: openttd-releases @@ -497,7 +497,7 @@ jobs: - name: Prepare cache key id: key run: | - echo "::set-output name=image::$ImageOS-$ImageVersion" + echo "name=image::$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 @@ -700,7 +700,7 @@ jobs: # Work around caching failure with GNU tar New-Item -Type Junction -Path vcpkg -Target c:\vcpkg - Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion" + Write-Output "name=image::$env:ImageOS-$env:ImageVersion" >> $GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 From 8ffe59373f572136fa5c064c1b22886533f4c805 Mon Sep 17 00:00:00 2001 From: glx22 Date: Wed, 19 Oct 2022 22:13:50 +0200 Subject: [PATCH 2/6] Update: [Actions] use annotation-check v3 --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 84948ad1c1..5fc670bb0a 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -408,4 +408,4 @@ jobs: steps: - name: Check annotations - uses: OpenTTD/actions/annotation-check@v2 + uses: OpenTTD/actions/annotation-check@v3 From 87d1bd895a2a23f283fd117fec7953288ca1584a Mon Sep 17 00:00:00 2001 From: glx22 Date: Wed, 19 Oct 2022 22:57:35 +0200 Subject: [PATCH 3/6] Fix f6530f3c2: [Actions] set-output was not correctly converted --- .github/workflows/ci-build.yml | 4 ++-- .github/workflows/release.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 5fc670bb0a..b95f8baaf0 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -171,7 +171,7 @@ jobs: - name: Prepare cache key id: key run: | - echo "name=image::$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT + echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 @@ -253,7 +253,7 @@ jobs: # Work around caching failure with GNU tar New-Item -Type Junction -Path vcpkg -Target c:\vcpkg - Write-Output "name=image::$env:ImageOS-$env:ImageVersion" >> $GITHUB_OUTPUT + Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c08e3ece59..10f9b1f286 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -138,10 +138,10 @@ jobs: echo "Folder on CDN: ${FOLDER}" echo "Workflow trigger: ${TRIGGER_TYPE}" - echo "name=version::$(cat .version)" >> $GITHUB_OUTPUT - echo "name=is_tag::${IS_TAG}" >> $GITHUB_OUTPUT - echo "name=folder::${FOLDER}" >> $GITHUB_OUTPUT - echo "name=trigger_type::${TRIGGER_TYPE}" >> $GITHUB_OUTPUT + echo "version=$(cat .version)" >> $GITHUB_OUTPUT + echo "is_tag=${IS_TAG}" >> $GITHUB_OUTPUT + echo "folder=${FOLDER}" >> $GITHUB_OUTPUT + echo "trigger_type=${TRIGGER_TYPE}" >> $GITHUB_OUTPUT env: NIGHTLIES_BRANCH: master FOLDER_RELEASES: openttd-releases @@ -497,7 +497,7 @@ jobs: - name: Prepare cache key id: key run: | - echo "name=image::$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT + echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 @@ -700,7 +700,7 @@ jobs: # Work around caching failure with GNU tar New-Item -Type Junction -Path vcpkg -Target c:\vcpkg - Write-Output "name=image::$env:ImageOS-$env:ImageVersion" >> $GITHUB_OUTPUT + Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 From 520520c11c29aee739b0984b1521851d196a7ef3 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 20 Oct 2022 19:08:43 +0000 Subject: [PATCH 4/6] Update: Translations from eints frisian: 82 changes by Bouke russian: 10 changes by Ln-Wolf portuguese: 3 changes by azulcosta --- src/lang/afrikaans.txt | 2 + src/lang/arabic_egypt.txt | 2 + src/lang/basque.txt | 2 + src/lang/belarusian.txt | 2 + src/lang/brazilian_portuguese.txt | 2 + src/lang/bulgarian.txt | 2 + src/lang/catalan.txt | 2 + src/lang/chuvash.txt | 2 + src/lang/croatian.txt | 2 + src/lang/czech.txt | 2 + src/lang/danish.txt | 2 + src/lang/dutch.txt | 2 + src/lang/english_AU.txt | 2 + src/lang/english_US.txt | 2 + src/lang/esperanto.txt | 2 + src/lang/estonian.txt | 2 + src/lang/faroese.txt | 2 + src/lang/finnish.txt | 2 + src/lang/french.txt | 2 + src/lang/frisian.txt | 144 +++++++++++++++++------------- src/lang/gaelic.txt | 2 + src/lang/galician.txt | 2 + src/lang/german.txt | 2 + src/lang/greek.txt | 2 + src/lang/hebrew.txt | 2 + src/lang/hindi.txt | 2 + src/lang/hungarian.txt | 2 + src/lang/icelandic.txt | 2 + src/lang/ido.txt | 2 + src/lang/indonesian.txt | 2 + src/lang/irish.txt | 2 + src/lang/italian.txt | 2 + src/lang/japanese.txt | 2 + src/lang/korean.txt | 2 + src/lang/latin.txt | 2 + src/lang/latvian.txt | 2 + src/lang/lithuanian.txt | 2 + src/lang/luxembourgish.txt | 2 + src/lang/macedonian.txt | 2 + src/lang/malay.txt | 2 + src/lang/maltese.txt | 2 + src/lang/marathi.txt | 2 + src/lang/norwegian_bokmal.txt | 2 + src/lang/norwegian_nynorsk.txt | 2 + src/lang/persian.txt | 2 + src/lang/polish.txt | 2 + src/lang/portuguese.txt | 5 ++ src/lang/romanian.txt | 2 + src/lang/russian.txt | 19 ++-- src/lang/serbian.txt | 2 + src/lang/simplified_chinese.txt | 2 + src/lang/slovak.txt | 2 + src/lang/slovenian.txt | 2 + src/lang/spanish.txt | 2 + src/lang/spanish_MX.txt | 2 + src/lang/swedish.txt | 2 + src/lang/tamil.txt | 2 + src/lang/thai.txt | 2 + src/lang/traditional_chinese.txt | 2 + src/lang/turkish.txt | 2 + src/lang/ukrainian.txt | 2 + src/lang/urdu.txt | 2 + src/lang/vietnamese.txt | 2 + src/lang/welsh.txt | 2 + 64 files changed, 223 insertions(+), 67 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 7603109ec3..bd36859ea5 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2432,6 +2432,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}versadig STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}oorlaai +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Dekking area verlig STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Af diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 2327acbd9c..b7ed188074 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2202,6 +2202,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}عادي الاستخدام STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}زائد الاستخدام +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}وضح منطقة التغطية STR_STATION_BUILD_COVERAGE_OFF :{BLACK}غلق diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 275f9dde3d..292cdcc0a7 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -2299,6 +2299,8 @@ STR_LINKGRAPH_LEGEND_NONE :{BLACK}Bat ere STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLACK}erabiltzeke STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturatua +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Geltoki irismena erakutsi STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Itzali diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 626f1b4d03..8c7298b2c1 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -2779,6 +2779,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}насычана STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}перагруз +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Падсьветка зоны пакрыцьця STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Выкл. diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index c2c01a974d..59eb341e50 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturado STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}sobrecarregado +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Destacar cobertura STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Desativar diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 0c2c1a61d8..4b2ff7044e 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2348,6 +2348,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}наситен STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}претоварен +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Маркиране на Отбелязаната зона STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Изключен diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 7aeaef87bd..80ee25aabc 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{G=Masculin}{TI STR_LINKGRAPH_LEGEND_SATURATED :{G=Masculin}{TINY_FONT}{BLACK}saturat STR_LINKGRAPH_LEGEND_OVERLOADED :{G=Masculin}{TINY_FONT}{BLACK}sobrecarregat +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Marca l'àrea de cobertura STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Inactiu diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index ba71162302..6fb89a8752 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -1056,6 +1056,8 @@ STR_CONTENT_DETAIL_VERSION :{SILVER}Вер # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) # Join station window diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 32c4c74ac2..d641ef2b65 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2576,6 +2576,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}zasićen STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}prekrcan +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Označavanje područja pokrivanja STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Isključeno diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 24df1b1ef8..87e80aba79 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2704,6 +2704,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}nasycený STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}přetížení +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Zvýraznění oblasti pokrytí STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Vypnuto diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 002463ff81..c22730b862 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2609,6 +2609,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}mættet STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overbelastet +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Vis dækningsområde STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Fra diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 8960d58e15..494ab372fb 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}Verzadigd STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}Overbelast +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Dekkingsgebied markeren STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Uit diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index ef8039ea6e..08abb07bd2 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturated STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overloaded +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Coverage area highlight STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index b5a6f94de3..02f7d24c81 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturated STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overloaded +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Coverage area highlight STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index ad8ac313d1..4ef2385e62 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2021,6 +2021,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Baskulig # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Ŝarĝregiona marko STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Malaktiva diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index f5cf7bcee7..49639728c7 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2615,6 +2615,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}küllastunud STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}ülekoormatud +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Mõjupiirkonna näitamine STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Väljas diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index b65863312e..972fde61e5 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -2202,6 +2202,8 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ger luti # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Hálýsing av deknings øki STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Sløkt diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index eb90dd50d6..c80d543f4e 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}sopiva STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}kuormittunut +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Vaikutusalueen korostus STR_STATION_BUILD_COVERAGE_OFF :{BLACK}pois diff --git a/src/lang/french.txt b/src/lang/french.txt index 3eee4a4165..2742b5c4cd 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturé STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}surchargé +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Afficher la zone couverte STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Désactivé diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 1ea6d447ae..b25cf7958c 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -255,7 +255,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Ferburge STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN_TOOLTIP :{BLACK}Mei it ynskeakelje fan dizze knop wurde ek ferburgen treinen toand STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE_TOOLTIP :{BLACK}Mei it ynskeakelje fan dizze knop wurde ek ferburgen weinen toand STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP :{BLACK}Mei it ynskeakelje fan dizze knop wurde ek ferburgen skepen toand -STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Mei it ynskeakelje fan dizze knop wurde ek ferburgen fleantúgen toand +STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Mei it ynskeakelje fan dizze knop wurde ek ferburgen fleantugen toand # Query window STR_BUTTON_DEFAULT :{BLACK}Standert @@ -319,7 +319,7 @@ STR_SORT_BY_RATING :Rang STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Spul skoftsjen STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Tiid hurder rinne litte STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opsjes -STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Opslaan, ferlitte, ôfslúte +STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Opslaan, ferlitte, ôfslute STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Kaar sjen litte, ekstra finster of buordlist STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Lit in list fan alle stêden sjen STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Lit Subsydzjes sjen @@ -334,7 +334,7 @@ STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Betelje STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Lit in list sjen fan de treinen fan dit bedriuw. Ctrl + klik ipent of slût de groep/reau list STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Lit in list sjen fan de auto's fan dit bedriuw. Ctrl + Klik ipent of slût de groep/reau list STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Lit in list sjen fan de skepen fan dit bedriuw. Ctrl + Klik ipent of slût de groep/reau list -STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Lit in list sjen fan de fleantúgen fan dit bedriuw. Ctrl+Klik skeakelt tusken de list groep/reau +STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Lit in list sjen fan de fleantugen fan dit bedriuw. Ctrl+Klik skeakelt tusken de list groep/reau STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}Ynzoome STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}ûtzoome STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Bou spoarwegen @@ -396,7 +396,7 @@ STR_FILE_MENU_SAVE_GAME :Spul opslaan STR_FILE_MENU_LOAD_GAME :Spul lade STR_FILE_MENU_QUIT_GAME :Spul ferlitte STR_FILE_MENU_SEPARATOR : -STR_FILE_MENU_EXIT :Ofslute +STR_FILE_MENU_EXIT :Ôfslute # Map menu ###length 4 @@ -477,6 +477,7 @@ STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Skeakel console oan/ût STR_ABOUT_MENU_AI_DEBUG :AI/Gamescript debug STR_ABOUT_MENU_SCREENSHOT :Skermôfbylding +STR_ABOUT_MENU_SHOW_FRAMERATE :Byldsnelhyd sjen litte STR_ABOUT_MENU_ABOUT_OPENTTD :Oer 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Flakken rjochtsje STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Skeakel seleksjekaders oan/út @@ -971,7 +972,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Selektea STR_GAME_OPTIONS_FULLSCREEN :{BLACK}Folslein skerm STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Finkje dit fakje oan om OpenTTD te boartsje yn in folslein skerm -STR_GAME_OPTIONS_RESOLUTION :{BLACK}Skermresolusje +STR_GAME_OPTIONS_RESOLUTION :{BLACK}Skermresolúsje STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Selektearje de skermresolutje om te brûken STR_GAME_OPTIONS_RESOLUTION_OTHER :oars @@ -980,13 +981,20 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :oars STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Interfacegrutte +STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_AUTO :(automatysk) STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Normaal STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Dûbele grutte STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Fjouwerdûbele grutte +STR_GAME_OPTIONS_FONT_ZOOM :{BLACK}Lettergrutte +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_AUTO :(automatysk) +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL :Normaal +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM :Dûbele grutte +STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM :Fjouwerdûbele grutte +STR_GAME_OPTIONS_REFRESH_RATE :{BLACK}Byldferfaskingssnelheid STR_GAME_OPTIONS_BASE_GRF :{BLACK}Basisset for ôfbyldings STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}Selektearje de basis ôfbyldingsset om te brûken @@ -1139,7 +1147,7 @@ STR_CONFIG_SETTING_ON :Oan STR_CONFIG_SETTING_DISABLED :Utskeakele ###length 3 -STR_CONFIG_SETTING_COMPANIES_OFF :Ut +STR_CONFIG_SETTING_COMPANIES_OFF :Út STR_CONFIG_SETTING_COMPANIES_OWN :Eigen bedriuw STR_CONFIG_SETTING_COMPANIES_ALL :Alle bedriuwen @@ -1600,7 +1608,7 @@ STR_CONFIG_SETTING_SERVINT_TRAINS :Standert repara STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT :Stel it standert reparaasjeskema yn foar nije treinen dy't gjin eigen reparaasjeskema kenne STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES :Standert reparaasjeskema foar weinen: {STRING} STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT :Stel it standert reparaasjeskema yn foar nije weinen dy't gjin eigen reparaasjeskema kenne -STR_CONFIG_SETTING_SERVINT_AIRCRAFT :Standert reparaasjeskema foar fleantúgen: {STRING} +STR_CONFIG_SETTING_SERVINT_AIRCRAFT :Standert reparaasjeskema foar fleantugen: {STRING} STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT :Stel it standert reparaasjeskema yn foar nije fleantugen dy't gjin eigen reparaasjeskema kenne STR_CONFIG_SETTING_SERVINT_SHIPS :Standerd reparaasjeskema foar skippen: {STRING} STR_CONFIG_SETTING_SERVINT_SHIPS_HELPTEXT :Stel it standerd reparaasjeskema yn foar nije skippen dy't gjin eigen reparaasjeskema kenne @@ -1834,6 +1842,7 @@ STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}yndustr STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Frachtdistribusje STR_CONFIG_SETTING_AI :{ORANGE}Tsjinstânners STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computer spilers +STR_CONFIG_SETTING_NETWORK :{ORANGE}Netwurk STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pathfinder foar treinen: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :Pathfinder foar auto's: {STRING} @@ -1871,7 +1880,7 @@ STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Ynstelli STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF ynstellings STR_INTRO_ONLINE_CONTENT :{BLACK}Sikje online ynhâld STR_INTRO_SCRIPT_SETTINGS :{BLACK}AI/Spulskriptynstellings -STR_INTRO_QUIT :{BLACK}Ôfslúte +STR_INTRO_QUIT :{BLACK}Ôfslute STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}Begjin in nei spul. Ctrl + klik slaat kaartynstelling oer STR_INTRO_TOOLTIP_LOAD_GAME :{BLACK}Laad in opslein spul @@ -1895,7 +1904,8 @@ STR_INTRO_TOOLTIP_QUIT :{BLACK}Slút 'O # Quit window -STR_QUIT_CAPTION :{WHITE}Ôfslúte +STR_QUIT_CAPTION :{WHITE}Ôfslute +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Witte jo seker dat jo dit spul ôfslute wolle? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nee @@ -1911,7 +1921,7 @@ STR_CHEAT_MONEY :{LTBLUE}Stoart STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Spielje as bedriuw: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Gigantyske sloopmodus: {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnels Meie inoar krúse: {ORANGE}{STRING} -STR_CHEAT_NO_JETCRASH :{LTBLUE}Grutte fleantúgen stoarte net faak del op lytse fleanfjilden: {ORANGE}{STRING} +STR_CHEAT_NO_JETCRASH :{LTBLUE}Grutte fleantugen stoarte net faak del op lytse fleanfjilden: {ORANGE}{STRING} STR_CHEAT_EDIT_MAX_HL :{LTBLUE}Feroarje de maksimale kaarthichte: {ORANGE}{NUM} STR_CHEAT_CHANGE_DATE :{LTBLUE}Veroarje tiidstip: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Wizigje dit jier @@ -1929,7 +1939,7 @@ STR_LIVERY_GENERAL_TOOLTIP :{BLACK}Lit gewo STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Lit kleurskema sjen fan treinen STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Lit kleurskema sjen fan bussen en frachtauto's STR_LIVERY_SHIP_TOOLTIP :{BLACK}Lit kleurskema sjen fan skippen -STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Lit kleurskema sjen fan fleantúgen +STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Lit kleurskema sjen fan fleantugen STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Kies de haadkleur foar it selektearre kleurskema. Ctrl+Klik stelt dizze kleur foar alle skema's yn. STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Kies de twadde kleur fan it selektearre kleurskema. Ctrl+Klik stelt dizze kleur yn foar alle skema's @@ -1952,8 +1962,8 @@ STR_LIVERY_TRUCK :Frachtauto STR_LIVERY_PASSENGER_SHIP :Fearboat STR_LIVERY_FREIGHT_SHIP :Frachtskip STR_LIVERY_HELICOPTER :Wjukkelmasjiene -STR_LIVERY_SMALL_PLANE :Lyts fleantúg -STR_LIVERY_LARGE_PLANE :Grut fleantúg +STR_LIVERY_SMALL_PLANE :Lyts fleantúch +STR_LIVERY_LARGE_PLANE :Grut fleantúch STR_LIVERY_PASSENGER_TRAM :Passazjier Tram STR_LIVERY_FREIGHT_TRAM :Fracht Tram @@ -2025,28 +2035,30 @@ STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION :{BLACK}Lângrut STR_NETWORK_SERVER_LIST_DATE_CAPTION :{BLACK}Datum STR_NETWORK_SERVER_LIST_YEARS_CAPTION :{BLACK}Jieren +STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT :{BLACK}Klik in spul út de list om it te selektearjen STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER :{BLACK}Server wert dast it lêst op spiele hast -STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST :{BLACK}Klik om tsjinner wert dast it lêst op spiele hast te selektearje +STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST :{BLACK}Klik om server wert dast it lêst op spiele hast te selektearje STR_NETWORK_SERVER_LIST_GAME_INFO :{SILVER}Spul INFO STR_NETWORK_SERVER_LIST_CLIENTS :{SILVER}Kliïnten: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA} STR_NETWORK_SERVER_LIST_LANDSCAPE :{SILVER}Lânskip: {WHITE}{STRING} STR_NETWORK_SERVER_LIST_MAP_SIZE :{SILVER}Lângrutte: {WHITE}{COMMA}x{COMMA} -STR_NETWORK_SERVER_LIST_SERVER_VERSION :{SILVER}Tsjinnerferzje: {WHITE}{STRING} -STR_NETWORK_SERVER_LIST_SERVER_ADDRESS :{SILVER}Tsjinneradres: {WHITE}{STRING} +STR_NETWORK_SERVER_LIST_SERVER_VERSION :{SILVER}Serverferzje: {WHITE}{STRING} +STR_NETWORK_SERVER_LIST_SERVER_ADDRESS :{SILVER}Serveradres: {WHITE}{STRING} STR_NETWORK_SERVER_LIST_START_DATE :{SILVER}Start datum: {WHITE}{DATE_SHORT} STR_NETWORK_SERVER_LIST_PASSWORD :{BLACK}Mei wachtwurd beskerme! STR_NETWORK_SERVER_LIST_SERVER_OFFLINE :{SILVER}SERVER NET BESKIKBER -STR_NETWORK_SERVER_LIST_SERVER_FULL :{SILVER}SERVER VOL +STR_NETWORK_SERVER_LIST_SERVER_FULL :{SILVER}SERVER FOL STR_NETWORK_SERVER_LIST_VERSION_MISMATCH :{SILVER}FERKEARDE FERZJE STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}FERKEARDE NEWGRF STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Meidwaan mei spul -STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Laad tsjinner ynfo opnij +STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Server ferfarskje +STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Serverynfo ferfarskje -STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Tsjinner tafoegje -STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tsjinner -STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP :{BLACK}Start dien eigen tsjinner +STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Server tafoegje +STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server +STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP :{BLACK}Start dien eigen server STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE :{BLACK}Fier dyn namme in @@ -2082,13 +2094,15 @@ STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Bedriuws STR_NETWORK_CONNECTION_DISCONNECT :{BLACK}Ferbining ferbrekke -STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Tsjinner is beskerme. Fier wachtwurd yn +STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server is beskerme. Fier wachtwurd yn STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Bedriuw is beskerme. Fier wachtwurd yn # Network company list added strings STR_NETWORK_COMPANY_LIST_CLIENT_LIST :{WHITE}Client lyst # Network client list +STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP :{BLACK}Dit bisto sels +STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}{NUM} klïïnt{P "" en} / {NUM} bedriuw{P "" en} # Matches ConnectionType ###length 5 @@ -2126,10 +2140,10 @@ STR_NETWORK_ERROR_NEWGRF_MISMATCH :{WHITE}Koe gjin STR_NETWORK_ERROR_DESYNC :{WHITE}Koe net synchronisearje mei netwurkspul STR_NETWORK_ERROR_LOSTCONNECTION :{WHITE}Networkspul ferbining kwyt STR_NETWORK_ERROR_SAVEGAMEERROR :{WHITE}Koe opslein spul net laden -STR_NETWORK_ERROR_SERVER_START :{WHITE}Koe de tsjinner net starte +STR_NETWORK_ERROR_SERVER_START :{WHITE}Koe de server net starte STR_NETWORK_ERROR_SERVER_ERROR :{WHITE}In protokol flater is opmurken en de ferbining is sletten STR_NETWORK_ERROR_WRONG_PASSWORD :{WHITE}Ferkeard wachtwurd -STR_NETWORK_ERROR_SERVER_FULL :{WHITE}De tsjinner is vol +STR_NETWORK_ERROR_SERVER_FULL :{WHITE}De server is fol STR_NETWORK_ERROR_CHEATER :Falsk spielje net tastien op disse server STR_NETWORK_ERROR_TOO_MANY_COMMANDS :{WHITE}Do stjoerst tevolle opdrachten ny de server @@ -2151,6 +2165,7 @@ STR_NETWORK_ERROR_CLIENT_CHEATER :besocht falsk t STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS :joech tevolle opdrachten STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP :kaart delheljen duorret te lang STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN :kaart ferwurkje duorret te lang +STR_NETWORK_ERROR_CLIENT_INVALID_CLIENT_NAME :ûnjildige namme # Network related errors STR_NETWORK_SERVER_MESSAGE :*** {1:STRING} @@ -2167,7 +2182,7 @@ STR_NETWORK_MESSAGE_CLIENT_JOINED_ID :*** {STRING} de STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} is in neie taskôger STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} hat it spul ferlitten ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} hat syn/har namme oanpast nei {STRING} -STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Tsjinner hat de ferbining sluten +STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Server hat de ferbyning slúten # Content downloading window @@ -2212,7 +2227,7 @@ STR_CONTENT_DOWNLOAD_COMPLETE :{WHITE}Delhelje STR_CONTENT_DOWNLOAD_PROGRESS_SIZE :{WHITE}{BYTES} fan {BYTES} delhelle ({NUM} %) # Content downloading error messages -STR_CONTENT_ERROR_COULD_NOT_CONNECT :{WHITE}Koe gjin ferbyning mei ynhâldtsjinner meitsje... +STR_CONTENT_ERROR_COULD_NOT_CONNECT :{WHITE}Koe gjin ferbyning mei ynhâldserver meitsje... STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD :{WHITE}Delheljen net slagge... STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... bestân koe net opslein wurde STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Kin it delhelle bestân net útpakke @@ -2238,6 +2253,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}fersêde STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}oerbeladen +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ut STR_STATION_BUILD_COVERAGE_ON :{BLACK}Oan @@ -2332,6 +2349,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL :{BLACK}Bou in t STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD :{BLACK}Wikselje tusken bou en fuortheljen fan dyken STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Wikselje tusken bou en fuortheljen fan tramwei +STR_ROAD_NAME_ROAD :Wei # Road depot construction window STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION :{WHITE}Autodepot rjochting @@ -3070,7 +3088,7 @@ STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Konstruks STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nije faartúchen STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trein Ûnderhâldskosten STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Lânfartugen ûnderhâldskosten -STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Fleantúg Ûnderhâldskosten +STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Fleantúch Ûnderhâldskosten STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Skip Ûnderhâldskosten STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Rinte fan Liening STR_FINANCES_SECTION_OTHER :{GOLD}Oaren @@ -3147,6 +3165,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL :{WHITE}{CURRENC STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Yndustryen STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Gjin - STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY} +STR_INDUSTRY_DIRECTORY_FILTER_NONE :Gjin # Industry view STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY} @@ -3171,13 +3190,13 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Treinen - klik op trein foar ynformaasje STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Weinen - klik op wein foar ynformaasje STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Skepen - klik op skip foar ynformaasje -STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Fleantúgen - klik op fleantúch foar ynformaasje +STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Fleantugen - klik op fleantúch foar ynformaasje ###length VEHICLE_TYPES STR_VEHICLE_LIST_AVAILABLE_TRAINS :Beskikbere Treinen STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Beskikbere Weinen STR_VEHICLE_LIST_AVAILABLE_SHIPS :Beskikbere Skepen -STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Beskikbere Fleantúgen +STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Beskikbere Fleantugen STR_VEHICLE_LIST_REPLACE_VEHICLES :Fiertugen ferfange STR_VEHICLE_LIST_SEND_FOR_SERVICING :Stjoer foar ûnderhâldsbeurt @@ -3201,6 +3220,7 @@ STR_GROUP_ALL_AIRCRAFTS :Alle fleantugen ###length VEHICLE_TYPES STR_GROUP_DEFAULT_SHIPS :Net groepearre skepen +STR_GROUP_COUNT_WITH_SUBGROUP :{TINY_FONT}{COMMA} (+{COMMA}) STR_GROUP_CREATE_TOOLTIP :{BLACK}Klik om in groep oan te meitsje STR_GROUP_DELETE_TOOLTIP :{BLACK}Smit de selektearre groep fuort @@ -3242,6 +3262,7 @@ STR_PURCHASE_INFO_ALL_TYPES :Alle frachttype STR_PURCHASE_INFO_ALL_BUT :Alles útsein {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. Lûkkrêft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Berik: {GOLD}{COMMA} flakken +STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Fleantúch type: {GOLD}{STRING} ###length VEHICLE_TYPES @@ -3249,15 +3270,15 @@ STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Berik: { STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Keapje auto STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Keapje auto STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Keapje boat -STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Keapje fleantúg +STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Keapje fleantúch ###length VEHICLE_TYPES ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte trein -STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte auto -STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte boat -STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte fleantúg +STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte auto. Shift+Klik toant ferwachte kosten sûnder te keapje +STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte boat. Shift+Klik toant ferwachte kosten sûnder te keapje +STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte fleantúch. Shift+Klik toant ferwachte kosten sûnder te keapje ###length VEHICLE_TYPES @@ -3268,10 +3289,10 @@ STR_BUY_VEHICLE_SHIP_RENAME_BUTTON :{BLACK}Jow in n STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Jow in nije namme ###length VEHICLE_TYPES -STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Jow trein in nije namme -STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP :{BLACK}Jow auto in nije namme -STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Jow boat type in nije namme -STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Fleantúch type in nije nammer jaan +STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Treintype neame +STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP :{BLACK}Autotype neame +STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Boattype neame +STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Fleantúchtype neame ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON :{BLACK}Ferbergje @@ -3292,8 +3313,9 @@ STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Wikselje STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Wikselje tusken it ferbergje/sjen litte fan it soart fleanmasine ###length VEHICLE_TYPES -STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Jou treinmodel in oare namme -STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Fleantúch type in nije namme jaan +STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Treintype neame +STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}Jou fiertug in nije namme +STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Fleantúchtype neame # Depot window STR_DEPOT_CAPTION :{WHITE}{DEPOT} @@ -3310,10 +3332,10 @@ STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Weinen - STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Skepen - Brûk rjochter mûsklik op it skip foar ynformaasje ###length VEHICLE_TYPES -STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}tôgje trein hjirhinne om it te ferkeapjen. -STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}tôgje wein hjirhinne om it te ferkeapjen. +STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Tôgje trein hjirhinne om it te ferkeapjen +STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}Tôgje wein hjirhinne om it te ferkeapjen STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Tôgje skip hjirhinne om it te ferkeapjen -STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}tôgje fleantúg hjirhinne om it te ferkeapjen. +STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Tôgje fleantúch hjirhinne om it te ferkeapjen ###length VEHICLE_TYPES STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP :{BLACK}Ferkeapje alle treinen yn dit depot @@ -3322,7 +3344,7 @@ STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP :{BLACK}Ferkeapj ###length VEHICLE_TYPES STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP :{BLACK}Ferfang automatysk skippen yn de skipmakkerij -STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP :{BLACK}Ferfang automatysk alle fleantúgen yn disse fleantúchhangaar +STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP :{BLACK}Ferfang automatysk alle fleantugen yn disse fleantúchhangaar ###length VEHICLE_TYPES STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nije fiertugen @@ -3346,7 +3368,7 @@ STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Nij flea ###length VEHICLE_TYPES STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP :{BLACK}Klik om alle treinen yn dit depot te stopjen STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP :{BLACK}Klik om alle weinen yn dizze garaazje te stopjen -STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP :{BLACK}Klik om alle fleantugen yn dizze hangar te stopje +STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP :{BLACK}Klik om alle fleantugen yn dizze hangaar te stopje ###length VEHICLE_TYPES STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP :{BLACK}Klik om alle skepen te starte @@ -3400,10 +3422,10 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE ###length VEHICLE_TYPES ###length VEHICLE_TYPES -STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer trein nei depot. Brûk Ctrl+Klik om allinich ûnderhâld te jaan -STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer wein nei garaazje. Brûk Ctrl+Klik om allinich ûnderhâld te jaan -STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer skip nij skipmakkerij. Brûk Ctrl+klik om skip ûnderhâld te jaan -STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer fleantúch nei hanger. Brûk Ctrl+klik om allinich ûnderhald te jaan +STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer trein nei depot. Ctrl+Klik om allinich ûnderhâld te jaan +STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer wein nei garaazje. Ctrl+Klik om allinich ûnderhâld te jaan +STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer skip nij skipmakkerij. Ctrl+klik om skip ûnderhâld te jaan +STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer fleantúch nei hangaer. Ctrl+klik om allinich ûnderhald te jaan ###length VEHICLE_TYPES @@ -3428,6 +3450,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Fleantú # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laden / Losse STR_VEHICLE_STATUS_LEAVING :{LTBLUE}fuortsette +STR_VEHICLE_STATUS_CRASHED :{RED}Ferûngelokke! STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Stikken STR_VEHICLE_STATUS_STOPPED :{RED}Stoppe STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL :{RED}Stoppet, {VELOCITY} @@ -3576,6 +3599,7 @@ STR_ORDER_CONDITIONAL_RELIABILITY :Betrouberens STR_ORDER_CONDITIONAL_MAX_SPEED :Maksimale snelheid STR_ORDER_CONDITIONAL_AGE :âlderdom (yn jierren) STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Altyd +STR_ORDER_CONDITIONAL_MAX_RELIABILITY :Maksimale betrouberheid ###next-name-looks-similar STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :is net wier @@ -3716,7 +3740,7 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Lit debu STR_AI_GAME_SCRIPT :{BLACK}Spulskript STR_ERROR_AI_NO_AI_FOUND :Gjin geskikte kompjûterspiler fûn.{}Disse kompjûterspiler is in dummy en docht neat.{}Jo kinne kompjûterspilers delhelje fan 'Online Inhâld' ôf. -STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}AI/Spulskript debugskerm is allinich beskikber foar de tsjinner +STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}AI/Spulskript debugskerm is allinich beskikber foar de server # AI configuration window STR_AI_CONFIG_CAPTION :{WHITE}AI/Spulskript konfiguraasje @@ -4086,55 +4110,55 @@ STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}Kin diel STR_ERROR_TRAIN_IN_THE_WAY :{WHITE}Trein yn it paad STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Auto yn it paad STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Skip yn it paad -STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Fleantúg yn it paad +STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Fleantúch yn it paad ###length VEHICLE_TYPES STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Trein is net beskikber STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}Wein is net beskikber STR_ERROR_SHIP_NOT_AVAILABLE :{WHITE}Skip is net beskikber -STR_ERROR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Fleantúg is net beskikber +STR_ERROR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Fleantúch is net beskikber ###length VEHICLE_TYPES STR_ERROR_CAN_T_REFIT_TRAIN :{WHITE}Kin trein net werútrisse STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE :{WHITE}Kin auto net ombouwe STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}Kin skip net oanpasse -STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}kin fleantúg net veroarje +STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}Kin fleantúch net ombouwe ###length VEHICLE_TYPES STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Kin trein net neamje... STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Kin auto net neamje... STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Kin skip net neamje... -STR_ERROR_CAN_T_RENAME_AIRCRAFT :{WHITE}Kin fleantúg net neamje... +STR_ERROR_CAN_T_RENAME_AIRCRAFT :{WHITE}Kin fleantúch net neame... ###length VEHICLE_TYPES STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Kin trein net stoppe/starte... STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE :{WHITE}Kin wein net stoppe/starte... STR_ERROR_CAN_T_STOP_START_SHIP :{WHITE}Kin skip net stoppe/starte... -STR_ERROR_CAN_T_STOP_START_AIRCRAFT :{WHITE}Kin fleantúg net stoppe/starte... +STR_ERROR_CAN_T_STOP_START_AIRCRAFT :{WHITE}Kin fleantúch net stoppe/starte... ###length VEHICLE_TYPES STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Kin trein net nei depot stjoere... STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT :{WHITE}Kin wein net nei depot stjoere... STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Kin skip net nei depot stjoere... -STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kin fleantúg net nei hangar stjoere... +STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kin fleantúch net nei hangaar stjoere... ###length VEHICLE_TYPES STR_ERROR_CAN_T_BUY_TRAIN :{WHITE}Kin gjin trein keapje... STR_ERROR_CAN_T_BUY_ROAD_VEHICLE :{WHITE}Kin gjin auto keapje... STR_ERROR_CAN_T_BUY_SHIP :{WHITE}Kin gjin boat keapje... -STR_ERROR_CAN_T_BUY_AIRCRAFT :{WHITE}Kin gjin fleantúg keapje... +STR_ERROR_CAN_T_BUY_AIRCRAFT :{WHITE}Kin gjin fleantúch keapje... ###length VEHICLE_TYPES STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Kin trein type gjin nije namme joan... STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Kin wein type gjin nije namme jaan... STR_ERROR_CAN_T_RENAME_SHIP_TYPE :{WHITE}Kin skiptype gjin nije namme jaan... -STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE :{WHITE}Kin fleantúgtype gjin nije namme jaan... +STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE :{WHITE}Kin fleantúchtype net neame... ###length VEHICLE_TYPES STR_ERROR_CAN_T_SELL_TRAIN :{WHITE}Kin trein net ferkeapje... STR_ERROR_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Kin wein net ferkeapje... STR_ERROR_CAN_T_SELL_SHIP :{WHITE}Kin skip net ferkeapje... -STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Kin fleantúg net ferkeapje... +STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Kin fleantúch net ferkeapje... STR_ERROR_TOO_MANY_VEHICLES_IN_GAME :{WHITE}Te folle fartugen yn it spul STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Kin tiid tusken ûnderhâldsbeurten net feroarje... @@ -4153,7 +4177,7 @@ STR_ERROR_TRAIN_START_NO_POWER :Trein hat gjin STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN :{WHITE}Wein kin net omkeare -STR_ERROR_AIRCRAFT_IS_IN_FLIGHT :{WHITE}Fleantúg is oan it fleanen +STR_ERROR_AIRCRAFT_IS_IN_FLIGHT :{WHITE}Fleantúch is oan it fleanen # Order related errors STR_ERROR_NO_MORE_SPACE_FOR_ORDERS :{WHITE}Gjin romte mear foar opdrachten @@ -4285,7 +4309,7 @@ STR_SV_UNNAMED :Net neamt STR_SV_TRAIN_NAME :Trein {COMMA} STR_SV_ROAD_VEHICLE_NAME :Lânfartúg {COMMA} STR_SV_SHIP_NAME :Skip {COMMA} -STR_SV_AIRCRAFT_NAME :Fleantúg {COMMA} +STR_SV_AIRCRAFT_NAME :Fleantúch {COMMA} ###length 27 STR_SV_STNAME :{STRING} diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 9aa134f5b8..317e94ee24 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -2595,6 +2595,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}sàsaichte STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}cus dheth +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Seall raon-còmhdachaidh STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Air diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 6ee5c53389..72eeed2545 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturado STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}exceso de carga +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Resaltar área de cobertura STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off diff --git a/src/lang/german.txt b/src/lang/german.txt index 730450e8d0..0cff318dd7 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}ausgeglichen STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}überlastet +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Einzugsgebiet anzeigen STR_STATION_BUILD_COVERAGE_OFF :{BLACK}aus diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 4dcbad8d95..857d54b14e 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -2716,6 +2716,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}κορεσμένο STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}υπερφορτωμένο +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Κάλυψη περιοχής STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ανενεργό diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 50fd813149..a0b8ab9448 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -2409,6 +2409,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}רווי STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}העמסת יתר +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}הדגשת שטח הכיסוי STR_STATION_BUILD_COVERAGE_OFF :{BLACK}מופסק diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index 481dddf7a5..d444beeafb 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -731,6 +731,8 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD :{WHITE}डा # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) # Join station window diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 58e3d5e133..a69ee72603 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2681,6 +2681,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}telített STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}túlterhelt +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Lefedett terület mutatása: STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ki diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 651e04f841..135c5a5cfe 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2241,6 +2241,8 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Gera hlu # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Svæði sem tilheyrir stöð STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Fela diff --git a/src/lang/ido.txt b/src/lang/ido.txt index e908950a9a..6e6053e23e 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -906,6 +906,8 @@ STR_NETWORK_SERVER_MESSAGE :*** {1:STRING} # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceptas: {GOLD}{CARGO_LIST} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 6911721483..86161e125d 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}sudah penuh (jenuh) STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}kelebihan beban +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Jangkauan layanan STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Non-aktifkan diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 4b155192bb..017773040a 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -2602,6 +2602,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}ar maos STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}thar acmhainn +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Aibhsigh an limistéar clúdaigh STR_STATION_BUILD_COVERAGE_OFF :{BLACK}As diff --git a/src/lang/italian.txt b/src/lang/italian.txt index ca331dec9f..a9e432ddf5 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2654,6 +2654,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}satura STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}sovraccarica +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Evidenzia area coperta STR_STATION_BUILD_COVERAGE_OFF :{BLACK}No diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 2dd59078af..1f378b63e4 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2609,6 +2609,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}適正 STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}供給過多 +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}集荷範囲のハイライト STR_STATION_BUILD_COVERAGE_OFF :{BLACK}切 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 9a7c2864d8..186c0f0593 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}포화 STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}과포화 +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}역세권 표시 STR_STATION_BUILD_COVERAGE_OFF :{BLACK}끄기 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index dad114551e..b457008dba 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -2613,6 +2613,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}satur STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}superoneratus +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Regio Acceptionis STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Celata diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index bcfd9b6faa..29d8846151 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -2621,6 +2621,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}piesātināts STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}pārslogots +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Pārklājuma iezīmēšana STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Nav diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index d21eea3772..6dca3fc2b0 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2766,6 +2766,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}optimalus STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}perkrautas +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Rodyti aptarnaujamą teritoriją? STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ne diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 60004448dc..d9210eb1d1 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -2606,6 +2606,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}gesättegt STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}iwwerlaascht +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Reechwäit markéieren STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Aus diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index 81170c64f3..587c193974 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -1272,6 +1272,8 @@ STR_CONTENT_TYPE_GS_LIBRARY :ГШ библи # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Прифаќа: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Залихи: {GOLD}{CARGO_LIST} diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 06abb0f908..48b7e2542b 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -2140,6 +2140,8 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ghaibkan # Linkgraph legend window and linkgraph legend in smallmap STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}tepu +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Serlahan kawasan liputan STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Tiada diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index b35a4a8177..4b8a2ae1eb 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -835,6 +835,8 @@ STR_NETWORK_SERVER_MESSAGE :*** {1:STRING} # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) # Join station window diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index 83dd12a1b1..74a71475be 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -1201,6 +1201,8 @@ STR_NETWORK_SERVER_MESSAGE :*** {1:STRING} # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) # Join station window diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 4850734388..dd303310e3 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2613,6 +2613,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}mettet STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overbelastet +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Markering av dekningsområde STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Av diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index eb2ffbe724..39c587450c 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2309,6 +2309,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}fullt utnytta STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overbelasta +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Syne dekningsområde STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Av diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 21e77d5f13..d872505335 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -2107,6 +2107,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}اشباع شده STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}بیش از ظرفیت +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}نور ناحیه ی اطراف ایستگاه STR_STATION_BUILD_COVERAGE_OFF :{BLACK}خاموش diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 7c5d7d58f5..618126bd16 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2997,6 +2997,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}nasycony STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}przeładowany +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Podświetlaj zasięg STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Wył. diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index eff5172f59..32e35638b3 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2618,6 +2618,11 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturado STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}sobrecarregado +# Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} a ser transportado mensalmente de {STATION} para {STATION} ({COMMA}% da capacidade){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} a ser transportado de volta ({COMMA}% da capacidade) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Tempo médio de viagem: {NUM}{NBSP}dia{P "" s} + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Exibir área de cobertura STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Não diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index ef842db4a2..64b9b7cbd6 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturat STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}supraîncărcat +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Aria de acoperire STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Inactiv diff --git a/src/lang/russian.txt b/src/lang/russian.txt index a7a96a0b1b..54d54d53d2 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -373,7 +373,7 @@ STR_TOOLTIP_RESIZE :{BLACK}Нажм STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Большое/маленькое окно STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Прокрутка вверх/вниз STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Прокрутка влево/вправо -STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Полная очистка прямоугольного участка земли. Ctrl - выбор области по диагонали. При нажатом Shift - оценка стоимости очистки. +STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Полная очистка прямоугольного участка земли.{}При нажатом Ctrl - выбор диагональной области.{}При нажатом Shift - оценка стоимости очистки. # Show engines button ###length VEHICLE_TYPES @@ -504,7 +504,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Стро STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Строительство трамвайных путей STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Посадить деревья. При нажатом Shift - оценка стоимости высадки. STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Поставить метку -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Разместить объект.{}При нажатом Ctrl выбираются клетки по диагонали.{}При нажатом Shift - оценка стоимости строительства. +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Разместить объект.{}При нажатом Ctrl - выбор диагональной области.{}При нажатом Shift - оценка стоимости строительства. # Scenario editor file menu ###length 7 @@ -2780,6 +2780,11 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}загруж. STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}перегруз +# Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} в месяц к перевозке от {STATION} к {STATION} ({COMMA}% ёмкости){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} к возврату ({COMMA}% ёмкости) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Среднее время в пути: {NUM}{NBSP}д{P ень ня ней} + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Подсветка зоны покрытия STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Выкл @@ -2984,14 +2989,14 @@ STR_STATION_BUILD_NOISE :{BLACK}Прои # Landscaping toolbar STR_LANDSCAPING_TOOLBAR :{WHITE}Ландшафт -STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Опустить угол земли. Перетаскивание опускает первый выбранный угол и выравнивает выбранную область до новой высоты угла. Ctrl выбирает область по диагонали. При нажатом Shift - оценка стоимости строительства. -STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Поднять угол земли. Перетаскивание поднимает первый выбранный угол и выравнивает выбранную область до новой высоты угла. Ctrl выбирает область по диагонали. При нажатом Shift - оценка стоимости строительства. -STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Выровнять землю до высоты первого выбранного угла. Ctrl выбирает область по диагонали. При нажатом Shift - оценка стоимости выравнивания. -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Покупка земли.{}При нажатом Ctrl выбираются клетки по диагонали.{}При нажатом Shift - оценка стоимости покупки. +STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Опустить угол земли. Перетаскивание опускает первый выбранный угол и выравнивает выбранную область до новой высоты угла.{}При нажатом Ctrl - выбор диагональной области.{}При нажатом Shift - оценка стоимости строительства. +STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Поднять угол земли. Перетаскивание поднимает первый выбранный угол и выравнивает выбранную область до новой высоты угла.{}При нажатом Ctrl - выбор диагональной области.{}При нажатом Shift - оценка стоимости строительства. +STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Выровнять землю до высоты первого выбранного угла.{}При нажатом Ctrl - выбор диагональной области.{}При нажатом Shift - оценка стоимости выравнивания. +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Покупка земли.{}При нажатом Ctrl - выбор диагональной области.{}При нажатом Shift - оценка стоимости покупки. # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Выбор объекта -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Выберите создаваемый объект.{}При нажатом Ctrl выбираются клетки по диагонали.{}При нажатом Shift - оценка стоимости постройки. +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Выберите создаваемый объект.{}При нажатом Ctrl они размещаются в диагональной области.{}При нажатом Shift - оценка стоимости постройки. STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Выберите класс объекта для строительства STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Предварительный просмотр объекта STR_OBJECT_BUILD_SIZE :{BLACK}Размер: {GOLD}{NUM} × {NUM} клеток diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index b309b58e61..6f1b45a238 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -2801,6 +2801,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}zasićen STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}Preopterećen +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Označavanje zahvaćenog područja STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Isključeno diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index e974bdad57..307413fb39 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}饱和 STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}超载 +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}显示覆盖区域 STR_STATION_BUILD_COVERAGE_OFF :{BLACK}关闭 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 0b06b732f2..62a916dcad 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2677,6 +2677,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}vyťažené STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}preťažené +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Ukázať oblasť pokrytia STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Vyp. diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 249509bdd8..39a1b4f5dc 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2553,6 +2553,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}nasičeno STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}prenasičeno +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Osvetlitev območja zajema STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Izključeno diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 8bdca47f1e..538267a815 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturado STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}sobrecargado +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Mostrar área de cobertura STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Desactivado diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index a242030b81..470299c880 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}saturado STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}sobrecargado +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Mostrar área de recolección STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Desactivado diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index c2931264ee..2139c0e3ab 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}mättad STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}överbelastad +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Markera upptagningsområde STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Av diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 107c45efed..2b266548e4 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -2329,6 +2329,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}நிரம்பிய STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}அளவிற்கு அதிகமாக ஏற்றப்பட்டுள்ளது +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}செயல்படும் பகுதியினை குறிக்கவும் STR_STATION_BUILD_COVERAGE_OFF :{BLACK}நிறுத்து diff --git a/src/lang/thai.txt b/src/lang/thai.txt index f050aa48c5..ac3af355b3 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -2447,6 +2447,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}สมดุล STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}หนาแน่น +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}แสดงพื้นที่ให้บริการ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}ปิด diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index c952d66141..0b6890eb22 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}飽和 STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}超載 +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}顯示運輸涵蓋範圍 STR_STATION_BUILD_COVERAGE_OFF :{BLACK}關 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 39f7f8d586..c6d23d993b 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2618,6 +2618,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}doygun STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}aşırı dolu +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Kapsama alanı STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Kapalı diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 11e3e43e41..bc2233bfd1 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2741,6 +2741,8 @@ STR_LINKGRAPH_LEGEND_OVERLOADED.r :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED.d :{TINY_FONT}{BLACK}перевантаженому STR_LINKGRAPH_LEGEND_OVERLOADED.z :{TINY_FONT}{BLACK}перевантажений +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Підсвічення зони покриття STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Ні diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 9edd2550df..35074cf9a0 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -1989,6 +1989,8 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}چیزو # Linkgraph legend window and linkgraph legend in smallmap +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}کوریج والے علاقے کو واضح کریں STR_STATION_BUILD_COVERAGE_OFF :{BLACK}بند diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index ddbde25e00..4fba1bdc6a 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -2617,6 +2617,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}bão hòa STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}quá tải +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Hiện rõ vùng phủ ảnh hưởng STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Tắt diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 8fd8fb5a98..d6216de83a 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -2395,6 +2395,8 @@ STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}dirlawn STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}gorlwythiedig +# Linkgraph tooltip + # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Amlygu ardal ddylanwad STR_STATION_BUILD_COVERAGE_OFF :{BLACK}I Ffwrdd From 664771d085737f52838c6aa86e0e37bddf9dc47a Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Tue, 19 Oct 2021 12:55:51 -0600 Subject: [PATCH 5/6] Feature: Wide rivers --- src/direction_type.h | 2 + src/landscape.cpp | 193 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 185 insertions(+), 10 deletions(-) diff --git a/src/direction_type.h b/src/direction_type.h index f025d113e7..cb4595f09a 100644 --- a/src/direction_type.h +++ b/src/direction_type.h @@ -102,10 +102,12 @@ template <> struct EnumPropsT : MakeEnumPropsT #include @@ -1071,6 +1072,128 @@ static bool MakeLake(TileIndex tile, void *user_data) return false; } +/** + * Widen a river by expanding into adjacent tiles via circular tile search. + * @param tile The tile to try expanding the river into. + * @param data The tile to try surrounding the river around. + * @return Always false, so it continues searching. + */ +static bool RiverMakeWider(TileIndex tile, void *data) +{ + /* Don't expand into void tiles. */ + if (!IsValidTile(tile)) return false; + + /* If the tile is already sea or river, don't expand. */ + if (IsWaterTile(tile)) return false; + + /* If the tile is at height 0 after terraforming but the ocean hasn't flooded yet, don't build river. */ + if (GetTileMaxZ(tile) == 0) return false; + + TileIndex origin_tile = *(TileIndex *)data;; + Slope cur_slope = GetTileSlope(tile); + Slope desired_slope = GetTileSlope(origin_tile); // Initialize matching the origin tile as a shortcut if no terraforming is needed. + + /* Never flow uphill. */ + if (GetTileMaxZ(tile) > GetTileMaxZ(origin_tile)) return false; + + /* If the new tile can't hold a river tile, try terraforming. */ + if (!IsTileFlat(tile) && !IsInclinedSlope(cur_slope)) { + /* Don't try to terraform steep slopes. */ + if (IsSteepSlope(cur_slope)) return false; + + bool flat_river_found = false; + bool sloped_river_found = false; + + /* There are two common possibilities: + * 1. River flat, adjacent tile has one corner lowered. + * 2. River descending, adjacent tile has either one or three corners raised. + */ + + /* First, determine the desired slope based on adjacent river tiles. This doesn't necessarily match the origin tile for the CircularTileSearch. */ + for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) { + TileIndex other_tile = TileAddByDiagDir(tile, d); + Slope other_slope = GetTileSlope(other_tile); + + /* Only consider river tiles. */ + if (IsWaterTile(other_tile) && IsRiver(other_tile)) { + /* If the adjacent river tile flows downhill, we need to check where we are relative to the slope. */ + if (IsInclinedSlope(other_slope) && GetTileMaxZ(tile) == GetTileMaxZ(other_tile)) { + /* Check for a parallel slope. If we don't find one, we're above or below the slope instead. */ + if (GetInclinedSlopeDirection(other_slope) == ChangeDiagDir(d, DIAGDIRDIFF_90RIGHT) || + GetInclinedSlopeDirection(other_slope) == ChangeDiagDir(d, DIAGDIRDIFF_90LEFT)) { + desired_slope = other_slope; + sloped_river_found = true; + break; + } + } + /* If we find an adjacent river tile, remember it. We'll terraform to match it later if we don't find a slope. */ + if (IsTileFlat(tile)) flat_river_found = true; + } + } + /* We didn't find either an inclined or flat river, so we're climbing the wrong slope. Bail out. */ + if (!sloped_river_found && !flat_river_found) return false; + + /* We didn't find an inclined river, but there is a flat river. */ + if (!sloped_river_found && flat_river_found) desired_slope = SLOPE_FLAT; + + /* Now that we know the desired slope, it's time to terraform! */ + + /* If the river is flat and the adjacent tile has one corner lowered, we want to raise it. */ + if (desired_slope == SLOPE_FLAT && IsSlopeWithThreeCornersRaised(cur_slope)) { + /* Make sure we're not affecting an existing river slope tile. */ + for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) { + TileIndex other_tile = TileAddByDiagDir(tile, d); + if (IsInclinedSlope(GetTileSlope(other_tile)) && IsWaterTile(other_tile)) return false; + } + Command::Do(DC_EXEC | DC_AUTO, tile, ComplementSlope(cur_slope), true); + + /* If the river is descending and the adjacent tile has either one or three corners raised, we want to make it match the slope. */ + } else if (IsInclinedSlope(desired_slope)) { + /* Don't break existing flat river tiles by terraforming under them. */ + DiagDirection river_direction = ReverseDiagDir(GetInclinedSlopeDirection(desired_slope)); + + for (DiagDirDiff d = DIAGDIRDIFF_BEGIN; d < DIAGDIRDIFF_END; d++) { + /* We don't care about downstream or upstream tiles, just the riverbanks. */ + if (d == DIAGDIRDIFF_SAME || d == DIAGDIRDIFF_REVERSE) continue; + + TileIndex other_tile = (TileAddByDiagDir(tile, ChangeDiagDir(river_direction, d))); + if (IsWaterTile(other_tile) && IsRiver(other_tile) && IsTileFlat(other_tile)) return false; + } + + /* Get the corners which are different between the current and desired slope. */ + Slope to_change = cur_slope ^ desired_slope; + + /* Lower unwanted corners first. If only one corner is raised, no corners need lowering. */ + if (!IsSlopeWithOneCornerRaised(cur_slope)) { + to_change = to_change & ComplementSlope(desired_slope); + Command::Do(DC_EXEC | DC_AUTO, tile, to_change, false); + } + + /* Now check the match and raise any corners needed. */ + cur_slope = GetTileSlope(tile); + if (cur_slope != desired_slope && IsSlopeWithOneCornerRaised(cur_slope)) { + to_change = cur_slope ^ desired_slope; + Command::Do(DC_EXEC | DC_AUTO, tile, to_change, true); + } + } + } + /* Update cur_slope after possibly terraforming. */ + cur_slope = GetTileSlope(tile); + + /* If the tile slope matches the desired slope, add a river tile. */ + if (cur_slope == desired_slope) { + MakeRiver(tile, Random()); + + /* Remove desert directly around the river tile. */ + TileIndex cur_tile = tile; + MarkTileDirtyByTile(cur_tile); + CircularTileSearch(&cur_tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr); + } + + /* Always return false to keep searching. */ + return false; +} + /** * Check whether a river at begin could (logically) flow down to end. * @param begin The origin of the flow. @@ -1093,6 +1216,12 @@ static bool FlowsDown(TileIndex begin, TileIndex end) ((slopeEnd == slopeBegin && heightEnd < heightBegin) || slopeEnd == SLOPE_FLAT || slopeBegin == SLOPE_FLAT); } +/** Parameters for river generation to pass as AyStar user data. */ +struct River_UserData { + TileIndex spring; ///< The current spring during river generation. + bool main_river; ///< Whether the current river is a big river that others flow into. +}; + /* AyStar callback for checking whether we reached our destination. */ static int32 River_EndNodeCheck(const AyStar *aystar, const OpenListNode *current) { @@ -1130,7 +1259,11 @@ static void River_GetNeighbours(AyStar *aystar, OpenListNode *current) /* AyStar callback when an route has been found. */ static void River_FoundEndNode(AyStar *aystar, OpenListNode *current) { - for (PathNode *path = ¤t->path; path != nullptr; path = path->parent) { + River_UserData *data = (River_UserData *)aystar->user_data; + + /* First, build the river without worrying about its width. */ + uint cur_pos = 0; + for (PathNode *path = ¤t->path; path != nullptr; path = path->parent, cur_pos++) { TileIndex tile = path->node.tile; if (!IsWaterTile(tile)) { MakeRiver(tile, Random()); @@ -1139,6 +1272,24 @@ static void River_FoundEndNode(AyStar *aystar, OpenListNode *current) CircularTileSearch(&tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr); } } + + /* If the river is a main river, go back along the path to widen it. */ + if (data->main_river) { + const uint long_river_length = _settings_game.game_creation.min_river_length * 4; + uint current_river_length; + uint radius; + + cur_pos = 0; + for (PathNode *path = ¤t->path; path != nullptr; path = path->parent, cur_pos++) { + TileIndex tile = path->node.tile; + + /* Check if we should widen river depending on how far we are away from the source. */ + current_river_length = DistanceManhattan(data->spring, tile); + radius = std::min(3u, (current_river_length / (long_river_length / 3u)) + 1u); + + if (radius > 1) CircularTileSearch(&tile, radius + RandomRange(1), RiverMakeWider, (void *)&path->node.tile); + } + } } static const uint RIVER_HASH_SIZE = 8; ///< The number of bits the hash for river finding should have. @@ -1158,9 +1309,13 @@ static uint River_Hash(uint tile, uint dir) * Actually build the river between the begin and end tiles using AyStar. * @param begin The begin of the river. * @param end The end of the river. + * @param spring The springing point of the river. + * @param main_river Whether the current river is a big river that others flow into. */ -static void BuildRiver(TileIndex begin, TileIndex end) +static void BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool main_river) { + River_UserData user_data = { spring, main_river }; + AyStar finder = {}; finder.CalculateG = River_CalculateG; finder.CalculateH = River_CalculateH; @@ -1168,6 +1323,7 @@ static void BuildRiver(TileIndex begin, TileIndex end) finder.EndNodeCheck = River_EndNodeCheck; finder.FoundEndNode = River_FoundEndNode; finder.user_target = &end; + finder.user_data = &user_data; finder.Init(River_Hash, 1 << RIVER_HASH_SIZE); @@ -1183,15 +1339,19 @@ static void BuildRiver(TileIndex begin, TileIndex end) * Try to flow the river down from a given begin. * @param spring The springing point of the river. * @param begin The begin point we are looking from; somewhere down hill from the spring. - * @return True iff a river could/has been built, otherwise false. + * @param min_river_length The minimum length for the river. + * @return First element: True iff a river could/has been built, otherwise false; second element: River ends at sea. */ -static bool FlowRiver(TileIndex spring, TileIndex begin) +static std::tuple FlowRiver(TileIndex spring, TileIndex begin, uint min_river_length) { # define SET_MARK(x) marks.insert(x) # define IS_MARKED(x) (marks.find(x) != marks.end()) uint height = TileHeight(begin); - if (IsWaterTile(begin)) return DistanceManhattan(spring, begin) > _settings_game.game_creation.min_river_length; + + if (IsWaterTile(begin)) { + return { DistanceManhattan(spring, begin) > min_river_length, GetTileZ(begin) == 0 }; + } std::set marks; SET_MARK(begin); @@ -1223,9 +1383,10 @@ static bool FlowRiver(TileIndex spring, TileIndex begin) } } while (!queue.empty()); + bool main_river = false; if (found) { /* Flow further down hill. */ - found = FlowRiver(spring, end); + std::tie(found, main_river) = FlowRiver(spring, end, min_river_length); } else if (count > 32) { /* Maybe we can make a lake. Find the Nth of the considered tiles. */ TileIndex lakeCenter = 0; @@ -1244,7 +1405,7 @@ static bool FlowRiver(TileIndex spring, TileIndex begin) /* We don't want lakes in the desert. */ (_settings_game.game_creation.landscape != LT_TROPIC || GetTropicZone(lakeCenter) != TROPICZONE_DESERT) && /* We only want a lake if the river is long enough. */ - DistanceManhattan(spring, lakeCenter) > _settings_game.game_creation.min_river_length) { + DistanceManhattan(spring, lakeCenter) > min_river_length) { end = lakeCenter; MakeRiver(lakeCenter, Random()); MarkTileDirtyByTile(lakeCenter); @@ -1261,8 +1422,8 @@ static bool FlowRiver(TileIndex spring, TileIndex begin) } marks.clear(); - if (found) BuildRiver(begin, end); - return found; + if (found) BuildRiver(begin, end, spring, main_river); + return { found, main_river }; } /** @@ -1274,14 +1435,26 @@ static void CreateRivers() if (amount == 0) return; uint wells = ScaleByMapSize(4 << _settings_game.game_creation.amount_of_rivers); + const uint num_short_rivers = wells - std::max(1u, wells / 10); SetGeneratingWorldProgress(GWP_RIVER, wells + 256 / 64); // Include the tile loop calls below. + /* Try to create long rivers. */ + for (; wells > num_short_rivers; wells--) { + IncreaseGeneratingWorldProgress(GWP_RIVER); + for (int tries = 0; tries < 512; tries++) { + TileIndex t = RandomTile(); + if (!CircularTileSearch(&t, 8, FindSpring, nullptr)) continue; + if (std::get<0>(FlowRiver(t, t, _settings_game.game_creation.min_river_length * 4))) break; + } + } + + /* Try to create short rivers. */ for (; wells != 0; wells--) { IncreaseGeneratingWorldProgress(GWP_RIVER); for (int tries = 0; tries < 128; tries++) { TileIndex t = RandomTile(); if (!CircularTileSearch(&t, 8, FindSpring, nullptr)) continue; - if (FlowRiver(t, t)) break; + if (std::get<0>(FlowRiver(t, t, _settings_game.game_creation.min_river_length))) break; } } From 30ff89cac05e23151717e89ba1446a154568c0ec Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 21 Oct 2022 19:00:44 +0000 Subject: [PATCH 6/6] Update: Translations from eints frisian: 33 changes by Bouke spanish (mexican): 10 changes by absay english (us): 4 changes by 2TallTyler korean: 7 changes by telk5093 dutch: 3 changes by Afoklala --- src/lang/dutch.txt | 3 +++ src/lang/english_US.txt | 5 ++++- src/lang/frisian.txt | 34 +++++++++++++++++++++++++++++++++- src/lang/korean.txt | 10 +++++++--- src/lang/spanish_MX.txt | 16 ++++++++++------ 5 files changed, 57 insertions(+), 11 deletions(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 494ab372fb..0bf7d2344f 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2618,6 +2618,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}Overbelast # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} voor retourtransport per maand van {STATION} naar {STATION} ({COMMA}% van capaciteit){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} voor retourtransport ({COMMA}% van capaciteit) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Gemiddelde reistijd: {NUM}{NBSP}dag{P "" en} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Dekkingsgebied markeren diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 02f7d24c81..5ec8d0c2a1 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2618,6 +2618,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overloaded # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} to be transported per month from {STATION} to {STATION} ({COMMA}% of capacity){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} to be transported back ({COMMA}% of capacity) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Average travel time: {NUM}{NBSP}day{P "" s} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Coverage area highlight @@ -2814,7 +2817,7 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Landscap STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Lower a corner of land. Dragging lowers the first selected corner and levels the selected area to the new corner height. Ctrl selects the area diagonally. Shift toggles building/showing cost estimate STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Raise a corner of land. Dragging raises the first selected corner and levels the selected area to the new corner height. Ctrl selects the area diagonally. Shift toggles building/showing cost estimate STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Level an area of land to the height of the first selected corner. Ctrl selects the area diagonally. Shift toggles building/showing cost estimate -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Purchase land for future use. Shift toggles building/showing cost estimate +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Purchase land for future use. Ctrl selects the area diagonally. Shift toggles building/showing cost estimate # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Object Selection diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index b25cf7958c..18eaf218d4 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -311,6 +311,7 @@ STR_SORT_BY_POPULATION :Ynwenners STR_SORT_BY_RATING :Rang # Group by options for vehicle list +STR_GROUP_BY_NONE :Neat # Order button in shared orders vehicle list @@ -924,6 +925,8 @@ STR_GAME_OPTIONS_CURRENCY_ZAR :Súd-Afrikaansk STR_GAME_OPTIONS_CURRENCY_CUSTOM :Oanpasse... STR_GAME_OPTIONS_CURRENCY_GEL :Georgyske Lari (GEL) STR_GAME_OPTIONS_CURRENCY_IRR :Iraanske Rial (IRR) +STR_GAME_OPTIONS_CURRENCY_RUB :Neie Russyske Rubels (RUB) +STR_GAME_OPTIONS_CURRENCY_INR :Yndyske rupee (INR) ###length 2 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT :Lofts ride @@ -1393,6 +1396,8 @@ STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Oaljeraffinader STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Sniehichte: {STRING} +STR_CONFIG_SETTING_SNOW_COVERAGE :Snie-oerflak: {STRING} +STR_CONFIG_SETTING_SNOW_COVERAGE_VALUE :{NUM}% STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Rûgens fan it terrein: {STRING} @@ -1542,6 +1547,7 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Hâld de bouark ###setting-zero-is-special +STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_ZERO :Gjin limyt (sa rap as dyn kompjûter it talit) STR_CONFIG_SETTING_SOUND_TICKER :Ljochtkrante: {STRING} STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Lit in lûd heare by gearfette nijsberjochten @@ -1934,6 +1940,7 @@ STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE :Sub-tropysk lâ STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE :Boartersguodlânskip # Livery window +STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Kleurenskema STR_LIVERY_GENERAL_TOOLTIP :{BLACK}Lit gewoane kleurskemas sjen STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Lit kleurskema sjen fan treinen @@ -2021,6 +2028,7 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Feroarje # Matches ServerGameType ###length 3 +STR_NETWORK_SERVER_VISIBILITY_LOCAL :Lokaal # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer @@ -2033,6 +2041,7 @@ STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION :{BLACK}kliïnte STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT :{BLACK}{COMMA}x{COMMA} STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION :{BLACK}Lângrutte STR_NETWORK_SERVER_LIST_DATE_CAPTION :{BLACK}Datum +STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP :{BLACK}Wizigje datum STR_NETWORK_SERVER_LIST_YEARS_CAPTION :{BLACK}Jieren STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT :{BLACK}Klik in spul út de list om it te selektearjen @@ -2068,6 +2077,7 @@ STR_NETWORK_START_SERVER_CAPTION :{WHITE}Start in STR_NETWORK_START_SERVER_NEW_GAME_NAME :{BLACK}Spulnamme: STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Wachtwurd ynstelle +STR_NETWORK_START_SERVER_VISIBILITY_LABEL :{BLACK}Sichtberheid STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} kliïnt{P "" en} STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Maksimaal oantal kliïnten: STR_NETWORK_START_SERVER_COMPANIES_SELECT :{BLACK}{NUM} bedriuw{P "" en} @@ -2101,6 +2111,7 @@ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Bedriuw STR_NETWORK_COMPANY_LIST_CLIENT_LIST :{WHITE}Client lyst # Network client list +STR_NETWORK_CLIENT_LIST_SERVER_NAME_TOOLTIP :{BLACK}Namme fan de server wêrsto op spilest STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP :{BLACK}Dit bisto sels STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}{NUM} klïïnt{P "" en} / {NUM} bedriuw{P "" en} @@ -2109,6 +2120,8 @@ STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}{NUM} kl +STR_NETWORK_ASK_RELAY_NO :{BLACK}Nee +STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Ja, net wer freegje STR_NETWORK_SPECTATORS :Taskôgers @@ -2144,8 +2157,10 @@ STR_NETWORK_ERROR_SERVER_START :{WHITE}Koe de s STR_NETWORK_ERROR_SERVER_ERROR :{WHITE}In protokol flater is opmurken en de ferbining is sletten STR_NETWORK_ERROR_WRONG_PASSWORD :{WHITE}Ferkeard wachtwurd STR_NETWORK_ERROR_SERVER_FULL :{WHITE}De server is fol +STR_NETWORK_ERROR_KICK_MESSAGE :{WHITE}Reden: {STRING} STR_NETWORK_ERROR_CHEATER :Falsk spielje net tastien op disse server STR_NETWORK_ERROR_TOO_MANY_COMMANDS :{WHITE}Do stjoerst tevolle opdrachten ny de server +STR_NETWORK_ERROR_INVALID_CLIENT_NAME :{WHITE}Disse namme is net jildich STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION :{WHITE}Mooglik ferbinning kwyt STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION :{WHITE}De lêste{NUM} seconde{P "" s} is gjin data oankom fan e server @@ -2171,6 +2186,7 @@ STR_NETWORK_ERROR_CLIENT_INVALID_CLIENT_NAME :ûnjildige namm STR_NETWORK_SERVER_MESSAGE :*** {1:STRING} ###length 12 +STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED :Spul yn rêst ({STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :Spul stiet noch yn rêst ({STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :Spul stiet noch yn rêst ({STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :Spul stiet nog yn rêst ({STRING}, {STRING}, {STRING}, {STRING}) @@ -2191,6 +2207,7 @@ STR_CONTENT_TYPE_CAPTION :{BLACK}Type STR_CONTENT_NAME_CAPTION :{BLACK}Namme STR_CONTENT_SELECT_ALL_CAPTION :{BLACK}Alles selektearje STR_CONTENT_UNSELECT_ALL_CAPTION :{BLACK}Alles deselektearje +STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION :{WHITE}Do ferlitst OpenTTD! STR_CONTENT_OPEN_URL :{BLACK}Webside besykje STR_CONTENT_OPEN_URL_TOOLTIP :{BLACK}Webside foar dizze ynhâld besykje STR_CONTENT_DOWNLOAD_CAPTION :{BLACK}Delhelje @@ -2206,6 +2223,7 @@ STR_CONTENT_DETAIL_DESCRIPTION :{SILVER}Beskriu STR_CONTENT_DETAIL_URL :{SILVER}URL: {WHITE}{STRING} STR_CONTENT_DETAIL_TYPE :{SILVER}Type: {WHITE}{STRING} STR_CONTENT_DETAIL_FILESIZE :{SILVER}Bestângrutte: {WHITE}{BYTES} +STR_CONTENT_DETAIL_DEPENDENCIES :{SILVER}Ôfhinklikheden: {WHITE}{STRING} STR_CONTENT_NO_ZLIB_SUB :{WHITE}... delheljen fan dizze ynhâld is net mooglik # Order of these is important! @@ -2517,6 +2535,8 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Fleanfji STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Akseptearre fracht: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) +STR_LANG_AREA_INFORMATION_RAIL_TYPE :{BLACK}Spoarsoart: {LTBLUE}{STRING} +STR_LANG_AREA_INFORMATION_TRAM_TYPE :{BLACK}Tramsoart: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Faasjelimyt spoar: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Faasjelimyt dyk: {LTBLUE}{VELOCITY} @@ -2659,6 +2679,7 @@ STR_MAPGEN_BY :{BLACK}* STR_MAPGEN_NUMBER_OF_TOWNS :{BLACK}Oantal stêden: STR_MAPGEN_DATE :{BLACK}Datum: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Oantal yndustrien: +STR_MAPGEN_SNOW_COVERAGE :{BLACK}Snie-oerflak: STR_MAPGEN_LAND_GENERATOR :{BLACK}Lângenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terreintype: STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Seenivo: @@ -3122,6 +3143,7 @@ STR_COMPANY_VIEW_COMPANY_VALUE :{GOLD}Bedriuwsw STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA}% besit fan {COMPANY}) STR_COMPANY_VIEW_INFRASTRUCTURE :{GOLD}Ynfrastruktuer: STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD :{WHITE}{COMMA} stikje dyk{P "" s} +STR_COMPANY_VIEW_INFRASTRUCTURE_WATER :{WHITE}{COMMA} wetterfjild{P "" en} STR_COMPANY_VIEW_INFRASTRUCTURE_STATION :{WHITE}{COMMA} stasjontegel{P "" s} STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT :{WHITE}{COMMA} fleanfjild{P "" en} STR_COMPANY_VIEW_INFRASTRUCTURE_NONE :{WHITE}Gjin @@ -3132,6 +3154,7 @@ STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Sjoch ha STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}Haadkantoar besjen STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Haadkantoar ferpleatse STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Details +STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Jou jild STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nei Gesicht STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Selektear nei gesicht foar de bedriuwslieder @@ -3175,9 +3198,11 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Sintrear STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Produksje nivo: {YELLOW}{COMMA}% STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Yndustry kundicht drigend sluten oan! +STR_INDUSTRY_VIEW_REQUIRES_N_CARGO :{BLACK}Fereaskje: {YELLOW}{STRING}{STRING} -STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}Feroaring produksje nivo (percentage, up to 800%) +STR_CONFIG_GAME_PRODUCTION :{WHITE}Feroarje produksjenivo (mearfâld fan 8, maksimaal 2040) +STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}Feroarje produksjenivo (persintaazje, maksimaal 800%) # Vehicle lists ###length VEHICLE_TYPES @@ -3198,6 +3223,7 @@ STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Beskikbere Wein STR_VEHICLE_LIST_AVAILABLE_SHIPS :Beskikbere Skepen STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Beskikbere Fleantugen +STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}List beheare STR_VEHICLE_LIST_REPLACE_VEHICLES :Fiertugen ferfange STR_VEHICLE_LIST_SEND_FOR_SERVICING :Stjoer foar ûnderhâldsbeurt STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Fertsjinste dit jier: {CURRENCY_LONG} (ferline jier: {CURRENCY_LONG}) @@ -3239,12 +3265,14 @@ STR_BUY_VEHICLE_TRAIN_ELRAIL_CAPTION :Nije elektryske STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION :Nije Maglev Treinen STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION :Nije Weinen +STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION :Nije trammen # Vehicle availability ###length VEHICLE_TYPES STR_BUY_VEHICLE_SHIP_CAPTION :Nije Skepen STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Nije fleantugen +STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Kosten: {GOLD}{CURRENCY_LONG}{BLACK} Gewicht: {GOLD}{WEIGHT_SHORT} STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Snelheid: {GOLD}{VELOCITY}{BLACK} Kracht: {GOLD}{POWER} STR_PURCHASE_INFO_SPEED :{BLACK}Snelheid: {GOLD}{VELOCITY} STR_PURCHASE_INFO_SPEED_OCEAN :{BLACK}Faasje op see: {GOLD}{VELOCITY} @@ -3273,6 +3301,7 @@ STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Keapje b STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Keapje fleantúch ###length VEHICLE_TYPES +STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Auto keapje en ferbouwe ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje ferljochte trein @@ -3383,6 +3412,7 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE :monorail lokomo STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :maglevlokomotyf STR_ENGINE_PREVIEW_ROAD_VEHICLE :wein +STR_ENGINE_PREVIEW_TRAM_VEHICLE :tram STR_ENGINE_PREVIEW_AIRCRAFT :fleantúch STR_ENGINE_PREVIEW_SHIP :skip @@ -3684,6 +3714,7 @@ STR_INVALID_ORDER :{RED} (Unjildig STR_TIMETABLE_ORDER_VIEW :{BLACK}Opdrachten +STR_TIMETABLE_NO_TRAVEL :Net reizgje STR_TIMETABLE_NOT_TIMETABLEABLE :Reizgje (automatic; timetabled by next manual order) STR_TIMETABLE_TRAVEL_FOR_SPEED :Reis {STRING} mei maksimum {VELOCITY} STR_TIMETABLE_TRAVEL_FOR_ESTIMATED :Reizgje (foar {STRING}, sûnder tsjinstregeling) @@ -3792,6 +3823,7 @@ STR_AI_SETTINGS_SETTING :{STRING}: {ORAN # Textfile window STR_TEXTFILE_WRAP_TEXT :{WHITE}Omwikkelje tekst +STR_TEXTFILE_VIEW_README :{BLACK}Besjoch readme STR_TEXTFILE_VIEW_CHANGELOG :{BLACK}Feroarings STR_TEXTFILE_VIEW_LICENCE :{BLACK}Lisinsje ###length 3 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 186c0f0593..388cb2fa94 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -379,7 +379,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}도로 STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}전찻길 건설 STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}나무를 심습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}팻말을 답니다. -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}오브젝트를 설치합니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}오브젝트를 설치합니다. CTRL 키를 누르면 대각선 방향의 영역을 선택할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 # Scenario editor file menu ###length 7 @@ -2619,6 +2619,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}과포화 # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{1:STATION}에서 {2:STATION}까지 매달 {0:CARGO_LONG} {G 0 "을" "를"} 수송해야 함 (수용량의 {3:COMMA}%){4:STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{0:CARGO_LONG}{G 0 "을" "를"} 다시 수송해와야 함 (수용량의 {1:COMMA}%) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}평균 운행 시간: {NUM}일 # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}역세권 표시 @@ -2815,11 +2818,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}지형 STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}땅의 모퉁이를 낮춥니다. 드래그하면 시작점의 땅을 낮추고 선택한 영역의 도착점까지 지형을 적절히 맞춥니다. CTRL 키를 누르면 대각선 방향의 영역을 선택할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}땅의 모퉁이를 높입니다. 드래그하면 시작점의 땅을 높이고 선택한 영역의 도착점까지 지형을 적절히 맞춥니다. CTRL 키를 누르면 대각선 방향의 영역을 선택할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}처음 선택한 모퉁이의 고도에 맞추어 땅을 평평하게 고릅니다. CTRL 키를 누르면 대각선 방향의 영역을 선택할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}나중에 그 땅을 사용하기 위해 소유권을 구입합니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}나중에 그 땅을 사용하기 위해 소유권을 구입합니다. CTRL 키를 누르면 대각선 방향의 영역을 선택할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}오브젝트 선택 -STR_OBJECT_BUILD_TOOLTIP :{BLACK}건설할 오브젝트를 선택합니다. +STR_OBJECT_BUILD_TOOLTIP :{BLACK}건설할 오브젝트를 선택합니다. CTRL 키를 누르면 대각선 방향의 영역을 선택할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다 STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}건설할 오브젝트의 등급을 선택합니다 STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}오브젝트 미리보기 STR_OBJECT_BUILD_SIZE :{BLACK}크기: {GOLD}{NUM} x {NUM} 칸 @@ -4928,6 +4931,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}중간 STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... 중간에 회사 본사가 있습니다 STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}이 지역을 매입할 수 없습니다... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... 이미 소유중입니다! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}... 오브젝트 건설 제한에 다다랐습니다 # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}그룹을 만들 수 없습니다... diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 470299c880..25de17db56 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -379,7 +379,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Construc STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Construcción de tranvía STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Plantar árboles. Mayús muestra un costo estimado STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Poner cartel -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Colocar objeto. Mayús muestra un costo estimado +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Colocar objeto. Ctrl para seleccionar un área en diagonal. Mayús muestra un costo estimado # Scenario editor file menu ###length 7 @@ -2619,6 +2619,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}sobrecargado # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} a ser transportad{G 0 o a}{P 0 "" s} al mes desde {STATION} a {STATION} ({COMMA}% de la capacidad){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} a ser transportad{G 0 o a}{P 0 "" s}) de vuelta ({COMMA}% de la capacidad) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Tiempo promedio de viaje: {NUM}{NBSP}día{P "" s} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Mostrar área de recolección @@ -2815,11 +2818,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Alteraci STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Rebajar una esquina del terreno. Al arrastrar el ratón se rebaja la primera esquina elegida y el resto del terreno seleccionado se nivela a dicha altura. Ctrl para seleccionar un área en diagonal. STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Elevar una esquina del terreno. Al arrastrar el ratón se eleva la primera esquina elegida y se nivela el resto del terreno seleccionado a dicha altura. Ctrl para seleccionar un área en diagonal. Mayús muestra un costo estimado STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Nivelar un área de terreno a la altura de la primera esquina seleccionada. Ctrl para seleccionar un área en diagonal. Mayús muestra un costo estimado -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Comprar terreno para usos futuros. Mayús muestra un costo estimado +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Comprar terreno para usos futuros. Ctrl para seleccionar un área en diagonal. Mayús muestra un costo estimado # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Selección de objeto -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Elegir una estructura u objeto a construir. Mayús muestra un costo estimado +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Elegir una estructura u objeto a construir. Ctrl para seleccionar un área en diagonal. Mayús muestra un costo estimado STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Elegir el tipo de objeto o estructura a construir STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Vista previa del objeto STR_OBJECT_BUILD_SIZE :{BLACK}Tamaño: {GOLD}{NUM}×{NUM} casillas @@ -4688,9 +4691,9 @@ STR_ERROR_SITE_UNSUITABLE :{WHITE}... luga STR_ERROR_ALREADY_BUILT :{WHITE}... ya construido STR_ERROR_OWNED_BY :{WHITE}... propiedad de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... otra empresa es dueña de esta área -STR_ERROR_TERRAFORM_LIMIT_REACHED :{WHITE}... límite de modificación de terreno alcanzado -STR_ERROR_CLEARING_LIMIT_REACHED :{WHITE}... límite de casillas despejadas alcanzado -STR_ERROR_TREE_PLANT_LIMIT_REACHED :{WHITE}... limite de plantación de árboles alcanzado +STR_ERROR_TERRAFORM_LIMIT_REACHED :{WHITE}... no se puede modificar más terreno +STR_ERROR_CLEARING_LIMIT_REACHED :{WHITE}... no se pueden despejar más casillas +STR_ERROR_TREE_PLANT_LIMIT_REACHED :{WHITE}... no se pueden plantar más árboles STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}El nombre debe ser único STR_ERROR_GENERIC_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} estorba STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}No permitido en pausa @@ -4928,6 +4931,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Otro obj STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... la sede de la empresa estorba STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}No se puede adquirir este terreno... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... ¡ya fue adquirido por el jugador! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :... no se pueden construir más objetos # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}No se puede crear grupo...