diff --git a/.changelog b/.changelog index d060ce3b9a..cda3d531a1 100644 --- a/.changelog +++ b/.changelog @@ -1,5 +1,9 @@ -13.3 (2023-06-11) +13.4 (2023-07-29) ------------------------------------------------------------------------ -Fix: [Win32] use full monitor resolution for fullscreen (#10985) +Fix: Setting tree lines drawn incorrectly for RTL languages (#11070) +Fix #11043: Don't choose toolbar dropdown option if focus is lost (#11044) +Fix #10917: Pay loan interest before generating statistics (#11040) +Fix #11016: Use after free in network invalid packet error path (#11022) +Fix #10987: Double-close of dropdown stopped land-info tool working as default (#11000) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index c0cd7babe4..58394460d5 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -23,34 +23,41 @@ jobs: run: | tar -xf source.tar.gz --strip-components=1 + - name: Enable vcpkg cache + uses: actions/cache@v3 + with: + path: /vcpkg/installed + key: ubuntu-20.04-vcpkg-release-0 # Increase the number whenever dependencies are modified + restore-keys: | + ubuntu-20.04-vcpkg-release + - name: Install dependencies run: | - echo "::group::Install dependencies" + echo "::group::Install system dependencies" + # ICU is used as vcpkg fails to install ICU. Other dependencies + # are needed either for vcpkg or for the packages installed with + # vcpkg. yum install -y \ - fontconfig-devel \ - freetype-devel \ libicu-devel \ - libpng-devel \ - lzo-devel \ - SDL2-devel \ + perl-IPC-Cmd \ wget \ - xz-devel \ - zlib-devel \ + zip \ # EOF echo "::endgroup::" # The yum variant of fluidsynth depends on all possible audio drivers, # like jack, ALSA, pulseaudio, etc. This is not really useful for us, # as we route the output of fluidsynth back via our sound driver, and - # as such do not use these audio driver outputs at all. So instead, - # we compile fluidsynth ourselves, with as little dependencies as - # possible. This currently means it picks up SDL2, but this is fine, - # as we need SDL2 anyway. + # as such do not use these audio driver outputs at all. + # The vcpkg variant of fluidsynth depends on ALSA. Similar issue here. + # So instead, we compile fluidsynth ourselves, with as few + # dependencies as possible. We do it before anything else is installed, + # to make sure it doesn't pick up on any of the drivers. echo "::group::Install fluidsynth" - wget https://github.com/FluidSynth/fluidsynth/archive/v2.1.6.tar.gz - tar xf v2.1.6.tar.gz + wget https://github.com/FluidSynth/fluidsynth/archive/v2.3.3.tar.gz + tar xf v2.3.3.tar.gz ( - cd fluidsynth-2.1.6 + cd fluidsynth-2.3.3 mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr @@ -59,6 +66,50 @@ jobs: ) echo "::endgroup::" + echo "::group::Install audio drivers" + # These audio libs are to make sure the SDL version of vcpkg adds + # sound-support; these libraries are not added to the resulting + # binary, but the headers are used to enable them in SDL. + yum install -y \ + alsa-lib-devel \ + jack-audio-connection-kit-devel \ + pulseaudio-libs-devel \ + # EOF + echo "::endgroup::" + + # We use vcpkg for our dependencies, to get more up-to-date version. + echo "::group::Install vcpkg and dependencies" + + # We do a little dance to make sure we copy the cached install folder + # into our new clone. + git clone --depth=1 https://github.com/microsoft/vcpkg /vcpkg-clone + if [ -e /vcpkg/installed ]; then + mv /vcpkg/installed /vcpkg-clone/ + rm -rf /vcpkg + fi + mv /vcpkg-clone /vcpkg + + ( + cd /vcpkg + ./bootstrap-vcpkg.sh -disableMetrics + + # Make Python3 available for other packages. + ./vcpkg install python3 + ln -sf $(pwd)/installed/x64-linux/tools/python3/python3.[0-9][0-9] /usr/bin/python3 + + ./vcpkg install \ + curl[http2] \ + fontconfig \ + freetype \ + liblzma \ + libpng \ + lzo \ + sdl2 \ + zlib \ + # EOF + ) + echo "::endgroup::" + - name: Install GCC problem matcher uses: ammaraskar/gcc-problem-matcher@master @@ -69,6 +120,7 @@ jobs: echo "::group::CMake" cmake ${GITHUB_WORKSPACE} \ + -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_PACKAGE_DEPENDENCIES=ON \ # EOF diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index d763b0cc4f..9b0c82eb74 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -151,19 +151,19 @@ jobs: rm -f bundles/*.sha256 echo "::endgroup::" - - name: Install gon - env: - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - run: | - brew tap mitchellh/gon - brew install mitchellh/gon/gon - - name: Notarize env: AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }} AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }} + AC_TEAM_ID: ${{ secrets.APPLE_DEVELOPER_TEAM_ID }} run: | + if [ -z "${AC_USERNAME}" ]; then + # We may be running on a fork that doesn't have notarization secrets set up; skip this step + echo No notarization secrets set up, skipping. + exit 0 + fi + + xcrun notarytool store-credentials --apple-id "${AC_USERNAME}" --password "${AC_PASSWORD}" --team-id "${AC_TEAM_ID}" openttd cd build-x64 ../os/macosx/notarize.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc0225153f..a28a859f9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,8 +69,8 @@ jobs: with: version: ${{ needs.source.outputs.version }} - upload-aws: - name: Upload (AWS) + upload-cdn: + name: Upload (CDN) needs: - source - docs @@ -83,7 +83,7 @@ jobs: # The always() makes sure the rest is always evaluated. if: always() && needs.source.result == 'success' && needs.docs.result == 'success' && needs.linux.result == 'success' && needs.macos.result == 'success' && needs.windows.result == 'success' && (needs.windows-store.result == 'success' || needs.windows-store.result == 'skipped') - uses: ./.github/workflows/upload-aws.yml + uses: ./.github/workflows/upload-cdn.yml secrets: inherit with: diff --git a/.github/workflows/upload-cdn.yml b/.github/workflows/upload-cdn.yml new file mode 100644 index 0000000000..f7f925222c --- /dev/null +++ b/.github/workflows/upload-cdn.yml @@ -0,0 +1,103 @@ +name: Upload (CDN) + +on: + workflow_call: + inputs: + version: + required: true + type: string + folder: + required: true + type: string + trigger_type: + required: true + type: string + +jobs: + prepare: + name: Prepare + + runs-on: ubuntu-latest + + steps: + - name: Download all bundles + uses: actions/download-artifact@v3 + + - name: Calculate checksums + run: | + echo "::group::Move bundles to a single folder" + mkdir bundles + mv openttd-*/* bundles/ + echo "::endgroup::" + + cd bundles + for i in $(ls openttd-*); do + echo "::group::Calculating checksums for ${i}" + openssl dgst -r -md5 -hex $i > $i.md5sum + openssl dgst -r -sha1 -hex $i > $i.sha1sum + openssl dgst -r -sha256 -hex $i > $i.sha256sum + echo "::endgroup::" + done + + # Some targets generate files that are meant for our-eyes-only. + # They are stored in the "internal" folder, and contains bundles + # for targets like Windows Store. No user has a benefit of knowing + # they exist, hence: internal. + if [ -e internal ]; then + cd internal + for i in $(ls openttd-*); do + echo "::group::Calculating checksums for ${i}" + openssl dgst -r -md5 -hex $i > $i.md5sum + openssl dgst -r -sha1 -hex $i > $i.sha1sum + openssl dgst -r -sha256 -hex $i > $i.sha256sum + echo "::endgroup::" + done + fi + + - name: Store bundles + uses: actions/upload-artifact@v3 + with: + name: cdn-bundles + path: bundles/* + retention-days: 5 + + publish: + needs: + - prepare + + name: Publish + uses: OpenTTD/actions/.github/workflows/rw-cdn-upload.yml@v4 + secrets: + CDN_SIGNING_KEY: ${{ secrets.CDN_SIGNING_KEY }} + DEPLOYMENT_APP_ID: ${{ secrets.DEPLOYMENT_APP_ID }} + DEPLOYMENT_APP_PRIVATE_KEY: ${{ secrets.DEPLOYMENT_APP_PRIVATE_KEY }} + with: + artifact-name: cdn-bundles + folder: ${{ inputs.folder }} + version: ${{ inputs.version }} + + docs: + if: ${{ inputs.trigger_type == 'new-master' }} + needs: + - publish + + name: Publish docs + + runs-on: ubuntu-latest + + steps: + - name: Generate access token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.DEPLOYMENT_APP_ID }} + private_key: ${{ secrets.DEPLOYMENT_APP_PRIVATE_KEY }} + repository: OpenTTD/workflows + + - name: Trigger 'Publish Docs' + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ steps.generate_token.outputs.token }} + repository: OpenTTD/workflows + event-type: publish-docs + client-payload: '{"version": "${{ inputs.version }}", "folder": "${{ inputs.folder }}"}' diff --git a/.github/workflows/upload-gog.yml b/.github/workflows/upload-gog.yml index b4a591fdcc..c1d0678859 100644 --- a/.github/workflows/upload-gog.yml +++ b/.github/workflows/upload-gog.yml @@ -14,8 +14,35 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Download all bundles + - name: Download source uses: actions/download-artifact@v3 + with: + name: internal-source + path: internal-source + + - name: Download bundle (Windows x86) + uses: actions/download-artifact@v3 + with: + name: openttd-windows-x86 + path: openttd-windows-x86 + + - name: Download bundle (Windows x64) + uses: actions/download-artifact@v3 + with: + name: openttd-windows-x64 + path: openttd-windows-x64 + + - name: Download bundle (MacOS) + uses: actions/download-artifact@v3 + with: + name: openttd-macos-universal + path: openttd-macos-universal + + - name: Download bundle (Linux) + uses: actions/download-artifact@v3 + with: + name: openttd-linux-generic + path: openttd-linux-generic - name: Install GOG Galaxy Build Creator run: | diff --git a/.github/workflows/upload-steam.yml b/.github/workflows/upload-steam.yml index cd646dd81c..808983f828 100644 --- a/.github/workflows/upload-steam.yml +++ b/.github/workflows/upload-steam.yml @@ -17,8 +17,35 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Download all bundles + - name: Download source uses: actions/download-artifact@v3 + with: + name: internal-source + path: internal-source + + - name: Download bundle (Windows x86) + uses: actions/download-artifact@v3 + with: + name: openttd-windows-x86 + path: openttd-windows-x86 + + - name: Download bundle (Windows x64) + uses: actions/download-artifact@v3 + with: + name: openttd-windows-x64 + path: openttd-windows-x64 + + - name: Download bundle (MacOS) + uses: actions/download-artifact@v3 + with: + name: openttd-macos-universal + path: openttd-macos-universal + + - name: Download bundle (Linux) + uses: actions/download-artifact@v3 + with: + name: openttd-linux-generic + path: openttd-linux-generic - name: Setup steamcmd uses: CyberAndrii/setup-steamcmd@v1 diff --git a/.ottdrev b/.ottdrev index 3f947346b3..a3cf7a553d 100644 --- a/.ottdrev +++ b/.ottdrev @@ -1 +1 @@ -13.3 20230611 0 d854bb82e51bb5a4bd59a0363f34d22384758aa0 1 1 2023 +13.4 20230730 0 7e457a367e67f4e1b7d28ebd769e3a649ea60175 1 1 2023 diff --git a/.release_date b/.release_date index 8900fc244b..216bc29bfa 100644 --- a/.release_date +++ b/.release_date @@ -1 +1 @@ -2023-06-11 16:43 UTC +2023-07-29 23:01 UTC diff --git a/.version b/.version index 7befaf8cfa..c5644b4542 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -13.3 +13.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index d4df9f27d1..74cc7ccc7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if(NOT BINARY_NAME) endif() project(${BINARY_NAME} - VERSION 13.3 + VERSION 13.4 ) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) diff --git a/changelog.txt b/changelog.txt index bbb494fc3b..b4eba4995e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,12 @@ +13.4 (2023-07-29) +------------------------------------------------------------------------ +Fix: Setting tree lines drawn incorrectly for RTL languages (#11070) +Fix #11043: Don't choose toolbar dropdown option if focus is lost (#11044) +Fix #10917: Pay loan interest before generating statistics (#11040) +Fix #11016: Use after free in network invalid packet error path (#11022) +Fix #10987: Double-close of dropdown stopped land-info tool working as default (#11000) + + 13.3 (2023-06-11) ------------------------------------------------------------------------ Fix: [Win32] use full monitor resolution for fullscreen (#10985) diff --git a/os/macosx/notarize.sh b/os/macosx/notarize.sh index 55405cdd89..c34606bdc2 100755 --- a/os/macosx/notarize.sh +++ b/os/macosx/notarize.sh @@ -5,11 +5,8 @@ set -e # If you are building an unofficial branch of OpenTTD, please change the bundle # ID in Info.plist and below. # -# This uses `gon' to perform notarization: -# -# https://github.com/mitchellh/gon -# -# Follow the setup instructions on the gon site to install. +# This uses the Xcode notarytool to perform notarization. You must set up a keychain +# profile called "openttd" using the "store-credentials" notarytool command beforehand. # # Before executing this script, you must first configure CMake with at least the following # parameters: @@ -22,19 +19,11 @@ set -e # This will sign the application with your signing certificate, and will enable # the hardened runtime. # -# You also need to set your Apple Developer username and password (app-specific password -# is recommended) in the AC_USERNAME and AC_PASSWORD environment variables. -# # Then, ensuring you're in your build directory and that the "bundles" directory # exists with a .dmg in it (clear out any old DMGs first), run: # # ../os/macosx/notarize.sh -if [ -z "${AC_USERNAME}" ]; then - echo AC_USERNAME not set, skipping notarization. - exit 0 -fi; - dmg_filename=(bundles/*.dmg) if [ "${dmg_filename}" = "bundles/*.dmg" ]; then @@ -43,24 +32,15 @@ if [ "${dmg_filename}" = "bundles/*.dmg" ]; then exit 1 fi; -cat < notarize.json -{ - "notarize": [ - { - "path": "${dmg_filename[0]}", - "bundle_id": "org.openttd.openttd", - "staple": true - } - ] -} -EOF +xcrun notarytool submit ${dmg_filename[0]} --keychain-profile "openttd" --wait -gon notarize.json +# Staple the ticket to the .dmg +xcrun stapler staple "${dmg_filename[0]}" app_filename=(_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app) if [ "${app_filename}" = "_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app" ]; then - echo "No .app found in the _CPack_Packages directory, skipping stapling." + echo "No .app found in the _CPack_Packages directory, skipping app stapling." exit 0 fi; diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 972ef23b24..d7ad5d75b8 100644 --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -341,7 +341,7 @@ struct IConsoleWindow : Window VideoDriver::GetInstance()->EditBoxGainedFocus(); } - void OnFocusLost() override + void OnFocusLost(bool closing) override { VideoDriver::GetInstance()->EditBoxLostFocus(); } diff --git a/src/economy.cpp b/src/economy.cpp index 5953a7641e..cb1e598319 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1969,12 +1969,12 @@ void LoadUnloadStation(Station *st) */ void CompaniesMonthlyLoop() { + CompaniesPayInterest(); CompaniesGenStatistics(); if (_settings_game.economy.inflation) { AddInflation(); RecomputePrices(); } - CompaniesPayInterest(); HandleEconomyFluctuations(); } diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 747681b1ba..6f0fa3c287 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1946,6 +1946,7 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}أسم STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}ضع كلمة سر STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}احم لعبتك برقم سري حتى لا تصبح لعبتك مفتوحة للجميع +STR_NETWORK_START_SERVER_VISIBILITY_TOOLTIP :{BLACK}سواء بإمكان الأشخاص الآخرين رؤية خادمك (server) في القائمة العامة أم لا STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM}عميل STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}اقصى عدد للعملاء: STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}أختر أقصى عدد للعملاء @@ -1984,6 +1985,7 @@ STR_NETWORK_COMPANY_LIST_SPECTATE :شاهد # Network client list STR_NETWORK_CLIENT_LIST_CAPTION :{WHITE}اللاعبون عبر الإنترنت STR_NETWORK_CLIENT_LIST_SERVER_NAME :{BLACK}الاسم +STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_TOOLTIP :{BLACK}سواء ان يمكن الوصول إلى الخادم الخاص بك من قبل الآخرين وكيف سيصلون اليه STR_NETWORK_CLIENT_LIST_PLAYER_NAME :{BLACK}الاسم STR_NETWORK_CLIENT_LIST_SPECTATORS :المشاهدين STR_NETWORK_CLIENT_LIST_NEW_COMPANY :(شركة جديدة) @@ -2115,6 +2117,7 @@ STR_CONTENT_UNSELECT_ALL_CAPTION :{BLACK} مسح STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP :{BLACK} ضع علامة على المحتوى التي لن يتم تحميلها STR_CONTENT_SEARCH_EXTERNAL :{BLACK}بحث المواقع الخارجية STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP :{BLACK} محتوى البحث غير متوفر في في خدمة محتوى OpenTTD على مواقع الويب غير التابعة لـ OpenTTD +STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER :{WHITE}تختلف شروط وأحكام تنزيل المحتوى من مواقع الويب الخارجية.{}يجب عليك الرجوع إلى المواقع الخارجية للحصول على إرشادات حول كيفية تثبيت المحتوى في OpenTTD.{}هل تريد أن تكمل؟ STR_CONTENT_FILTER_TITLE :{BLACK}مُرَشِح: STR_CONTENT_OPEN_URL :{BLACK} زيارة الموقع STR_CONTENT_OPEN_URL_TOOLTIP :{BLACK}قم بزيارة الموقع لهذا المحتوى @@ -2618,6 +2621,7 @@ STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النس # Framerate display window STR_FRAMERATE_MS_GOOD :{LTBLUE}{DECIMAL} ms +STR_FRAMERATE_MS_BAD :{RED}{DECIMAL} ms STR_FRAMERATE_FPS_GOOD :{LTBLUE}{DECIMAL} صورة في الثانية STR_FRAMERATE_FPS_WARN :{YELLOW}{DECIMAL} صورة في الثانية STR_FRAMERATE_GRAPH_SECONDS :{TINY_FONT}{COMMA} ثواني @@ -3115,6 +3119,7 @@ STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 STR_FINANCES_REVENUE_TITLE :{WHITE}الدخل +STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}مصروفات التشغيل ###length 13 @@ -3222,6 +3227,7 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}وسط STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}نسبة الانتاج: {YELLOW}{COMMA}% STR_INDUSTRY_VIEW_PRODUCES_N_CARGO :{BLACK}ينتج: {YELLOW}{STRING}{STRING} +STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION :، {STRING}{STRING} STR_INDUSTRY_VIEW_REQUIRES :{BLACK}:يتطلب STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} تنتظر{STRING} @@ -4022,6 +4028,7 @@ STR_PERCENT_DOWN :{WHITE}{NUM}%{D STR_PERCENT_UP_DOWN_SMALL :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}{DOWN_ARROW} STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UP_ARROW}{DOWN_ARROW} STR_PERCENT_NONE_SMALL :{TINY_FONT}{WHITE}{NUM}% +STR_PERCENT_NONE :{WHITE}{NUM}% # Income 'floats' STR_INCOME_FLOAT_COST_SMALL :{TINY_FONT}{RED}تكلفة: {CURRENCY_LONG} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index d4a41d0f26..c44ec085e9 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1212,7 +1212,7 @@ STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{CURRENCY_LONG} STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :Sem empréstimo {RED}Requer Script de Jogo para fornecer fundos iniciais STR_CONFIG_SETTING_INTEREST_RATE :Taxa de Juros: {STRING} -STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT :Juros de empréstimo; também controla inflação, se ativado +STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT :Juros de empréstimo; se ativado também controla a inflação STR_CONFIG_SETTING_RUNNING_COSTS :Custos de Operação: {STRING} STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT :Define o nível e custos de manutenção de veículos e infraestrutura @@ -1401,7 +1401,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :Sim, mas exclui STR_CONFIG_SETTING_ORDER_REVIEW_ON :De todos os veículos STR_CONFIG_SETTING_WARN_INCOME_LESS :Avisar se o lucro de um veículo se torna negativo: {STRING} -STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT :Quando ativado, uma mensagem é enviada quando um veículo não gerou lucro durante um ano-calendário +STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT :Se ativado, uma mensagem é enviada quando um veículo não gerou lucro durante um ano-calendário STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :Veículos nunca saem de linha: {STRING} STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES_HELPTEXT :Quanto ativado, mantém todos os modelos de veículos disponíveis após serem introduzidos @@ -1531,7 +1531,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Cinza para verm STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Escala de cinza STR_CONFIG_SETTING_SCROLLMODE :Comportamento de rolamento da janela: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamento ao rolar o mapa +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamento ao mover o mapa. A opção de "posição do mouse travada" não funciona em todos os sistemas, tais como versões baseadas na web, telas sensíveis ao toque, Linux com Wayland e outros. ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Mover vista com BDM, posição do mouse travada STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Mover mapa com BDM, posição do mouse travada @@ -2057,6 +2057,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}A aloca # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Erro nas configurações de vídeo... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... nenhuma GPU compatível encontrada. Aceleração de hardware desativada +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... O driver gráfico (GPU) interrompeu o jogo. Aceleração por hardware desativada. # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 1180757b3b..3072bf029d 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1531,7 +1531,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :De gris a verme STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Escala de grisos STR_CONFIG_SETTING_SCROLLMODE :Desplaçament del mapa: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportament quan es desplaça el mapa. +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportament quan es desplaça el mapa. Les opcions "amb la posició del ratolí fixada" no funcionen en tots els sistemes, com ara versions web, pantalles tàctils, Linux amb Wayland i altres. ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Mou la vista amb el botó dret del ratolí amb la posició del ratolí fixada STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Mou el mapa amb el botó dret del ratolí amb la posició del ratolí fixada @@ -2057,6 +2057,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}L'assign # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}S'ha produït un error en la configuració de vídeo... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... no s'ha trobat cap GPU compatible. Es desactiva l'acceleració per programari. +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... el controlador de la GPU ha fallat durant la partida. Es desactiva l'acceleració per maquinari. # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 882ff040bb..6a1e9bb426 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1415,10 +1415,10 @@ STR_CONFIG_SETTING_SHOWFINANCES :Ukazovat finan STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT :Na konci každého roku zobrazit okno s finančním přehledem pro snadnou kontrolu hospodaření společnosti. STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :Vydávat nové příkazy jako 'bez zastavení': {STRING} -STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT :Normálně vozidlo zastavuje na každé stanici kterou projíždí. Povolením této možnosti budou všechny nově vydané příkazy "Jeď do" vydávány jako "bez zastavení" a vozidlo tak každou stanicí po cestě do cíle pouze projede, bez zastavení. U jednotlivých příkazů lze pochopitelně možnost "bez zastavení" vypnout. +STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT :Normálně vozidlo zastavuje v každé stanici, kterou projíždí. Zapnutím této možnosti budou všechny nově vydané příkazy "Jet do" vydávány jako "bez zastavení" a vozidlo tak každou stanicí po cestě do cíle pouze projede bez odbavení. U jednotlivých příkazů nicméně lze ručně nastavit odlišné chování. STR_CONFIG_SETTING_STOP_LOCATION :Vlaky normálně zastavují {STRING} nástupiště -STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT :Místo kde vlaky obvykle zastavují ve stanicích. Toto je defaultní nastavení. U jednotlivých příkazů vozidel jde místo zastavení změnit +STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT :Výchozí pozice pro zastavování vlaků ve stanicích. 'Na začátku' znamená, že konec vlaku je u začátku nástupiště, 'uprostřed' znamená, že střed vlaku je u středu nástupiště a 'na konci' znamená, že čelo vlaku je u konce nástupiště. Toto nastavení udává jen výchozí hodnotu pro nové příkazy; u jednotlivých příkazů lze místo zastavení změnit. ###length 3 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END :na začátku STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE :uprostřed diff --git a/src/lang/danish.txt b/src/lang/danish.txt index d375780f41..f01020eb55 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2799,8 +2799,8 @@ STR_AIRPORT_HELISTATION :Helikopterplads STR_AIRPORT_CLASS_SMALL :Små lufthavne STR_AIRPORT_CLASS_LARGE :Store lufthavne -STR_AIRPORT_CLASS_HUB :Central lufthavn -STR_AIRPORT_CLASS_HELIPORTS :Helikopterlufthavn +STR_AIRPORT_CLASS_HUB :Central lufthavne +STR_AIRPORT_CLASS_HELIPORTS :Helikopter lufthavne STR_STATION_BUILD_NOISE :{BLACK}Genereret støj: {GOLD}{COMMA} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 65abe9fd01..cf6ec5de52 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1518,7 +1518,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR :Landkleur gebru STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT :Kleur van het terrein op de kleine kaart. ###length 3 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Groen -STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Donker groen +STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Donkergroen STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Violet STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Kleuren vrachtstroomweergave: {STRING} @@ -1530,7 +1530,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Grijs naar rood STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Grijstinten STR_CONFIG_SETTING_SCROLLMODE :Verplaatsingsgedrag voor kijkvensters: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Gedrag tijdens het verplaatsen van de kaart +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Gedrag tijdens het verplaatsen van de kaart. De opties over vergrendeling van de muis werken niet op alle systemen, bijv. webversies, aanraakschermen, Linux met Wayland en andere ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Kijkvenster verplaatsen met rechtermuisknop, muispositie vergrendeld STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Kaart verplaatsen met rechtermuisknop, muispositie vergrendeld @@ -2056,6 +2056,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Toewijze # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Fout met video-instellingen... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... geen compatibele GPU gevonden. Hardwareversnelling is uitgeschakeld +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Spel is vastgelopen door het GPU-stuurprogramma. Hardwareversnelling wordt uitgeschakeld # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -4152,7 +4153,7 @@ STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centreer STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centreer het hoofdscherm op de locatie van het vliegtuig. Met dubbelklik volg je het vliegtuig op het hoofdscherm. Ctrl+klik opent een nieuw scherm op de locatie van het vliegtuig. ###length VEHICLE_TYPES -STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur trein naar depot. Ctrl+klik voor alleen onderhoud +STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur trein naar remise. Ctrl+klik voor alleen onderhoud STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur wegvoertuig naar garage. Ctrl+klik voor alleen onderhoud STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur schip naar dok. Ctrl+klik voor alleen onderhoud STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur vliegtuig naar hangar. Ctrl+klik voor alleen onderhoud @@ -5018,7 +5019,7 @@ STR_ERROR_CAN_T_STOP_START_SHIP :{WHITE}Kan schi STR_ERROR_CAN_T_STOP_START_AIRCRAFT :{WHITE}Kan vliegtuig niet starten of stoppen... ###length VEHICLE_TYPES -STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Kan trein niet naar depot sturen... +STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Kan trein niet naar remise sturen... STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT :{WHITE}Kan wegvoertuig niet naar garage sturen... STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Kan schip niet naar dok sturen... STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan vliegtuig niet naar hangar sturen... diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 956094b70a..8674c0f7ca 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1530,7 +1530,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Gray to red STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Grayscale STR_CONFIG_SETTING_SCROLLMODE :Viewport scroll behavior: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Behavior when scrolling the map +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Behavior when scrolling the map. The "mouse position locked" options don't work on all systems, like web-based versions, touchscreens, Linux with Wayland, and others ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Move viewport with RMB, mouse position locked STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Move map with RMB, mouse position locked @@ -2056,6 +2056,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Allocati # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Error with video settings... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... no compatible GPU found. Hardware acceleration disabled +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... GPU driver crashed the game. Hardware acceleration disabled # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 7c32b721fa..a3561c7f7f 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -268,7 +268,6 @@ STR_COLOUR_GREY :Griza STR_COLOUR_WHITE :Blanka STR_COLOUR_RANDOM :Hazarda -# Units used in OpenTTD STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mph STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s @@ -301,6 +300,7 @@ STR_UNITS_FORCE_SI :{COMMA}{NBSP}kN STR_UNITS_HEIGHT_IMPERIAL :{COMMA}{NBSP}ft STR_UNITS_HEIGHT_METRIC :{COMMA}{NBSP}m STR_UNITS_HEIGHT_SI :{COMMA}{NBSP}m +# Units used in OpenTTD STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}kaheloj tage STR_UNITS_VELOCITY_GAMEUNITS.n :{DECIMAL}{NBSP}kahelojn tage STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL :{DECIMAL}{NBSP}ĉp/t @@ -584,7 +584,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Forigu ĉiujn m STR_ABOUT_MENU_LAND_BLOCK_INFO :Landkvadrataj informoj STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Baskuligi Konzolon -STR_ABOUT_MENU_AI_DEBUG :AI/Ludo skripto sencimigo +STR_ABOUT_MENU_AI_DEBUG :AI/Ludoskripta sencimigo STR_ABOUT_MENU_SCREENSHOT :Ekranfoto STR_ABOUT_MENU_SHOW_FRAMERATE :Montru bildrapidon STR_ABOUT_MENU_ABOUT_OPENTTD :Pri 'OpenTTD' @@ -1079,6 +1079,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION :{BLACK}Aparatar STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP :{BLACK}Elektu tiun ĉi agordon por ke OpenTTD klopodu uzi aparataran akceladon. Se vi ŝanĝas tiun ĉi agordon, la nova agordo validos nur ekde restartigo de la ludo STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Tiu ĉi agordo ekefikos nur post restartigo de la ludo +STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}Vertikala sinkronigo STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Nuna pelilo: {STRING} @@ -1094,8 +1095,10 @@ STR_GAME_OPTIONS_GUI_SCALE_5X :5x STR_GAME_OPTIONS_GRAPHICS :{BLACK}Grafiko +STR_GAME_OPTIONS_REFRESH_RATE :{BLACK}Montru aktualigoftecon STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP :{BLACK}Elektu ekranan aktualigoftecon STR_GAME_OPTIONS_REFRESH_RATE_ITEM :{NUM}Hz +STR_GAME_OPTIONS_REFRESH_RATE_WARNING :{WHITE}Aktualigoftecoj pli altaj ol 60Hz povas kaŭzi malrapidiĝon. STR_GAME_OPTIONS_BASE_GRF :{BLACK}Baza grafikaro STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}Selektu la uzendan bazgrafikaron @@ -1285,6 +1288,7 @@ STR_CONFIG_SETTING_RUNNING_COSTS :Irkostoj: {STRI STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT :Ŝanĝu nivelon de bontenkostoj kaj irkostoj de veturiloj kaj infrastrukturo STR_CONFIG_SETTING_CONSTRUCTION_SPEED :Konstrurapido: {STRING} +STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT :Limigu la kvanton de konstruaj agoj por AIoj STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS :Veturilpaneoj: {STRING} STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :Regu kiom ofte povas panei maladekvate prizorgataj veturiloj @@ -1326,6 +1330,7 @@ STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT :Permesu terenŝ STR_CONFIG_SETTING_CATCHMENT :Permesu pli realismajn grandecojn de servataj areoj: {STRING} STR_CONFIG_SETTING_CATCHMENT_HELPTEXT :Diversaj tipoj de stacioj kaj flughavenoj havas diversgrandajn servatajn areojn +STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES :Kompaniaj stacioj povas servi fabrikojn kun alkroĉitaj neŭtralaj stacioj: {STRING} STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT :Kiam tiu ĉi agordo estas aktiva, fabrikoj kun alkroĉitaj stacioj (ekzemple oleplatformoj) povas ankaŭ esti servataj de apudaj stacioj konstruitaj de kompanioj. Kiam tiu ĉi agordo estas malaktiva, tiaj ĉi fabrikoj serveblas nur per siaj alkroĉitaj stacioj. Apudaj stacioj konstruitaj de kompanioj ne povos servi ilin, kaj la alkroĉita stacio ankaŭ ne servos ion alian ol la fabrikon mem STR_CONFIG_SETTING_EXTRADYNAMITE :Permesu forigon de pli da urbaj stratoj, pontoj ktp: {STRING} @@ -1480,7 +1485,6 @@ STR_CONFIG_SETTING_AUTORENEW_MONEY_HELPTEXT :Minimuma monkva STR_CONFIG_SETTING_ERRMSG_DURATION :Daŭro de erarmesaĝo: {STRING} STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE :{COMMA} sekundo{P 0 "" j} -STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE.n :{COMMA} sekundo{P 0 "" j}n STR_CONFIG_SETTING_HOVER_DELAY :Montri ŝpruchelpilojn: {STRING} STR_CONFIG_SETTING_HOVER_DELAY_VALUE :Ŝvebu dum {COMMA} milisekundo{P 0 "" j} @@ -1741,6 +1745,7 @@ STR_CONFIG_SETTING_AI_BUILDS_SHIPS :Malebligu ŝipo STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT :Se tiu ĉi agordo estas aktiva, komputila ludanto ne povas konstrui ŝipojn STR_CONFIG_SETTING_AI_PROFILE :Defaŭlta agorda profilo: {STRING} +STR_CONFIG_SETTING_AI_PROFILE_HELPTEXT :Elektu kiun agordaron uzi por hazardaj AIoj aŭ por komencaj valoroj dum aldonado de nova AI aŭ ludoskripto ###length 3 STR_CONFIG_SETTING_AI_PROFILE_EASY :Facila STR_CONFIG_SETTING_AI_PROFILE_MEDIUM :Mezfacila @@ -2363,6 +2368,7 @@ STR_NETWORK_CLIENT_LIST_PLAYER_NAME :{BLACK}Nomo STR_NETWORK_CLIENT_LIST_PLAYER_NAME_TOOLTIP :{BLACK}Via ludantnomo STR_NETWORK_CLIENT_LIST_PLAYER_NAME_EDIT_TOOLTIP :{BLACK}Ŝanĝu vian ludantonomon STR_NETWORK_CLIENT_LIST_PLAYER_NAME_QUERY_CAPTION :Via ludantnomo +STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP :{BLACK}Administraj agoj fareblaj por tiu ĉi kliento STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP :{BLACK}Administraj agoj fareblaj por tiu ĉi kompanio STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP :{BLACK}Aliĝu al tiu ĉi kompanio STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP :{BLACK}Sendu mesaĝon al tiu ĉi ludanto @@ -3038,6 +3044,12 @@ STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD # Framerate display window STR_FRAMERATE_CAPTION :{WHITE}Bildrapido STR_FRAMERATE_CAPTION_SMALL :{STRING}{WHITE} ({DECIMAL}x) +STR_FRAMERATE_RATE_GAMELOOP :{BLACK}Rapido de simulado: {STRING} +STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP :{BLACK}Nombro de tempopulsoj simulataj ĉiusekunde. +STR_FRAMERATE_RATE_BLITTER :{BLACK}Grafika bildrapido: {STRING} +STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK}Nombro de bildokadroj montrataj ĉiusekunde. +STR_FRAMERATE_SPEED_FACTOR :{BLACK}Nuna ludrapideca faktoro: {DECIMAL}x +STR_FRAMERATE_SPEED_FACTOR_TOOLTIP :{BLACK}Kiom rapide la ludo nun iras, kompare al la atendata rapideco je normala simuladrapido. STR_FRAMERATE_CURRENT :{WHITE}Nuna STR_FRAMERATE_AVERAGE :{WHITE}Averaĝa STR_FRAMERATE_MEMORYUSE :{WHITE}Memory @@ -3053,21 +3065,36 @@ STR_FRAMERATE_GRAPH_MILLISECONDS :{TINY_FONT}{COM STR_FRAMERATE_GRAPH_SECONDS :{TINY_FONT}{COMMA} s ###length 15 +STR_FRAMERATE_GAMELOOP :{BLACK}Luda iteracio ensume: STR_FRAMERATE_GL_ECONOMY :{BLACK} Traktado de ŝarĝoj: +STR_FRAMERATE_GL_TRAINS :{BLACK} Trajnaj tempopulsoj: +STR_FRAMERATE_GL_ROADVEHS :{BLACK} Stratveturilaj tempopulsoj: +STR_FRAMERATE_GL_SHIPS :{BLACK} Ŝipaj tempopulsoj: +STR_FRAMERATE_GL_AIRCRAFT :{BLACK} Aviadilaj tempopulsoj: +STR_FRAMERATE_GL_LANDSCAPE :{BLACK} Mondaj tempopulsoj: STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Ligografea prokrasto: STR_FRAMERATE_DRAWING :{BLACK}Grafika bildigo: +STR_FRAMERATE_DRAWING_VIEWPORTS :{BLACK} Mondaj vidujoj: STR_FRAMERATE_VIDEO :{BLACK}Videa eligo: STR_FRAMERATE_SOUND :{BLACK}Sonmiksado: +STR_FRAMERATE_ALLSCRIPTS :{BLACK} Ludoskriptoj/AI ensume: STR_FRAMERATE_GAMESCRIPT :{BLACK} Ludoskripto: STR_FRAMERATE_AI :{BLACK} AI {NUM} {STRING} ###length 15 STR_FRAMETIME_CAPTION_GAMELOOP :Luda iteracio STR_FRAMETIME_CAPTION_GL_ECONOMY :Traktado de ŝarĝoj +STR_FRAMETIME_CAPTION_GL_TRAINS :Trajnaj tempopulsoj +STR_FRAMETIME_CAPTION_GL_ROADVEHS :Stratveturilaj tempopulsoj +STR_FRAMETIME_CAPTION_GL_SHIPS :Ŝipaj tempopulsoj +STR_FRAMETIME_CAPTION_GL_AIRCRAFT :Aviadilaj tempopulsoj +STR_FRAMETIME_CAPTION_GL_LANDSCAPE :Mondaj tempopulsoj STR_FRAMETIME_CAPTION_GL_LINKGRAPH :Ligografea prokrasto STR_FRAMETIME_CAPTION_DRAWING :Grafika bildigo +STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS :Bildigo de mondaj vidujoj STR_FRAMETIME_CAPTION_VIDEO :Videa eligo STR_FRAMETIME_CAPTION_SOUND :Sonmiksado +STR_FRAMETIME_CAPTION_ALLSCRIPTS :Ludoskriptoj/AIoj ensume STR_FRAMETIME_CAPTION_GAMESCRIPT :Ludoskripto STR_FRAMETIME_CAPTION_AI :AI {NUM} {STRING} @@ -3295,6 +3322,8 @@ STR_SPRITE_ALIGNER_MOVE_TOOLTIP :{BLACK}Movadi l STR_SPRITE_ALIGNER_CROSSHAIR :{BLACK}Celkruco +STR_SPRITE_ALIGNER_RESET_TOOLTIP :{BLACK}Restarigu la nunajn relativajn deŝovojn +STR_SPRITE_ALIGNER_OFFSETS_REL :{BLACK}X-deŝovo: {NUM}, Y-deŝovo: {NUM} (Relativa) STR_SPRITE_ALIGNER_PICKER_BUTTON :{BLACK}Elektu bildeto STR_SPRITE_ALIGNER_PICKER_TOOLTIP :{BLACK}Elektu bildeton ie el la ekrano @@ -3452,6 +3481,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{PUSH_COLOUR}{Y STR_GOALS_CAPTION :{WHITE}Celoj de {COMPANY} STR_GOALS_COMPANY_BUTTON :{BLACK}Kompanio STR_GOALS_COMPANY_BUTTON.n :{BLACK}Kompanion +STR_GOALS_COMPANY_BUTTON_HELPTEXT :{BLACK}Montru celojn de la kompanio STR_GOALS_TEXT :{ORANGE}{STRING} STR_GOALS_NONE :{ORANGE}- Nenia - STR_GOALS_PROGRESS :{ORANGE}{STRING} @@ -3526,7 +3556,10 @@ STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Montru s STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Ĉiumonata provizo kaj loka pritakso: STR_STATION_VIEW_CARGO_SUPPLY_RATING :{WHITE}{STRING}: {YELLOW}{COMMA} / {STRING} ({COMMA}%) STR_STATION_VIEW_GROUP :{BLACK}Grupigu laŭ +STR_STATION_VIEW_WAITING_STATION :Stacio: Atendanta +STR_STATION_VIEW_WAITING_AMOUNT :Kvanto: Atendanta STR_STATION_VIEW_PLANNED_STATION :Stacio: Planata +STR_STATION_VIEW_PLANNED_AMOUNT :Kvanto: Planita STR_STATION_VIEW_FROM :{YELLOW}{CARGO_SHORT} de {STATION} STR_STATION_VIEW_VIA :{YELLOW}{CARGO_SHORT} tra {STATION} STR_STATION_VIEW_TO :{YELLOW}{CARGO_SHORT} al {STATION} @@ -4299,6 +4332,7 @@ STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Resta vivo (jar STR_ORDER_CONDITIONAL_MAX_RELIABILITY :Maksimuma fidindeco ###next-name-looks-similar +STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}Kiel kompari la veturilajn datumoj al la donita valoro STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :egalas al STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS :ne egalas al STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN :estas malpli ol @@ -4437,6 +4471,7 @@ STR_TIMETABLE_CHANGE_TIME :{BLACK}Ŝanĝu STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Ŝanĝu kiom da tempo devus postuli la markita ordono. Stir+Klak ŝanĝas la tempon por ĉiuj ordonoj STR_TIMETABLE_CLEAR_TIME :{BLACK}Vakigi tempon +STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Forviŝu la tempokvanton por la markita ordono. Ctrl+Klak forviŝas tempokvantojn por ĉiuj ordonoj STR_TIMETABLE_CHANGE_SPEED :{BLACK}Ŝanĝu rapideclimon STR_TIMETABLE_CHANGE_SPEED_TOOLTIP :{BLACK}Ŝanĝu la maksimuman veturrapidecon de la markita ordono. Stir+Klak ŝanĝas la rapidecon por ĉiuj ordonoj @@ -4448,6 +4483,7 @@ STR_TIMETABLE_RESET_LATENESS :{BLACK}Reigu ma STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Reigu malfruan kalkulumon, tiel la veturilon estos akuratan STR_TIMETABLE_AUTOFILL :{BLACK}Aŭtomata plenigo +STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Aŭtomate plenigu la horaron per la valoroj de la sekva iro. Ctrl+Klak por klopodi konservi atendodaŭrojn STR_TIMETABLE_EXPECTED :{BLACK}Atendite STR_TIMETABLE_SCHEDULED :{BLACK}Planite @@ -4467,7 +4503,7 @@ STR_DATE_YEAR_TOOLTIP :{BLACK}Elekti j # AI debug window -STR_AI_DEBUG :{WHITE}AI/Ludo Skripto Sencimigo +STR_AI_DEBUG :{WHITE}AI/Ludoskripta Sencimigo STR_AI_DEBUG_NAME_AND_VERSION :{BLACK}{STRING} (v{NUM}) STR_AI_DEBUG_NAME_TOOLTIP :{BLACK}Nomo de la skripto STR_AI_DEBUG_SETTINGS :{BLACK}Agordoj @@ -4485,11 +4521,14 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Vidu for STR_AI_GAME_SCRIPT :{BLACK}Ludoskripto STR_AI_GAME_SCRIPT_TOOLTIP :{BLACK}Kontrolu la ludoskriptan protokolon +STR_ERROR_AI_NO_AI_FOUND :Neniu taŭga AI estas ŝarĝebla.{}Tiu ĉi AI estas lokokupa AI kiu nenion faros.{}Vi povas elŝuti pliajn AIojn per la 'Enreta Enhavo'-sistemo +STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Unu el la rulantaj skriptoj paneis. Bonvolu raporti tion ĉi al la aŭtoro de la skripto kun ekrankapto de la fenestro 'AI/Ludoskripta Sencimigo' # AI configuration window STR_AI_CONFIG_CAPTION_AI :{WHITE}AI-agordoj STR_AI_CONFIG_CAPTION_GAMESCRIPT :{WHITE}Ludoskriptaj agordoj STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Ludoskripto ŝarĝota en la sekva ludo +STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}La AIoj ŝarĝotaj en la sekva ludo STR_AI_CONFIG_HUMAN_PLAYER :Homa ludanto STR_AI_CONFIG_RANDOM_AI :Hazarda AI STR_AI_CONFIG_NONE :(neniu) @@ -4504,11 +4543,13 @@ STR_AI_CONFIG_GAMESCRIPT :{SILVER}Ludoskr STR_AI_CONFIG_GAMESCRIPT_PARAM :{SILVER}Parametroj STR_AI_CONFIG_AI :{SILVER}AIj +STR_AI_CONFIG_CHANGE_AI :{BLACK}Elektu AIon STR_AI_CONFIG_CHANGE_GAMESCRIPT :{BLACK}Elektu ludoskripton STR_AI_CONFIG_CONFIGURE :{BLACK}Agordi STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Agordi parametroj de la skripto # Available AIs window +STR_AI_LIST_CAPTION :{WHITE}Haveblaj {STRING} STR_AI_LIST_CAPTION_AI :AIoj STR_AI_LIST_CAPTION_GAMESCRIPT :Ludoskriptoj STR_AI_LIST_TOOLTIP :{BLACK}Klaki por elekti skripto @@ -5478,6 +5519,8 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} +STR_JUST_STRING1.n :{STRING.n} +STR_JUST_STRING2.n :{STRING.n} STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} STR_JUST_BIG_RAW_STRING :{BIG_FONT}{STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 2284b2cac0..38fd9fd2ba 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -181,7 +181,7 @@ STR_COLOUR_LIGHT_BLUE :Vaaleansininen STR_COLOUR_GREEN :Vihreä STR_COLOUR_DARK_GREEN :Tummanvihreä STR_COLOUR_BLUE :Sininen -STR_COLOUR_CREAM :Kerma +STR_COLOUR_CREAM :Kermankeltainen STR_COLOUR_MAUVE :Malvanvärinen STR_COLOUR_PURPLE :Violetti STR_COLOUR_ORANGE :Oranssi @@ -4406,7 +4406,7 @@ STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Lopeta k STR_ORDERS_GO_TO_BUTTON :{BLACK}Mene STR_ORDER_GO_TO_NEAREST_DEPOT :Mene lähimmälle varikolle -STR_ORDER_GO_TO_NEAREST_HANGAR :Mene lähimmälle varikolle +STR_ORDER_GO_TO_NEAREST_HANGAR :Mene lähimpään lentokonehalliin STR_ORDER_CONDITIONAL :Ehdollinen hyppykäsky STR_ORDER_SHARE :Jaa käskyt STR_ORDERS_GO_TO_TOOLTIP :{BLACK}Lisää uuden käskyn ennen valittua, tai lisää listan viimeiseksi. Ctrl:n painalluksella asemakäskyistä tulee ”lastaa täyteen mikä tahansa rahti”, reittipistekäskyistä ”pysähtymättä” ja varikkokäskyistä ”huolto”. ”Jaa käskyt” tai Ctrl jakaa käskyt valitun kulkuneuvon kanssa. Kulkuneuvon napsauttaminen kopioi käskyt kyseisestä kulkuneuvosta. Varikkokäsky estää kulkuneuvon automaattiset huollot @@ -4421,7 +4421,7 @@ STR_ORDER_SERVICE_AT :Huolto STR_ORDER_SERVICE_NON_STOP_AT :Huolto pysäytyksettä STR_ORDER_NEAREST_DEPOT :lähin -STR_ORDER_NEAREST_HANGAR :lähin varikko +STR_ORDER_NEAREST_HANGAR :lähin lentokonehalli ###length 3 STR_ORDER_TRAIN_DEPOT :Veturitalli STR_ORDER_ROAD_VEHICLE_DEPOT :Varikko diff --git a/src/lang/french.txt b/src/lang/french.txt index ca51891c07..6c82aac9a3 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -997,21 +997,21 @@ STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Cocher c STR_GAME_OPTIONS_RESOLUTION :{BLACK}Résolution STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Sélectionner la résolution d'écran à utiliser -STR_GAME_OPTIONS_RESOLUTION_OTHER :autre +STR_GAME_OPTIONS_RESOLUTION_OTHER :Autre STR_GAME_OPTIONS_RESOLUTION_ITEM :{NUM}x{NUM} -STR_GAME_OPTIONS_VIDEO_ACCELERATION :{BLACK} Accélération matérielle +STR_GAME_OPTIONS_VIDEO_ACCELERATION :{BLACK}Accélération matérielle STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP :{BLACK}Cochez cette case permet à OpenTTD d'utiliser l'accélération matérielle, si possible. Un paramètre modifié ne sera pris en compte qu'au redémarrage du jeu STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Les paramètres ne prendront effet qu'après le redémarrage du jeu STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync -STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Cochez cette case pour activer la synchronisation verticale de l'écran. La modification de ce paramètres ne sera effective qu'après le redémarrage du jeu. Fonctionne uniquement si l’accélération matérielle est active +STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Cochez cette case pour activer la synchronisation verticale de l'écran. La modification de ce paramètre ne sera effective qu'après le redémarrage du jeu. Fonctionne uniquement si l’accélération matérielle est active. STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Pilote actif{NBSP}: {STRING} STR_GAME_OPTIONS_GUI_SCALE_FRAME :Taille de l'interface STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP :{BLACK}Faites glisser la souris pour définir la taille de l'interface. Maintenir Ctrl pour un réglage en continu -STR_GAME_OPTIONS_GUI_SCALE_AUTO :détection automatique de la taille +STR_GAME_OPTIONS_GUI_SCALE_AUTO :Détection automatique de la taille STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP :{BLACK}Cochez cette case pour détecter automatiquement la taille de l'interface STR_GAME_OPTIONS_GUI_SCALE_BEVELS :{BLACK}Mettre à l’échelle les bordures @@ -1025,7 +1025,7 @@ STR_GAME_OPTIONS_GUI_SCALE_5X :x5 STR_GAME_OPTIONS_GRAPHICS :{BLACK} Graphiques -STR_GAME_OPTIONS_REFRESH_RATE :{BLACK} Taux de rafraîchissement de l'affichage +STR_GAME_OPTIONS_REFRESH_RATE :{BLACK}Taux de rafraîchissement de l'affichage STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP :{BLACK} Sélectionnez la fréquence de rafraîchissement à utiliser STR_GAME_OPTIONS_REFRESH_RATE_ITEM :{NUM}Hz STR_GAME_OPTIONS_REFRESH_RATE_WARNING :{WHITE} Les taux de rafraîchissement supérieurs à 60Hz peuvent avoir un impact sur les performances. @@ -2073,7 +2073,7 @@ STR_INTRO_GAME_OPTIONS :{BLACK}Options STR_INTRO_HIGHSCORE :{BLACK}Meilleurs scores STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Paramètres de jeu STR_INTRO_NEWGRF_SETTINGS :{BLACK}Paramètres NewGRF -STR_INTRO_ONLINE_CONTENT :{BLACK}Contenue additionnel en ligne +STR_INTRO_ONLINE_CONTENT :{BLACK}Contenu additionnel en ligne STR_INTRO_AI_SETTINGS :{BLACK}Configuration des IAs STR_INTRO_GAMESCRIPT_SETTINGS :{BLACK}Configuration du script de jeu STR_INTRO_QUIT :{BLACK}Quitter diff --git a/src/lang/german.txt b/src/lang/german.txt index be4d7a0a5f..c16edb4d69 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -344,9 +344,9 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Auftrags ###length 31 STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Spiel anhalten STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Zeitraffer (Zeit vergeht schnellstmöglich) -STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Einstellungen -STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Spiel speichern, Spiel laden, Spiel abbrechen, (OpenTTD) Beenden -STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Weltkarte, zusätzliche Fenster oder Schilderliste anzeigen +STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Optionen und Einstellungen +STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Spiel speichern, laden oder abbrechen, Programm beenden +STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Weltkarte, zusätzliche Fenster, Warenfluss oder Schilderliste anzeigen STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Städteverzeichnis anzeigen STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Subventionen anzeigen STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Liste der firmeneigenen Stationen anzeigen @@ -354,9 +354,9 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES :{BLACK}Firmenfi STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL :{BLACK}Allgemeine Firmeninformationen anzeigen STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK :{BLACK}Zeigt die Chronik an STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST :{BLACK}Zeigt die von einem Spielskript festgelegten Ziele an -STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Diagramme anzeigen +STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Firmendiagramme und Frachtraten anzeigen STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Firmentabelle oder Punktestand anzeigen -STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Liste aller Industrien oder Errichtung und Finanzierung einer neuen Industrie +STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Industrien betrachten oder den Bau einer neuen Industrie finanzieren STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Zuglisten der Firmen anzeigen. Strg+Klick wechselt zwischen einfacher und erweiterter Liste STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Fahrzeuglisten der Firmen anzeigen. Strg+Klick wechselt zwischen einfacher und erweiterter Liste STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Schiffslisten der Firmen anzeigen. Strg+Klick wechselt zwischen einfacher und erweiterter Liste @@ -370,8 +370,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Häfen u STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Flughäfen bauen STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Landschaftsbau: Land heben/senken, Bäume pflanzen etc. STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Sound-/Musikfenster anzeigen -STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Zeige letzte Mitteilung/Nachricht, Nachrichtenoptionen anzeigen -STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Gebietsinformation, Konsole, KI- und Skript-Debug, Screenshots, über OpenTTD +STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Zeige letzte Mitteilung/Nachricht, Nachrichtenhistorie oder lösche alle Nachrichten +STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Gebietsinformation, Screenshot, über OpenTTD und Entwicklerwerkzeuge STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Werkzeugleisten wechseln # Extra tooltips for the scenario editor toolbar @@ -1531,7 +1531,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Grau zu rot STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Graustufe STR_CONFIG_SETTING_SCROLLMODE :Verhalten beim Verschieben der Zusatzansicht: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Verhalten beim Verschieben der Karte +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Verhalten beim Verschieben der Karte. Die „Mausposition gesperrt“-Optionen funktionieren nicht auf allen Systemen, wie den webbasierten Versionen, Touchscreens, Linux mit Wayland und anderen ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Bewege Zusatzansicht mit rechter Maustaste, Mausposition fixiert STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Bewege die Karte mit rechter Maustaste, Mausposition fixiert @@ -1712,7 +1712,7 @@ STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT :Wie viel Arbeit STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE :{COMMA} MiB STR_CONFIG_SETTING_SERVINT_ISPERCENT :Wartungsintervalle in Prozent: {STRING} -STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Lege fest, ob Fahrzeuge zur Wartung geschickt werden basierend auf der verstrichenen Zeit seit der letzten Wartung oder dem Absinken der Zuverlässigkeit auf einen gewissen Prozentsatz der maximalen Zuverlässigkeit des Fahrzeugtyps +STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Falls aktiviert, werden Fahrzeuge versuchen, sich in die Wartung zu begeben, sobald ihre Zuverlässigkeit unter einer bestimmten Prozentzahl unterhalb der maximalen Zuverlässigkeit liegt.{}{}Zum Beispiel: Wenn die maximale Zuverlässigkeit eines Fahrzeugs 90% beträgt und das Wartungsintervall bei 20% liegt, wird das Fahrzeug versuchen, sich in die Wartung zu begeben, sobald es eine Zuverlässigkeit von 72% erreicht. STR_CONFIG_SETTING_SERVINT_TRAINS :Standard-Wartungsintervall für Züge: {STRING} STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT :Setze das Standardwartungsintervall für Schienenfahrzeuge. Dieses Wartungsintervall wird von allen Zügen eingehalten, denen kein individuelles Wartungsintervall zugewiesen worden ist @@ -2057,6 +2057,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Reservie # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Fehler mit den Grafikeinstellungen ... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... keine kompatible GPU gefunden. Hardwarebeschleunigung deaktiviert +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}… GPU-Treiber brachte das Spiel zum Absturz. Hardwarebeschleunigung deaktiviert # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -5088,6 +5089,7 @@ STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE :{WHITE}... Luft STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Fahrplan kann nicht erstellt werden ... STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Fahrzeuge halten nur an Stationen STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Das Fahrzeug hält nicht an dieser Station +STR_ERROR_TIMETABLE_INCOMPLETE :{WHITE}... Fahrplan ist unvollständig # Sign related errors STR_ERROR_TOO_MANY_SIGNS :{WHITE}... zu viele Schilder diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index e0d0173f02..8732b8e8bd 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -343,8 +343,8 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Buka tam ###length 31 STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Hentikan sementara permainan STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Percepat maju waktu permainan -STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opsi -STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Simpan, batalkan, keluar permainan +STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opsi dan pengaturan +STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Simpan, tinggalkan, keluar OpenTTD STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Tampilkan peta, tambahan viewport atau daftar pengenal STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Tampilkan daftar kota STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Tampilkan subsidi @@ -370,7 +370,7 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Membangu STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Buka toolbar lansekap untuk menaik-turunkan tanah, menanam pohon, dsb. STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Tampilkan jendela suara/musik STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Tampilkan pesan/berita terkini, tampilkan pilihan berita -STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informasi area daratan, konsol, AI debug, pengambilan gambar, dan tentang OpenTTD +STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informasi area daratan, pengambilan gambar, tentang OpenTTD dan alat pengembangan STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Berpindah toolbar # Extra tooltips for the scenario editor toolbar @@ -1206,6 +1206,7 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT :Kanan STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Maksimum pinjaman awal: {STRING} STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Jumlah maksimum yang dapat dipinjam (tanpa menghitung inflasi) +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{CURRENCY_LONG} ###setting-zero-is-special STR_CONFIG_SETTING_INTEREST_RATE :Bunga pinjaman: {STRING} @@ -2699,6 +2700,10 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Tambah k STR_SELECT_RAIL_BRIDGE_CAPTION :{WHITE}Pilih Jembatan Rel STR_SELECT_ROAD_BRIDGE_CAPTION :{WHITE}Pilih Jembatan STR_SELECT_BRIDGE_SELECTION_TOOLTIP :{BLACK}Pilihan jembatan - Klik pada jembatan yang ingin anda bangun +STR_SELECT_BRIDGE_INFO_NAME :{GOLD}{STRING} +STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED :{GOLD}{STRING},{} {VELOCITY} +STR_SELECT_BRIDGE_INFO_NAME_COST :{GOLD}{0:STRING},{} {WHITE}{2:CURRENCY_LONG} +STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG} STR_BRIDGE_NAME_SUSPENSION_STEEL :Suspensi, Baja STR_BRIDGE_NAME_GIRDER_STEEL :Balok, Baja STR_BRIDGE_NAME_CANTILEVER_STEEL :Beton, Baja @@ -5081,6 +5086,7 @@ STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE :{WHITE}... pesa STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Tidak dapat membuat jadwal keberangkatan kendaraan... STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Kendaran hanya dapat menunggu di stasiun STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Kendaraan tidak berhenti pada stasiun ini +STR_ERROR_TIMETABLE_INCOMPLETE :{WHITE}... Jadway tidak kompatibel # Sign related errors STR_ERROR_TOO_MANY_SIGNS :{WHITE}... terlalu banyak tanda diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 8fca20e48f..762227455b 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1565,7 +1565,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Grigio a rosso STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Scala di grigi STR_CONFIG_SETTING_SCROLLMODE :Scorrimento delle visuali: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamento dello scorrimento della mappa +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamento durante lo scorrimento della mappa. Le opzioni "posizione del mouse bloccata" non funzionano su tutti i sistemi, come le versioni basate sul web, gli schermi tattili, Linux con Wayland e altri. ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Muovi visuale col pulsante destro, puntatore bloccato STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Muovi mappa col pulsante destro, puntatore bloccato @@ -2091,6 +2091,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Impossib # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Errore nelle impostazioni video... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... non è stata trovata alcuna GPU compatibile. L'accelerazione hardware è stata disabilitata +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Il driver della GPU ha mandato in crash il gioco. Accelerazione hardware disattivata # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 053b0f4605..a21197de80 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -833,7 +833,7 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Stawki płatno # Company league menu ###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Ranking firm -STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Szczegółowa tabela wydajności +STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Szczegóły oceny wydajności STR_GRAPH_MENU_HIGHSCORE :Tabela wyników # Industry menu @@ -1910,7 +1910,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Od szarego do c STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Skala szarości STR_CONFIG_SETTING_SCROLLMODE :Zachowanie przeciągania okna podglądu: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Zachowanie podczas przeciągania mapy +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Zachowanie podczas przeciągania mapy. Opcje „pozycja myszy zablokowana” nie działają na systemach, takich jak wersje internetowe, ekrany dotykowe, Linux z Waylandem i innych ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Przeciągnij okno podglądu prawym przyciskiem myszy, pozycja myszy zablokowana STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Przeciągnij mapę prawym przyciskiem myszy, pozycja myszy zablokowana @@ -2436,6 +2436,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Nie powi # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Błąd ustawień obrazu... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... nie znaleziono kompatybilnego procesora graficznego. Przyspieszenie sprzętowe wyłączone. +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Sterownik GPU spowodował awarię gry. Wyłączono akcelerację sprzętową # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -2927,7 +2928,7 @@ STR_CONTENT_NO_ZLIB :{WHITE}OpenTTD STR_CONTENT_NO_ZLIB_SUB :{WHITE}... pobieranie zawartości nie jest możliwe! # Order of these is important! -STR_CONTENT_TYPE_BASE_GRAPHICS :Grafiki bazowe +STR_CONTENT_TYPE_BASE_GRAPHICS :Podstawowa grafika STR_CONTENT_TYPE_NEWGRF :NewGRF STR_CONTENT_TYPE_AI :SI STR_CONTENT_TYPE_AI_LIBRARY :Biblioteka SI diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 6f520ec766..19be854a06 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -253,7 +253,7 @@ STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Título STR_TOOLTIP_SHADE :{BLACK}Encolher janela - apenas mostra a barra de título STR_TOOLTIP_DEBUG :{BLACK}Mostrar informação de depuração de NewGRF STR_TOOLTIP_DEFSIZE :{BLACK}Redimensionar a janela para o tamanho padrão. Ctrl+Clique para guardar o tamanho atual como padrão -STR_TOOLTIP_STICKY :{BLACK}Marcar esta janela como não-encerrável pela tecla 'Fechar Todas as Janelas'. Ctrl+Clique para tambem salvar o estado como por omissão +STR_TOOLTIP_STICKY :{BLACK}Marcar esta janela como não-encerrável pela tecla 'Fechar Todas as Janelas'. Ctrl+Clique também guarda o estado como padrão. STR_TOOLTIP_RESIZE :{BLACK}Clique e arraste para reajustar janela STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Alternar entre janela grande/pequena STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Barra de deslize - desloca a lista para cima/baixo @@ -455,7 +455,7 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tarifas por car # Company league menu ###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Classificação de empresas -STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Avaliação detalhada +STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Classificação detalhada de desempenho STR_GRAPH_MENU_HIGHSCORE :Tabela de classificações # Industry menu @@ -603,8 +603,8 @@ STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COM STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Gráfico do Lucro Operacional STR_GRAPH_INCOME_CAPTION :{WHITE}Gráfico de Rendimentos STR_GRAPH_CARGO_DELIVERED_CAPTION :{WHITE}Unidades de carga entregues -STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION :{WHITE}Avaliações da empresa (máximo=1000) STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Valor da empresa +STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION :{WHITE}Classificações do desempenho da empresa (máximo=1000) STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Tarifas por carga STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Dias em trânsito @@ -616,7 +616,7 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Não mos STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Mostrar/ocultar gráfico para o tipo de carga STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING} -STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Exibir detalhes de rendimentos +STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Exibir classificações detalhadas de desempenho # Graph key window STR_GRAPH_KEY_CAPTION :{WHITE}Chave dos gráficos da empresa @@ -1177,7 +1177,7 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :Configuração STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :Configuração do jogo (guardado; afeta apenas novos jogos) STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :Configuração do jogo (guardado; afeta apenas jogo atual) STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :Configurações de empresa (guardado; afeta apenas novos jogos) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :Configurações de empresa (guardado; afeta apenas companhia actual) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :Configurações de empresa ( armazenado em guardar; afeta apenas empresa atual) STR_CONFIG_SETTINGS_NONE :{WHITE}- Nenhum - ###length 3 @@ -1206,7 +1206,7 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER :Centro STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT :Direita STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Valor máximo do empréstimo inicial: {STRING} -STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Quantia máxima que uma companhia pode pedir (sem ter em conta a inflação) +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Valor máximo do empréstimo para cada empresa (sem ter em conta a inflação) STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{CURRENCY_LONG} ###setting-zero-is-special STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :Sem empréstimo {RED}Requer Script de Jogo para fornecer fundos iniciais @@ -1246,7 +1246,7 @@ STR_CONFIG_SETTING_DISASTERS :Desastres: {STR STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Ativa desastres que podem ocasionalmente bloquear ou destruir veículos ou infraestruturas STR_CONFIG_SETTING_CITY_APPROVAL :Atitude da autoridade local: {STRING} -STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Escolha de que forma o ruído e dano ambiental causado pelas empresas afeta o rating da povoação e futuras ações de construção nessa povoação +STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Escolha de que forma o ruído e os danos ambientais causados pelas empresas afetam a classificação da sua localidade e futuras ações de construção na localidade STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Limite de altura do mapa: {STRING} STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT :Define a altura máxima do terreno do mapa. Com "(auto)" um bom valor será escolhido após a geração do terreno @@ -1261,8 +1261,8 @@ STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT :Permite altera STR_CONFIG_SETTING_CATCHMENT :Dimensionamento mais realista de áreas de abrangência: {STRING} STR_CONFIG_SETTING_CATCHMENT_HELPTEXT :Haver diferentes áreas de cobertura para diferentes tipos de estações e aeroportos -STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES :Estações da companhia podem servir industrias equipadas com estações neutras: {STRING} STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT :Quando ativo, industrias com estações incluídas (com as Petrolíferas) podem ser servidas por estações da companhia construídas nas redondezas. Quando inativo, estas industrias só podem ser servidas pela sua própria estação. Qualquer estação da companhia não poderá servir a industria, nem a estação incluída pode servir outra entidade senão a própria industria +STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES :Estações da empresa podem servir indústrias com estações neutras anexadas: {STRING} STR_CONFIG_SETTING_EXTRADYNAMITE :Permite remover mais estradas, pontes e túneis detidos pela cidade: {STRING} STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT :Facilitar a remoçar de edifícios e infraestruturas detidas pela localidade @@ -1347,7 +1347,7 @@ STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT :Visualizador pr STR_CONFIG_SETTING_AUTOSCROLL_EVERY_VIEWPORT :Todos os visualizadores STR_CONFIG_SETTING_BRIBE :Permite o suborno da autoridade local: {STRING} -STR_CONFIG_SETTING_BRIBE_HELPTEXT :Permite que as companhias tentem subornar a autoridade local. Se o suborno for descoberto por um inspector, a companhia não poderá construir nessa localidade durante seis meses +STR_CONFIG_SETTING_BRIBE_HELPTEXT :Permite que as empresas tentem subornar a autoridade local. Se o suborno for descoberto por um inspetor, a empresa não poderá atuar nessa localidade durante seis meses STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :Permite comprar direitos de transporte em exclusividade: {STRING} STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT :Se uma empresa compra direitos exclusivos de transporte para uma localidade, as estações dos concorrentes (passageiros e carga) não receberão cargo durante um ano @@ -1356,7 +1356,7 @@ STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Permite investi STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT :Permite que empresas doem dinheiro às localidades para financiar novas casas STR_CONFIG_SETTING_ALLOW_FUND_ROAD :Permite financiar a reconstrução de estradas locais:{STRING} -STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT :Permite que as companhias financiem reparações de estrada para sabotar serviços rodoviários dos oponentes. +STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT :Permite que as empresas financiem reconstruções de estradas para sabotar o tráfego rodoviário na localidade. STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :Permite enviar dinheiro para outras empresas: {STRING} STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT :Permite transferências de dinheiro entre empresas em modo multi-jogador @@ -1377,12 +1377,12 @@ STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL :Normal STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :Permite estações de passagem em estradas das localidades: {STRING} STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT :Permite construção de paragens drive-through em ruas que são prorpiedade das povoações -STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :Permite estações de passagem em estradas do adversário: {STRING} -STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT :Permite construção de paragens drive-through em ruas que são prorpiedade de outras companhias +STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :Permitir estações de passagem nas estradas detidas pelos competidores: {STRING} +STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT :Permite a construção de estações de passagem nas estradas que são de outras empresas STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Não é possível mudar quando já existem veículos. STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE :Manutenção de infraestruturas: {STRING} -STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT :Quando ativo, as infraestruturas têm custos de manutenção. O custo cresce mais do que proporcionalmente com o tamanho da rede e com isso afeta mais as companhias maiores comparando com as mais pequenas +STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT :Quando ativo, as infraestruturas têm custos de manutenção. O custo cresce mais do que o proporcional com o tamanho da rede e assim afeta mais as empresas maiores do que as mais pequenas STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR :Cor inicial da empresa: {STRING} STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT :Escolher a cor inicial da empresa @@ -1429,7 +1429,7 @@ STR_CONFIG_SETTING_HOVER_DELAY_VALUE :Parar o rato po STR_CONFIG_SETTING_HOVER_DELAY_DISABLED :Clique com botão direito STR_CONFIG_SETTING_POPULATION_IN_LABEL :Mostra população da localidade na identificação da mesma: {STRING} -STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Mostrar a população das povoações na sua etiqueta no mapa +STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Mostrar a população das localidades na sua etiqueta no mapa STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Grossura das linhas nos gráficos: {STRING} STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Largura da linha nos gráficos. Uma linha mais estreita é de leitura mais precisa, enquanto uma linha mais espessa é mais fácil de ver e as cores distinguem-se melhor. @@ -1545,14 +1545,14 @@ STR_CONFIG_SETTING_MEASURE_TOOLTIP :Mostrar medidas STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT :Mostrar distâncias em quadrados e diferenças de altura enquanto arrasta o rato durante tarefas de construção STR_CONFIG_SETTING_LIVERIES :Mostrar estampagens da empresa: {STRING} -STR_CONFIG_SETTING_LIVERIES_HELPTEXT :Controlar a utilização de decorações específicas por tipo de veículo (em vez de decorações por companhia) +STR_CONFIG_SETTING_LIVERIES_HELPTEXT :Controla a utilização de decorações específicas por tipo de veículo (em vez de decorações por empresa) ###length 3 STR_CONFIG_SETTING_LIVERIES_NONE :Nenhum STR_CONFIG_SETTING_LIVERIES_OWN :Própria empresa STR_CONFIG_SETTING_LIVERIES_ALL :Todas as empresas STR_CONFIG_SETTING_PREFER_TEAMCHAT :Escolher chat de equipa com : {STRING} -STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT :Trocar o mapeamento do chat da companhia e do chat público para e respectivamente +STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT :Trocar o mapeamento entre o chat interno da empresa e o chat público para e respetivamente STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER :Velocidade da roda do rato no mapa: {STRING} STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER_HELPTEXT :Controlo de sensibilidade da roda de rolagem do rato @@ -1672,16 +1672,16 @@ STR_CONFIG_SETTING_SOUND_AMBIENT :Ambiente: {STRI STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT :Reproduzir efeitos sonoros da paisagem, indústrias e localidades STR_CONFIG_SETTING_MAX_TRAINS :Máximo de comboios por empresa: {STRING} -STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :Número máximo de comboios que uma companhia pode ter +STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :Número máximo de comboios que uma empresa pode ter STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Máximo de veículos rodoviários por empresa: {STRING} -STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :Número máximo de veículos de estrada que uma companhia pode ter +STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :Número máximo de veículos de estrada que uma empresa pode ter STR_CONFIG_SETTING_MAX_AIRCRAFT :Máximo de aeronaves por empresa: {STRING} -STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :Número máximo de aeronaves que uma companhia pode ter +STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :Número máximo de aeronaves que uma empresa pode ter STR_CONFIG_SETTING_MAX_SHIPS :Máximo de navios por empresa: {STRING} -STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Número máximo de navios que uma companhia pode ter +STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Número máximo de navios que uma empresa pode ter STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Desativar comboios para o computador: {STRING} STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT :Ativar esta preferência impossibilita a criação de comboios por jogadores controlados pelo computador @@ -1852,7 +1852,7 @@ STR_CONFIG_SETTING_NOISE_LEVEL :Permitir que a STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT :Com esta preferência desativada, podem haver dois aeroportos em cada localidade. Com esta preferência ativa, o número de aeroportos numa localidade é limitado pela aceitação do ruído na mesma, que depende da população, do tamanho do aeroporto e da sua distância STR_CONFIG_SETTING_TOWN_FOUNDING :Fundar localidades no jogo: {STRING} -STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Ativar esta preferência permite aos jogadores fundar novas povoações no jogo +STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Ativar esta preferência permite aos jogadores fundar novas localidades no jogo ###length 3 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN :Proibido STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Permitido @@ -1881,8 +1881,8 @@ STR_CONFIG_SETTING_SNAP_RADIUS_HELPTEXT :Distância entr STR_CONFIG_SETTING_SNAP_RADIUS_VALUE :{COMMA} pixel{P 0 "" s} ###setting-zero-is-special STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED :Desligado -STR_CONFIG_SETTING_SOFT_LIMIT :Número máximo de janelas não-pegajosas: {STRING} -STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT :Número de janelas não-pegajosas abertas antes que janelas antigas comecem a ser fechadas para dar lugar a novas janelas +STR_CONFIG_SETTING_SOFT_LIMIT :Número máximo de janelas não-coladas: {STRING} +STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT :Número de janelas abertas não-coladas antes que as janelas antigas sejam automaticamente fechadas para dar lugar a novas janelas STR_CONFIG_SETTING_SOFT_LIMIT_VALUE :{COMMA} ###setting-zero-is-special STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED :desligado @@ -2137,7 +2137,7 @@ STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Exibir e STR_LIVERY_SHIP_TOOLTIP :{BLACK}Exibir esquemas de cores dos navios STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Exibir esquema de cores da aeronave STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Seleccione a cor primária para o veículo seleccionado. Ctrl+Clique vai usar esta cor para todos os esquemas -STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Seleccione a cor secundária para o esquema seleccionado. Ctrl+Click afetará esta escolha para todos os esquemas +STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Selecione a cor secundária para o esquema selecionado. Ctrl+Clique seleciona essa cor para todos os esquemas STR_LIVERY_PANEL_TOOLTIP :{BLACK}Seleccione o esquema de cores a alterar, ou esquemas múltiplos utilizando a tecla Ctrl com o botão esquerdo do rato. Marque a caixa para comutar a utilização do esquema de cores ###length 23 @@ -2248,7 +2248,7 @@ STR_NETWORK_SERVER_LIST_YEARS_CAPTION :{BLACK}Anos STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP :{BLACK}Número de anos{}que o jogo vai durar STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP :{BLACK}Idioma, versão do servidor, etc. -STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT :{BLACK}Clique num jogo da lista para o seleccionar +STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT :{BLACK}Clique num jogo da lista para o selecionar STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER :{BLACK}O servidor em que entraste na última vez: STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST :{BLACK}Clique para indicar o servidor que jogaste a última vez @@ -2599,7 +2599,7 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Definir STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Legenda de Fluxo de Carga STR_LINKGRAPH_LEGEND_ALL :{BLACK}Todos STR_LINKGRAPH_LEGEND_NONE :{BLACK}Nenhuma -STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Selecione as companhias a serem mostradas +STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Selecione as empresas a serem exibidas STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP :{BLACK}{STRING}{}{COMPANY} # Linkgraph legend window and linkgraph legend in smallmap @@ -3368,7 +3368,7 @@ STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :ficheiro GRF co STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Demasiados NewGRFs carregados. STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC :Carregar {1:STRING} como NewGRF estático com {2:STRING} pode causar dessincronização STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Gráfico inválido (sprite {3:NUM}) -STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Propriedade Action 0 desconhecida {4:HEX} (sprite {3:NUM}) +STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Propriedade de Ação 0 desconhecida {4:HEX} (sprite {3:NUM}) STR_NEWGRF_ERROR_INVALID_ID :Tentativa de uso de ID Inválido (sprite {3:NUM}) STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}{STRING} contém um objecto gráfico corrompido. Todos os objectos gráficos corrompidos serão apresentados como um ponto de interrogação (?) vermelho. STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :Contém múltiplas entradas Action 8 - (sprite {3:NUM}) @@ -3480,7 +3480,7 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON :Renomear Locali STR_LOCAL_AUTHORITY_CAPTION :{WHITE}{TOWN} autoridade local STR_LOCAL_AUTHORITY_ZONE :{BLACK}Zona STR_LOCAL_AUTHORITY_ZONE_TOOLTIP :{BLACK}Mostrar a zona dentro dos limites da autoridade local -STR_LOCAL_AUTHORITY_COMPANY_RATINGS :{BLACK}Avaliações da empresa de transporte: +STR_LOCAL_AUTHORITY_COMPANY_RATINGS :{BLACK}Classificações de empresas de transporte: STR_LOCAL_AUTHORITY_COMPANY_RATING :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING} STR_LOCAL_AUTHORITY_ACTIONS_TITLE :{BLACK}Acções disponíveis: STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP :{BLACK}Lista de acções disponíveis nesta localidade - fazer clique no item para mais detalhes @@ -3593,9 +3593,9 @@ STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceita: STR_STATION_VIEW_EXCLUSIVE_RIGHTS_SELF :{BLACK}Esta estação tem direitos de transporte exclusivos nesta localidade. STR_STATION_VIEW_EXCLUSIVE_RIGHTS_COMPANY :{YELLOW}{COMPANY}{BLACK} comprou direitos exclusivos de transporte nesta localidade. -STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Avaliações -STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Mostrar avaliações da estação -STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Abastecimento mensal e classificação local: +STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Classificações +STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Exibir classificações da estação +STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Fornecimento mensal e classificação local: STR_STATION_VIEW_CARGO_SUPPLY_RATING :{WHITE}{STRING}: {YELLOW}{COMMA} / {STRING} ({COMMA}%) STR_STATION_VIEW_GROUP :{BLACK}Agrupar por @@ -5165,7 +5165,7 @@ STR_INDUSTRY_NAME_FARM :{G=f}Quinta STR_INDUSTRY_NAME_COPPER_ORE_MINE :{G=f}Mina de Cobre STR_INDUSTRY_NAME_OIL_WELLS :{G=mp}Poços de Petróleo STR_INDUSTRY_NAME_BANK :{G=m}Banco -STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT :{G=f}Companhia Alimentar +STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT :Indústria Alimentar STR_INDUSTRY_NAME_PAPER_MILL :{G=f}Fábrica de Papel STR_INDUSTRY_NAME_GOLD_MINE :{G=f}Mina de Ouro STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC :{G=m}Banco diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 2e1950db56..ff2618b38c 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -343,9 +343,9 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Deschide ###length 31 STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauză joc STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Măreşte viteza de trecere a timpului -STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opţiuni -STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Salvare/abandon/ieşire joc -STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Afişează harta +STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opțiuni și setări +STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Salvare, încărcare sau abandon joc, ieșire program +STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Afișează harta, vizor adițional, flux de marfă sau lista de semne STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Afişează lista cu oraşele de pe hartă STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Afişează subvenţiile STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Afişează lista cu staţiile companiei @@ -353,9 +353,9 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES :{BLACK}Afişeaz STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL :{BLACK}Afişează date generale despre companie STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK :{BLACK}Afişează cartea de poveste STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST :{BLACK}Afişează lista de scopuri -STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Afişează grafice +STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Afișează graficele și ratele plăților pentru marfă ale companiei STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Afişează clasamentul companiilor -STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Listează sau fondează obiectivele industriale +STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Examinează industriile sau fondează construcția unei noi industrii STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Afișează lista cu trenurile companiei. Ctrl+clic comută afișarea listei cu grupuri/vehicule STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Afișează lista cu autovehiculele companiei. Ctrl+clic comută afișarea listei cu grupuri/vehicule STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Afișează lista cu navele companiei. Ctrl+clic comută afișarea listei cu grupuri/vehicule @@ -369,8 +369,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Construi STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construieşte aeroporturi STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Afişează instrumentele pentru modelarea terenului, plantarea copacilor, etc. STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Afişează fereastra pentru configurarea sunetului/muzicii -STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Afişează ultimul mesaj (ultima ştire), opţiunile pentru mesaje -STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informaţii despre teren, consolă, depanare IA, capturi ecran, despre OpenTTD +STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Afișează ultimul mesaj (ultima știre), istoricul de mesaje sau șterge toate mesajele +STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informații despre teren, captură de ecran, despre OpenTTD și unelte de dezvoltare STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Comută bara de unelte # Extra tooltips for the scenario editor toolbar @@ -449,7 +449,7 @@ STR_GRAPH_MENU_INCOME_GRAPH :Venituri STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Număr încărcături livrate STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH :Evoluţia performanţei STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Valoarea companiei -STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valorile plăţilor pe încărcături +STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valorile plăților pe mărfuri # Company league menu ###length 3 @@ -495,7 +495,7 @@ STR_TOOLBAR_SOUND_MUSIC :Sunet/muzică # Message menu ###length 3 -STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimul mesaj/ultima ştire +STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimul mesaj/ultima știre STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Lista ultimelor mesaje STR_NEWS_MENU_DELETE_ALL_MESSAGES :Șterge toate mesajele @@ -605,13 +605,13 @@ STR_GRAPH_CARGO_DELIVERED_CAPTION :{WHITE}Unităţ STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION :{WHITE}Evaluarea performanţelor companiilor (maxim=1000) STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Valorile companiilor -STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Preţurile transportului de călători şi mărfuri +STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Prețurile transportului de mărfuri STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Zile în tranzit -STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Plata pentru livrarea a 10 unităţi (sau 10.000 de litri) de marfă pe o distanţă de 20 de pătrăţele +STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Plata pentru livrarea a 10 unități (sau 10.000 de litri) de marfă pe o distanță de 20 de pătrățele STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Activează tot STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Dezactivează tot -STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Afişează toate mărfurile în graficul de plăţi -STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Nu afişa niciun tip de marfă în graficul de plăţi +STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Afișează toate mărfurile în graficul de plăți +STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Nu afișa niciun tip de marfă în graficul de plăți STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Comută ascunderea/afișarea graficului de marfă STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING} @@ -798,7 +798,7 @@ STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Nu afiș STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Afișează toate tipurile de încărcătură pe hartă # Status bar messages -STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Re-afişează ultimul mesaj +STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Re-afișează ultimul mesaj sau ultima știre STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * PAUZĂ * * STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * PAUZĂ (se actualizează graficul conexiunilor) * * @@ -1530,7 +1530,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Din gri în ro STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Tonuri de gri STR_CONFIG_SETTING_SCROLLMODE :Comportament derulare vizor: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamentul derulării hărții +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamentul derulării hărții. Opțiunile „poziție cursor fixă” nu funcționează pe toate sistemele, ca versiunile web, pe ecrane tactile, Linux cu Wayland, și altele ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Mută fereastra de vizualizare ținând apăsat click dreapta, poziția cursorului rămânând fixă STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Mută harta ținând apăsat click dreapta, poziția cursorului rămânând fixă @@ -1711,7 +1711,7 @@ STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT :Câtă memorie STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE :{COMMA} MiB STR_CONFIG_SETTING_SERVINT_ISPERCENT :Intervaluri de service în procente: {STRING} -STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Alege dacă întreținerea vehiculelor este activată de trecerea unei anumite perioade de timp, sau scăzând un anumit procent din gradul de rezistență al vehiculului +STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Dacă este activată, vehiculele încearcă să se repare când fiabilitatea le scade sub un anumit procent.{}{}De exemplu, dacă fiabilitatea maximă a unui vehicul este 90% și intervalul de service este 20%, vehiculul va încerca să intre în service când ajunge la 72% fiabilitate. STR_CONFIG_SETTING_SERVINT_TRAINS :Intervalul de întreținere implicit al trenurilor: {STRING} STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT :Alege perioada de întreținere implicită pentru noi vehicule feroviare, dacă nu există un interval de întreținere stabilit pentru vehicul @@ -2056,6 +2056,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Nu s-au # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Eroare în setările video... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... GPU incompatibil. Accelerarea hardware este dezactivată +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Driverul GPU a dus la prăbușirea jocului. Accelerarea hardware a fost dezactivată # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -2067,7 +2068,7 @@ STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Hartă t STR_INTRO_SCENARIO_EDITOR :{BLACK}Editor hartă STR_INTRO_MULTIPLAYER :{BLACK}Multiplayer -STR_INTRO_GAME_OPTIONS :{BLACK}Opţiuni +STR_INTRO_GAME_OPTIONS :{BLACK}Opțiuni STR_INTRO_HIGHSCORE :{BLACK}Tabela cu scoruri maxime STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Setări STR_INTRO_NEWGRF_SETTINGS :{BLACK}Setări NewGRF @@ -2907,7 +2908,7 @@ STR_INDUSTRY_CARGOES_HOUSES :{WHITE}Case STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP :{BLACK}Click pe industrie pentru a vedea furnizorii şi clienţii săi STR_INDUSTRY_CARGOES_CARGO_TOOLTIP :{BLACK}{STRING}{}Click pe cargo pentru a vedea furnizorii şi clienţii săi STR_INDUSTRY_DISPLAY_CHAIN :{BLACK}Afişează lanţ -STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}Afişează industriile care furnizează şi acceptă cargo +STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}Afișează industriile care furnizează și acceptă marfă STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP :{BLACK}Link către harta mică STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP :{BLACK}Selectează industriile afişate şi pe harta mică STR_INDUSTRY_CARGOES_SELECT_CARGO :{BLACK}Alege tipul de marfă @@ -2916,7 +2917,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY :{BLACK}Alege in STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Alege industria pe care dorești să o afișezi: # Land area window -STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informaţii teren +STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informații teren STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrează vizorul principal pe locația dalei. Ctrl+clic deschide un vizor nou pe locația dalei STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Costul demolării: {LTBLUE}nu este cazul STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Costul demolării: {RED}{CURRENCY_LONG} @@ -4175,10 +4176,10 @@ STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Schimbă STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Schimbă tipul de marfă transportat de aeronavă ###length VEHICLE_TYPES -STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Afişează comenzile trenului. Ctrl-Click pentru a afişa orarul -STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Afişează comenzile autovehiculului. Ctrl-Click pentru a afişa orarul -STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Afişează comenzile navei. Ctrl-Click pentru a afişa orarul -STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Afişează comenzile aeronavei. Ctrl-Click pentru a afişa orarul +STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Afișează comenzile trenului. Ctrl-clic afișează orarul +STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Afișează comenzile autovehiculului. Ctrl-clic afișează orarul +STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Afișează comenzile navei. Ctrl-clic afișează orarul +STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Afișează comenzile aeronavei. Ctrl-clic afișează orarul ###length VEHICLE_TYPES STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Afişează detaliile trenului diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index cdd8f24427..e4730bd0a2 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -344,8 +344,8 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Öppna o STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pausa spelet STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Snabbspola spelet STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Inställningar -STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Spara spelet, avsluta spelet, avsluta -STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Visa karta, extra vyfönster eller skyltlista +STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Spara spelet, öppna spel, avsluta spelet eller avsluta programmet +STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Visa karta, extra vyfönster, godsflöden eller skyltlista STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Visa lista över städer STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Visa subventioner STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Visa lista över företagets stationer @@ -369,8 +369,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Bygg ham STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Bygg flygplatser STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Öppna landskapsarkitektursverktygen för att höja/sänka land, plantera träd, etc. STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Visa ljud-/musikfönster -STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Visa senaste meddelandet/nyheten, visa meddelandeinställningar -STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Markinformation, konsol, felsökning av skript, skärmdumpar, om OpenTTD +STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Visa senaste meddelandet/nyheten, meddelandehistorik eller ta bort alla meddelanden +STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Markinformation, skärmdump, om OpenTTD och utvecklingsverktyg STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Byt verktygsrad # Extra tooltips for the scenario editor toolbar @@ -1530,7 +1530,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Grå till röd STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Gråskala STR_CONFIG_SETTING_SCROLLMODE :Vyfönsters skrollningsbeteende: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Beteende vid scrollning av kartan +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Beteende vid scrollning av kartan. Muspositionen låst valet funkar inte på alla system, som tillexempel webbaserade versioner, pekskärmar, Linux med Wayland, med mera ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Rör vyn med höger musknapp, musens position låst STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Rör kartan med höger musknapp, musens position låst @@ -2056,6 +2056,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Allokera # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Fel med video inställningarna... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... Inget kompatibelt grafikkort hittat. Hårdvaruacceleration inaktiverad +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... GPU-drivrutinen kraschade spelet. Maskinvaruacceleration inaktiverad # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -5087,6 +5088,7 @@ STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE :{WHITE}... flyg STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan inte lägga till fordonet i en tidtabell... STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Fordon kan enbart vänta vid stationer STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Detta fordon stannar inte vid denna station +STR_ERROR_TIMETABLE_INCOMPLETE :{WHITE}... tidtabellen är ofullständig # Sign related errors STR_ERROR_TOO_MANY_SIGNS :{WHITE}... för många skyltar diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 34ca8f9f5d..9fcdabcc00 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -962,6 +962,7 @@ STR_GAME_OPTIONS_RESOLUTION_ITEM :{NUM}x{NUM} STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}விளையாட்டு மறுதொடக்கம் செய்யப்பட்ட பிறகு மட்டுமே இந்த அமைப்பு நடைமுறைக்கு வரும் STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync +STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK} திரையை v-sync செய்ய இந்த சதுரத்தை குறிக்கவும். விளையாட்டு மறுதொடக்கம் செய்யப்பட்ட பிறகு மட்டுமே இந்த அமைப்பின் மாற்றம் பொருந்தும். வன்பொருள் முடுக்கமுடன் மட்டும் செயல்படும். @@ -2236,6 +2237,7 @@ STR_CONTENT_SELECT_UPDATES_CAPTION :{BLACK}தர STR_CONTENT_UNSELECT_ALL_CAPTION :{BLACK}தேர்ந்தெடுத்தவற்றின் குறியினை நீக்கு STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP :{BLACK}அனைத்தையும் பதிவிறக்க வேண்டாம் என்று குறிக்கவும் STR_CONTENT_SEARCH_EXTERNAL :{BLACK}வெளி இணையதளங்களில் தேடு +STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP :{BLACK}OpenTTDஇன் கோப்பு சேவையில் கிடைக்காத கோப்புகளுக்கு OpenTTDஉடன் தொடர்பில்லாத இணையதளங்களில் தேடவும் STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION :{WHITE}நீங்கள் OpenTTD ஐ விட்டு வெளியேறுகிறீர்கள்! STR_CONTENT_FILTER_TITLE :{BLACK}குறியீடு/பெயர் வடிகட்டி: STR_CONTENT_OPEN_URL :{BLACK}இணையதளத்தினை பார்வையிடு @@ -2301,6 +2303,7 @@ STR_MISSING_GRAPHICS_ERROR_QUIT :{BLACK}OpenTTD- # Transparency settings window STR_TRANSPARENCY_CAPTION :{WHITE}ஒளி அமைப்புகள் STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}வீடுகளுக்கான வெளிப்படைத்தன்மையை நிலைமாற்று. Ctrl + கிளிக் பூட்ட செய்க +STR_TRANSPARENT_STRUCTURES_TOOLTIP :கலங்கரைவிளக்கம் மற்றும் ஆண்டெனா போல கட்டடங்களின் வெளிப்படைத்தன்மையை நிலைமாற்று. Ctrl+கிளிக் பூட்ட செய்ய STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}வெளிப்படையானதற்கு பதிலாக கண்ணுக்கு தெரியாததாக பொருட்களை அமைக்கவும் # Linkgraph legend window @@ -2445,6 +2448,7 @@ STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}நீ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}கப்பல் பணிமனையினைக் கட்டவும்(கப்பல்களை வாங்க மற்றும் பழுதுபார்க்க). Shift அழுத்தினால் கட்டுமான/செலவு மதிப்பீடு காட்டப்படும் STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}கப்பல் துறைமுகத்தினைக் கட்டவும். Ctrl அழுத்தினால் துறைமுகங்களினை இணைக்கலாம். Shift அழுத்தினால் கட்டுமான/செலவு மதிப்பீடு காட்டப்படும் STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}நீர்வாழ்வை உருவாக்குங்கள். Shift கட்டிடம் கட்டுதல் / செலவு மதிப்பீட்டைக் காட்டும் +STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP :{BLACK}நீர் பரப்பளவு வரையறுக்கவும்.{}கால்வாய் கட்டவும். கடல் மட்டத்தில் Ctrl அழுத்திவைத்தால், சுற்றில் வெள்ளமாக்கவும் STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}ஆறுகளை அமைக்கவும். Ctrl அழுத்தினால் குறுக்கான பகுதியைத் தேர்ந்தெடுக்கலாம் # Ship depot construction window @@ -2798,6 +2802,7 @@ STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}ஆற STR_MAPGEN_SMOOTHNESS :{BLACK}சமநிலை: STR_MAPGEN_VARIETY :{BLACK}பலவகை பரவல்: STR_MAPGEN_GENERATE :{WHITE}உருவாக்கு +STR_MAPGEN_NEWGRF_SETTINGS :{BLACK}NewGRF அமைப்புகள் ###length 21 STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH :ஆங்கிலம் (இயற்கையான) @@ -3499,6 +3504,7 @@ STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}கா STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}காட்டப்படும் விமானத்தை வாங்கவும். Shift+Click செய்தால் வாங்கும்போது ஆகும் மதிப்பிடப்பட்டச் செலவுகளைக் காட்டும் ###length VEHICLE_TYPES +STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}காட்டப்படும் ரயில் வாகனத்தை வாங்கி புதுப்பிக்கவும். Shift+Click செய்தால் வாங்கும்போது ஆகும் மதிப்பிடப்பட்டச் செலவுகளைக் காட்டும். STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}காட்டப்படும் சாலை வாகனத்தை வாங்கி புதுப்பிக்கவும். Shift+Click செய்தால் வாங்கும்போது ஆகும் மதிப்பிடப்பட்டச் செலவுகளைக் காட்டும். ###length VEHICLE_TYPES diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index f24f2ac7b2..2f4325ad1b 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1530,7 +1530,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Xám tới đ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Thang màu xám STR_CONFIG_SETTING_SCROLLMODE :Kiểu cuộn khung nhìn: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Hành xử khi kéo, cuộn bản đồ +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Hành xử khi kéo, cuộn bản đồ. Tùy chọn "khóa vị trí chuột" không hoạt động ở một số phiên bản, như phiên bản web, phiên bản cảm ứng, Linux với Wayland, và một số phiên bản khác ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Kéo cuộn khung nhìn kiểu RMB, khoá vị trí con trỏ chuột STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Kéo cuộn kiểu RMB, khoá vị trí con trỏ chuột @@ -2056,6 +2056,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Phân b # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Lỗi ở thiết lập hình ảnh... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... không tìm thấy GPU tương thích. Tăng tốc phần cứng đã được tắt +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... trình điều khiển GPU đã làm trò chơi bị lỗi. Tăng tốc phần cứng đã được tắt # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 95577100cd..cd7f56e65d 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -198,6 +198,11 @@ STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW +STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC :{DECIMAL}{NBSP}hp/t +STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_SI :{DECIMAL}{NBSP}hp/Mg +STR_UNITS_POWER_METRIC_TO_WEIGHT_SI :{DECIMAL}{NBSP}hp/Mg +STR_UNITS_POWER_SI_TO_WEIGHT_IMPERIAL :{DECIMAL}{NBSP}kW/t +STR_UNITS_POWER_SI_TO_WEIGHT_METRIC :{DECIMAL}{NBSP}kW/t STR_UNITS_WEIGHT_SHORT_IMPERIAL :{COMMA}{NBSP}t STR_UNITS_WEIGHT_SHORT_METRIC :{COMMA}{NBSP}t @@ -224,9 +229,9 @@ STR_UNITS_HEIGHT_METRIC :{COMMA}{NBSP}m STR_UNITS_HEIGHT_SI :{COMMA}{NBSP}m # Common window strings -STR_LIST_FILTER_TITLE :{BLACK}Llinyn hidlo: -STR_LIST_FILTER_OSKTITLE :{BLACK}Rhowch linyn hidlo -STR_LIST_FILTER_TOOLTIP :{BLACK}Rhowch allweddair er mwyn ei ddefnyddio i hidlo'r rhestr +STR_LIST_FILTER_TITLE :{BLACK}Hidlydd: +STR_LIST_FILTER_OSKTITLE :{BLACK}Rhowch un neu fwy o allweddeiriau i hildio'r rhestr +STR_LIST_FILTER_TOOLTIP :{BLACK}Rhowch un neu fwy o allweddeiriau i hildio'r rhestr STR_TOOLTIP_GROUP_ORDER :{BLACK}Dewis trefn grwpio STR_TOOLTIP_SORT_ORDER :{BLACK}Dewiswch drefn trefnu (disgynnol/esgynnol) @@ -311,6 +316,7 @@ STR_SORT_BY_CARGO_CAPACITY :Gallu cludo llw STR_SORT_BY_RANGE :Maes teithio STR_SORT_BY_POPULATION :Poblogaeth STR_SORT_BY_RATING :Gradd +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Cyfanswm elw llynedd # Group by options for vehicle list @@ -379,6 +385,7 @@ STR_SCENEDIT_FILE_MENU_QUIT :Gadael ###length 15 STR_SETTINGS_MENU_GAME_OPTIONS :Dewisiadau Gêm STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE :Gosodiadau +STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS :Gosodiadau sgript gêm STR_SETTINGS_MENU_NEWGRF_SETTINGS :Gosodiadau NewGRF STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS :Dewisiadau tryloywder STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :Dangos enwau trefi @@ -683,7 +690,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK :{BLACK}Cliciwch STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED :{BIG_FONT}{BLACK}Y Cwmnïau Brig a gyrhaeddodd Lefel {NUM} STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME :{BIG_FONT}{BLACK}Y Tabl Cynghrair Cwmnïau yn {NUM} STR_HIGHSCORE_POSITION :{BIG_FONT}{BLACK}{COMMA}. -STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN :Dyn Busnes +STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN :Rheolwr Busnes STR_HIGHSCORE_PERFORMANCE_TITLE_ENTREPRENEUR :Entrepreneur STR_HIGHSCORE_PERFORMANCE_TITLE_INDUSTRIALIST :Diwydiannydd STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Cyfalafwr @@ -732,11 +739,12 @@ STR_SMALLMAP_LEGENDA_FOREST :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_RAILROAD_STATION :{TINY_FONT}{BLACK}Gorsaf Reilffordd STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY :{TINY_FONT}{BLACK}Man Llwytho Lorïau STR_SMALLMAP_LEGENDA_BUS_STATION :{TINY_FONT}{BLACK}Gorsaf Fysiau -STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT :{TINY_FONT}{BLACK}Maes Awyr/Glanfa Hofrenyddion +STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT :{TINY_FONT}{BLACK}Maes Awyr/Hofrenfa STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLACK}Doc STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Tir Garw STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Glaswelltir STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Tir Moel +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Coedwig Law STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Caeau STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Coed STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Creigiau @@ -771,6 +779,7 @@ STR_STATUSBAR_PAUSED :{YELLOW}* * WE STR_STATUSBAR_AUTOSAVE :{RED}AWTOGADW STR_STATUSBAR_SAVING_GAME :{RED}* * CADW GÊM * * +STR_STATUSBAR_SPECTATOR :{WHITE}(gwyliwr) # News message history STR_MESSAGE_HISTORY :{WHITE}Hanes Negeseuon @@ -872,7 +881,12 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Mae {STA STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Cynnig cymhorthdal ar ben:{}{}Ni fydd cludo {STRING} o {STRING} i {STRING} yn derbyn cymhorthdal bellach STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Cymhorthdal wedi'i dynnu'n ôl:{}{}Ni fydd gwasanaeth {STRING} o {STRING} i {STRING} yn derbyn cymhorthdal bellach +STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Cynnig cymhorthdal:{}{}Bydd y gwasanaeth {STRING} cyntaf o {STRING} i {STRING} yn derbyn {NUM} {P "blwyddyn" "mlynedd"}! o gymhorthdal gan yr awdurdod lleol! ###length 4 +STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu 50% yn fwy am {NUM} {P "blwyddyn" "mlynedd"}! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu dwywaith yn fwy am {NUM} {P "blwyddyn" "mlynedd"}! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu teirgwaith yn fwy am {NUM} {P "blwyddyn" "mlynedd"}! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu pedair gwaith yn fwy am {NUM} {P "blwyddyn" "mlynedd"}! STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK}Anrhefn traffig yn {TOWN}!{}{}Daw gwaith ffordd a ariannwyd gan {STRING} â 6 mis o boen i deithwyr ffordd y dref! STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Monopoli cludiant! @@ -948,13 +962,22 @@ STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Marciwch STR_GAME_OPTIONS_RESOLUTION :{BLACK}Cydraniad Sgrin STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Dewiswch y cydraniad sgrin i'w defnyddio STR_GAME_OPTIONS_RESOLUTION_OTHER :arall +STR_GAME_OPTIONS_RESOLUTION_ITEM :{NUM}x{NUM} +STR_GAME_OPTIONS_GUI_SCALE_AUTO :{BLACK}Awto-ganfod maint +STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP :{BLACK}Marciwch y blwch hwn i ganfod maint y rhyngwyneb yn awtomatig +STR_GAME_OPTIONS_GUI_SCALE_1X :1x +STR_GAME_OPTIONS_GUI_SCALE_2X :2x +STR_GAME_OPTIONS_GUI_SCALE_3X :3x +STR_GAME_OPTIONS_GUI_SCALE_4X :4x +STR_GAME_OPTIONS_GUI_SCALE_5X :5x +STR_GAME_OPTIONS_GRAPHICS :{BLACK}Graffeg STR_GAME_OPTIONS_BASE_GRF :{BLACK}Set raffeg sylfaenol @@ -1065,13 +1088,13 @@ STR_TERRAIN_TYPE_ALPINIST :Mynyddwr ###length 4 STR_CITY_APPROVAL_TOLERANT :Hapus STR_CITY_APPROVAL_HOSTILE :Gwrthwynebus -STR_CITY_APPROVAL_PERMISSIVE :Bodlon +STR_CITY_APPROVAL_PERMISSIVE :Bodlon (dim effaith ar weithredoedd cwmni) STR_WARNING_NO_SUITABLE_AI :{WHITE}Dim AI addas ar gael...{}Gallwch llawrlwytho sawl AI drwy'r system 'Cynnwys Ar-lein' # Settings tree window STR_CONFIG_SETTING_TREE_CAPTION :{WHITE}Gosodiadau -STR_CONFIG_SETTING_FILTER_TITLE :{BLACK}Llinyn hidlo: +STR_CONFIG_SETTING_FILTER_TITLE :{BLACK}Hidlydd: STR_CONFIG_SETTING_EXPAND_ALL :{BLACK}Ehangu oll STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Cywasgu oll STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(dim esboniad ar gael) @@ -1145,8 +1168,11 @@ STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :Gosod pa mor am STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER :Lluosydd cymhorthdal: {STRING} STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT :Gosod faint a delir ar gyfer cysylltiadau gyda chymhorthdal +STR_CONFIG_SETTING_SUBSIDY_DURATION :Cyfnod cymhorthdal: {STRING} +STR_CONFIG_SETTING_SUBSIDY_DURATION_VALUE :{NUM} blwyddyn ###setting-zero-is-special +STR_CONFIG_SETTING_SUBSIDY_DURATION_DISABLED :Dim cymhorthdaliadau STR_CONFIG_SETTING_CONSTRUCTION_COSTS :Costau adeiladu: {STRING} STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT :Gosod lefel costau prynnu ac adeiladu @@ -1160,10 +1186,14 @@ STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Os y galluogir, STR_CONFIG_SETTING_DISASTERS :Trychinebau: {STRING} STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Toglo trychinebau a all rhwystro neu ddinistrio cerbydau neu tanadeiledd -STR_CONFIG_SETTING_CITY_APPROVAL :Agwedd y cyngor tref at ailstrwythuro'r ardal: {STRING} -STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Dewis faint y mae sŵn a niwed amgycheddol gan gwmnïau yn effeithio ar eu graddio trefol a gweithredoedd adeiladu pellach yn eu hardal +STR_CONFIG_SETTING_CITY_APPROVAL :Agwedd yr awdurdod lleol: {STRING} +STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Dewis faint y mae sŵn a niwed amgylcheddol gan gwmnïau yn effeithio ar eu graddio trefol a gweithredoedd adeiladu pellach yn y dref +STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Uchder uchafsymol y map: {STRING} +STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT :Gosod uchder uchafsymol y map tirwedd. Gyda "(diofyn)" bydd gwerth da yn cael ei ddewis ar ôl creu'r tirwedd +STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_VALUE :{NUM} ###setting-zero-is-special +STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_AUTO :(diofyn) STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN :{WHITE}Ni allwch osod uchder uchafsymol y map i'r gwerth yma. Mae o leiaf un mynydd ar y map yn uwch STR_CONFIG_SETTING_AUTOSLOPE :Caniatáu tirffurfio o dan adeiladau, traciau, ayyb.: {STRING} @@ -1259,7 +1289,7 @@ STR_CONFIG_SETTING_BRIBE :Caniatáu llwgr STR_CONFIG_SETTING_BRIBE_HELPTEXT :Caniatáu i gwmnïau geisio llwgrwobrwyo'r awdurdod lleol. Os bydd arolygydd yn sylwi ar yr ymgais ni gaiff y cwmni weithredu yn y dref am chwe mis STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :Caniatáu prynu hawliau cludo cyfyngol: {STRING} -STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT :Os yw cwmni'n prynnu hawliau cludiant cyfyngol mewn tref, ni fydd gosafoedd (teithwyr a chargo) gwrthwynebwyr yn derbyn unrhyw gargo am flwyddyn +STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT :Os yw cwmni'n prynu hawliau cludiant cyfyngol mewn tref, ni fydd gorsafoedd (teithwyr a llwythi) gwrthwynebwyr yn derbyn unrhyw lwyth am flwyddyn STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Caniatáu ariannu adeiladau: {STRING} STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT :Caniatáu i gwmnïau rhoi arian i drefi er mwyn adeiladu tai newydd @@ -1362,8 +1392,10 @@ STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Pellter uchafsy STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Codir purfeydd olew ger ymylon y map yn unig, h.y. ar yr arfordir mewn mapiau ynys STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Uchder Llinell Eira: {STRING} -STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT :Rheoli'r uchder y mae eira'n ymddangos mewn tirwedd is-arctig. Mae eira hefyd yn effeitiho ar gynhyrchu diwydiannau a gofynion twf trefi +STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT :Rheoli'r uchder y mae eira'n ymddangos mewn tirwedd is-arctig. Mae eira hefyd yn effeithio ar gynhyrchu diwydiannau a gofynion twf trefi. Dim ond yn y Golygydd Senario y gellir ei newid, neu fel arall caiff ei gyfrifo trwy "gorchudd eira" +STR_CONFIG_SETTING_SNOW_COVERAGE :Gorchuddiad eira: {STRING} +STR_CONFIG_SETTING_SNOW_COVERAGE_VALUE :{NUM}% STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Garwder y tirwedd: {STRING} @@ -1421,8 +1453,9 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Gwyrdd tywyll STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Fioled ###length 4 +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :Gwyrdd i goch (gwreiddiol) -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Ymddygiad tra'n sgrolio'r map +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Ymddygiad tra'n sgrolio'r map. Nid yw'r opsiynau "lleoliad llygoden wedi'i gloi" yn gweithio ar bob system, fel fersiynau gwe, sgrin-gyffwrdd, Linux gyda Wayland, ac eraill ###length 4 STR_CONFIG_SETTING_SMOOTH_SCROLLING :Sgrolio prif ffenestr llyfn: {STRING} @@ -1460,6 +1493,8 @@ STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK_FOCUS :Clic sengl (pan STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK :Clic sengl (ar unwaith) ###length 3 +STR_CONFIG_SETTING_USE_RELAY_SERVICE_NEVER :Byth +STR_CONFIG_SETTING_USE_RELAY_SERVICE_ALLOW :Caniatáu STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU :Efelychu de-glicio: {STRING} STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT :Dewis sut i efelychu cliciau botwm dde y llygoden @@ -1585,7 +1620,7 @@ STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES :Nifer y gweithr STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT :Uchafswm y nifer o gamau cyfrifo y gall sgript ei gymeryd mewn un tro STR_CONFIG_SETTING_SERVINT_ISPERCENT :Dangos y cyfnod rhwng gwasanaethau mewn canrannau: {STRING} -STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Dewis os y bydd gwasanaethu cerbydau'n digwydd yn ôl yr amser ers y gwasanaeth olaf, neu wrth i'w dibynadwyedd ddisgyn islaw ganran penodol o'r dibynadwyedd uchafsymol +STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Pan y galluogir, bydd cerbydau'n ceisio gwasanaeth pan fo'u dibynadwyedd yn disgyn canran penodol o'u dibynadwyedd uchafsymol.{}{}Er enghraifft, os yw dibynadwyedd uchafsymol cerbyd yn 90% a'r ystod gwasanaeth yn 20%, bydd y cerbyg yn ceisio gwasanaeth pan mae'r dibynadwyedd yn cyrraedd 72%.Dewis os y bydd gwasanaethu cerbydau'n digwydd yn ôl yr amser ers y gwasanaeth olaf, neu wrth i'w dibynadwyedd ddisgyn islaw ganran penodol o'r dibynadwyedd uchafsymol STR_CONFIG_SETTING_SERVINT_TRAINS :Ystod gwasanaethu rhagosodedig ar gyfer trenau: {STRING} STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT :Gosod yr ystod gwasanaethu rhagosodedig ar gyfer cerbydau rheilffordd newydd, os na ddynodir ystod gwasanaethu penodol ar gyfer y cerbyd @@ -1662,6 +1697,8 @@ STR_CONFIG_SETTING_COLOURED_NEWS_YEAR :Bydd newyddion STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT :Y blwyddyn y caiff cyhoeddiadau newyddion eu hargraffu mewn lliw. Cyn y dyddiad yma rhai du a gwyn fyddent STR_CONFIG_SETTING_STARTING_YEAR :Blwyddyn dechreuol: {STRING} +STR_CONFIG_SETTING_ENDING_YEAR :Sgorio diwedd blwyddyn: {STRING} +STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} ###setting-zero-is-special ###length 3 @@ -1683,12 +1720,15 @@ STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE :Adeiladu semaff STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE_HELPTEXT :Gosod y flwyddyn pan y defnyddir signalau trydan ar draciau. Cyn y flwyddyn hon, fe ddefnyddir signalau semaffor (sydd â gweithred unfath, ond edrychiad gwahanol) STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES :Cylchu trwy mathau signal: {STRING} -STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT :Dewis pa fathau o signalau i gylchu drwyddynt, pan yn Ctrl+clicio i adeiladu signalau gyda'r offer signal +STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT :Dewis pa fathau o signalau i gylchu drwyddynt pan yn Ctrl+clicio ar signal gyda'r offer signal ###length 2 STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS :Signalau llwybr yn unig -STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL :Pob math +STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL :Pob math gweledol +STR_CONFIG_SETTING_SIGNAL_GUI_MODE :Dangos mathau signal: {STRING} +STR_CONFIG_SETTING_SIGNAL_GUI_MODE_HELPTEXT :Dewis pa fathau o signal sy'n cael eu dangos yn y bar offer signal ###length 2 +STR_CONFIG_SETTING_SIGNAL_GUI_MODE_ALL_CYCLE_PATH :Pob signal STR_CONFIG_SETTING_TOWN_LAYOUT :Cynllun ffyrdd ar gyfer trefi newydd: {STRING} STR_CONFIG_SETTING_TOWN_LAYOUT_HELPTEXT :Cynllun rhwydwaith ffyrdd trefi @@ -1715,6 +1755,7 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Caniatáu STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Caniatáu, cynllun tref addasiedig ###length 2 +STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Llinol STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Gosod coed mewn gêm: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Rheoli ymddangosiad coed ar hap yn ystod y gêm. Gall hyn effeithio ar ddiwydiannau sy'n ddibynnol ar dyfiant coed, megis melinau coed @@ -1748,6 +1789,8 @@ STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X :4x STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X :8x ###length 3 +STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_MIN :4x +STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_NORMAL :1x STR_CONFIG_SETTING_TOWN_GROWTH :Cyflymder twf tref: {STRING} STR_CONFIG_SETTING_TOWN_GROWTH_HELPTEXT :Cyflymder tyfiant trefi @@ -1776,7 +1819,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT :Mae "cymesur" y STR_CONFIG_SETTING_DISTRIBUTION_MAIL :Dull dosrannu ar gyfer post: {STRING} STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT :Mae "cymesur" yn golygu y bydd tua'r un faint o bost yn cael ei yrru o orsaf A i orsaf B ac y gyrrir o B i A. Mae "anghymesur" yn golygu y gall llwythi mympwyol eu gyrru yn y naill cyfeiriad neu'r llall. Mae "â llaw" yn golygu ni fydd dosrannu diofyn yn digwydd ar gyfer post. STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED :Dull dosrannu ar gyfer llwythi ARFOG: {STRING} -STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT :Mae llwythi ARFOG yn cynnwys trysorau mewn ardaloedd tymherus, diemwntau yn y trofannau, ac aur yn yr is-arctig. Gall NewGRFau newid hyn, Mae "cymesur" yn golygu y bydd tua'r un faint o lwythi'n cael eu gyrru o orsaf A i orsaf B ac y gyrrir o B i A. Mae "anghymesur" yn golygu y gall llwythi mympwyol eu gyrru yn y naill cyfeiriad neu'r llall. Mae "â llaw" yn golygu ni fydd dosrannu diofyn yn digwydd ar gyfer y llwythi yma. Fe argymhellir eich bod yn dewis anghymesur neu â llaw pan yn chwarae mewn ardal is-arctig, gan na fydd banciau'n gyrru aur yn ôl i gloddfeydd aur. Ar gyfer ardaloedd tymherus neu trofannol gallwch hefyd ddewis cymesur gan y bydd banciau'n gyrru trysorau'n ôl i rai banciau tardd. +STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT :Mae llwythi ARFOG yn cynnwys trysorau mewn ardaloedd tymherus, diemwntau yn y trofannau, neu aur yn yr is-arctig. Gall NewGRFau newid hyn, Mae "cymesur" yn golygu y bydd tua'r un faint o lwythi'n cael eu gyrru o orsaf A i orsaf B ac y gyrrir o B i A. Mae "anghymesur" yn golygu y gall llwythi mympwyol eu gyrru yn y naill cyfeiriad neu'r llall. Mae "â llaw" yn golygu ni fydd dosrannu diofyn yn digwydd ar gyfer y llwythi yma. Fe argymhellir eich bod yn dewis anghymesur neu â llaw pan yn chwarae mewn ardal is-arctig, gan na fydd banciau'n gyrru aur yn ôl i gloddfeydd aur. Ar gyfer ardaloedd tymherus neu trofannol gallwch hefyd ddewis cymesur gan y bydd banciau'n gyrru trysorau'n ôl i rai banciau tardd. STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT :Dull dosrannu ar gyfer llwythi eraill: {STRING} STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT :Mae "anghymesur" yn golygu y gall llwythi mympwyol eu gyrru yn y naill cyfeiriad neu'r llall. Mae "â llaw" yn golygu ni fydd dosrannu diofyn yn digwydd ar gyfer y llwythi hyn. ###length 3 @@ -1939,6 +1982,7 @@ STR_INTRO_TRANSLATION :{BLACK}Mae'r cy # Quit window STR_QUIT_CAPTION :{WHITE}Gadael +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ydych chi'n siŵr eich bod eisiau gadael OpenTTD? STR_QUIT_YES :{BLACK}Iawn STR_QUIT_NO :{BLACK}Na @@ -2088,11 +2132,13 @@ STR_NETWORK_SERVER_LIST_LANDSCAPE :{SILVER}Tirwedd STR_NETWORK_SERVER_LIST_MAP_SIZE :{SILVER}Maint map: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_LIST_SERVER_VERSION :{SILVER}Fersiwn gweinydd: {WHITE}{STRING} STR_NETWORK_SERVER_LIST_SERVER_ADDRESS :{SILVER}Cyfeiriad gweinydd: {WHITE}{STRING} +STR_NETWORK_SERVER_LIST_INVITE_CODE :{SILVER}Cod gwahoddiad: {WHITE}{STRING} STR_NETWORK_SERVER_LIST_START_DATE :{SILVER}Dyddiad cychwyn: {WHITE}{DATE_SHORT} STR_NETWORK_SERVER_LIST_CURRENT_DATE :{SILVER}Dyddiad presennol: {WHITE}{DATE_SHORT} STR_NETWORK_SERVER_LIST_PASSWORD :{SILVER}Wedi'i Ddiogelu gan Gyfrinair! STR_NETWORK_SERVER_LIST_SERVER_OFFLINE :{SILVER}GWEINYDD ALL-LEIN STR_NETWORK_SERVER_LIST_SERVER_FULL :{SILVER}GWEINYDD LLAWN +STR_NETWORK_SERVER_LIST_SERVER_BANNED :{SILVER}MAE'R GWEINYDD WEDI'CH RHWYSTRO CHI STR_NETWORK_SERVER_LIST_VERSION_MISMATCH :{SILVER}FERSIWN ANGHYDNAWS STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}NEWGRF ANGHYDNAWS @@ -2100,6 +2146,8 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Ymuno â STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Adnewyddu'r gweinydd STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Adnewyddu'r wybodaeth am y gweinydd +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Chwilio'r wê am weinyddion cyhoeddus +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Chwilio'r rhwydwaith lleol am weinyddion STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Ychwanegu gweinydd STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Ychwanegu gweinydd i'r rhestr a gaiff ei wirio bob tro am gemau sy'n rhedeg STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Dechrau gweinydd @@ -2150,12 +2198,26 @@ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Mae'r cw STR_NETWORK_COMPANY_LIST_CLIENT_LIST :Rhestr Cleientiaid # Network client list +STR_NETWORK_CLIENT_LIST_SERVER :{BLACK}Gweinydd +STR_NETWORK_CLIENT_LIST_SERVER_INVITE_CODE_TOOLTIP :{BLACK}Cod gwahoddiad i bobl eraill ymuno a'r gweinydd yma +STR_NETWORK_CLIENT_LIST_PLAYER_NAME :{BLACK}Enw +STR_NETWORK_CLIENT_LIST_PLAYER_NAME_QUERY_CAPTION :Eich enw chwaraewr +STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP :{BLACK}Gweithredoedd gweinyddol i'r gwneud ar gyfer y cwmni yma +STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP :{BLACK}Ymuno a'r cwmni yma +STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP :{BLACK}Gyrru neges i'r chwaraewr yma +STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP :{BLACK}Gyrru neges i bob chwaraewr yn y cwmni yma STR_NETWORK_CLIENT_LIST_CHAT_SPECTATOR_TOOLTIP :{BLACK}Anfon neges i bob gwyliwr # Matches ConnectionType ###length 5 +STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_UNKNOWN :{BLACK}Lleol +STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_BAN :Rhwystro +STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_RESET :Dileu +STR_NETWORK_CLIENT_LIST_ASK_CLIENT_BAN :{YELLOW}Ydych chi'n siwr eich bod chi eisiau rhwystro'r chwaraewr '{STRING}'? +STR_NETWORK_CLIENT_LIST_ASK_COMPANY_UNLOCK :{YELLOW}Ydych chi'n siwr eich bod am ailosod cyfrinair y cwmni '{COMPANY}'? +STR_NETWORK_ASK_RELAY_CAPTION :Defnyddi relái? STR_NETWORK_SPECTATORS :Gwylwyr @@ -2165,11 +2227,11 @@ STR_COMPANY_PASSWORD_CANCEL :{BLACK}Peidio c STR_COMPANY_PASSWORD_OK :{BLACK}Rhoi'r cyfrinair newydd i'r cwmni STR_COMPANY_PASSWORD_CAPTION :{WHITE}Cyfrinair cwmni STR_COMPANY_PASSWORD_MAKE_DEFAULT :{BLACK}Cyfrinair rhagosodedig cwmni -STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP :{BLACK}Defnyddio'r cyfrinair cwmni hwn fel y rhagosodiad ar gyfer cwmnïau +STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP :{BLACK}Defnyddio'r cyfrinair cwmni yma fel y rhagosodiad ar gyfer cwmnïau # Network company info join/password STR_COMPANY_VIEW_JOIN :{BLACK}Ymuno -STR_COMPANY_VIEW_JOIN_TOOLTIP :{BLACK}Ymuno a chwarae fel y cwmni hwn +STR_COMPANY_VIEW_JOIN_TOOLTIP :{BLACK}Ymuno a chwarae fel y cwmni yma STR_COMPANY_VIEW_PASSWORD :{BLACK}Cyfrinair STR_COMPANY_VIEW_PASSWORD_TOOLTIP :{BLACK}Diogelwch eich cwmni gyda cyfrinair er mwyn rhwystro rhai heb awdurdod rhag ymuno STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Gosod cyfrinair cwmni @@ -2200,7 +2262,7 @@ STR_NETWORK_ERROR_WRONG_REVISION :{WHITE}Nid y fe STR_NETWORK_ERROR_WRONG_PASSWORD :{WHITE}Cyfrinair anghywir STR_NETWORK_ERROR_SERVER_FULL :{WHITE}Mae'r gweinydd yn llawn STR_NETWORK_ERROR_SERVER_BANNED :{WHITE}Rydych chi wedi'ch gwahardd o'r gweinydd hwn -STR_NETWORK_ERROR_KICKED :{WHITE}YCafoch chi eich cicio o'r gêm +STR_NETWORK_ERROR_KICKED :{WHITE}Cafoch chi eich cicio o'r gêm STR_NETWORK_ERROR_CHEATER :{WHITE}Ni chaniateir twyllo ar y gweinydd hwn STR_NETWORK_ERROR_TOO_MANY_COMMANDS :{WHITE}Roeddech yn gyrru gormod o orchmynion i'r gweinydd STR_NETWORK_ERROR_TIMEOUT_PASSWORD :{WHITE}Fe gymeroch ormod o amser i fewnbynnu'r cyfrinair @@ -2256,8 +2318,10 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** Mae {STRING STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** Mae {STRING} wedi dechrau cwmni newydd (#{2:NUM}) STR_NETWORK_MESSAGE_CLIENT_LEFT :*** Mae {STRING} wedi gadael y gêm ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** Mae {STRING} wedi newid ei (h)enw i {STRING} +STR_NETWORK_MESSAGE_GIVE_MONEY :*** Rhoddodd {0:STRING} {2:CURRENCY_LONG} i {1:STRING} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Fe gaewyd y sesiwn gan y gweinydd STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Mae'r gweinydd yn ailgychwyn...{}Arhoswch... +STR_NETWORK_MESSAGE_KICKED :*** Mae {STRING} wedi cael cic gan y gweinydd. Rheswm: ({STRING}) # Content downloading window @@ -2354,6 +2418,7 @@ STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Allwedd STR_LINKGRAPH_LEGEND_ALL :{BLACK}Oll STR_LINKGRAPH_LEGEND_NONE :{BLACK}Dim STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Dewis cwmnïau i'w dangos +STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP :{BLACK}{STRING}{}{COMPANY} # Linkgraph legend window and linkgraph legend in smallmap STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLACK}diddefnydd @@ -2379,6 +2444,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Uno pwyn STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Adeiladu pwynt llwybro annibynnol # Generic toolbar +STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Analluogwyd gan nad oes cerbydau ar gael i'r tanadeiledd yma ar hyn o bryd # Rail construction toolbar STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Adeiladu Rheilffyrdd @@ -2450,6 +2516,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Cynyddu STR_SELECT_RAIL_BRIDGE_CAPTION :{WHITE}Dewiswch Bont Rheilffordd STR_SELECT_ROAD_BRIDGE_CAPTION :{WHITE}Dewiswch Bont Ffordd STR_SELECT_BRIDGE_SELECTION_TOOLTIP :{BLACK}Dewis pont - cliciwch ar y eich dewis i'w hadeiladu +STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG} STR_BRIDGE_NAME_SUSPENSION_STEEL :Crog, Dur STR_BRIDGE_NAME_GIRDER_STEEL :Hytrawst, Dur STR_BRIDGE_NAME_CANTILEVER_STEEL :Canttilifer, Dur @@ -2533,14 +2600,14 @@ STR_AIRPORT_METRO :Maes awyr metro STR_AIRPORT_INTERNATIONAL :Rhyngwladol STR_AIRPORT_COMMUTER :Cymudol STR_AIRPORT_INTERCONTINENTAL :Rhyng-gyfandirol -STR_AIRPORT_HELIPORT :Porth Hofrennydd +STR_AIRPORT_HELIPORT :Hofrenfa STR_AIRPORT_HELIDEPOT :Depo Hofrennydd STR_AIRPORT_HELISTATION :Gorsaf Hofrennydd STR_AIRPORT_CLASS_SMALL :Meysydd awyr bach STR_AIRPORT_CLASS_LARGE :Meysydd awyr mawr STR_AIRPORT_CLASS_HUB :Meysydd awyr cyfnewid -STR_AIRPORT_CLASS_HELIPORTS :Meysydd awyr hofrennydd +STR_AIRPORT_CLASS_HELIPORTS :Hofrenfeydd STR_STATION_BUILD_NOISE :{BLACK}Swn a gynhyrchir: {GOLD}{COMMA} @@ -2549,7 +2616,7 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Tirweddu STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Gostwng cornel o dir. Mae llusgo'n gostwng y gornel gyntaf a ddewisir ac yna'n lefelu'r ardal a ddewisir i uchder newydd y gornel. Mae Ctrl yn dewis ardal yn ddeiagonal, tra fo Shift yn toglo adeiladu/dangos amcangyfrif o'r gost STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Codi cornel o dir. Mae llusgo'n codi'r gornel gyntaf a ddewisir ac yna'n lefelu'r ardal a ddewisir i uchder newydd y gornel. Mae Ctrl yn dewis ardal yn ddeiagonal, tra fo Shift yn toglo adeiladu/dangos amcangyfrif o'r gost STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Gwastatáu ardal o dir i uchder y gornel gyntaf a ddewisir. Mae Ctrl yn dewis ardal yn ddeiagonal, tra fo Shift yn toglo adeiladu/dangos amcangyfrif o'r gost -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Prynu tir ar gyfer defnydd yn y dyfodol. Mae Shift yn toglo adeiladu/amcangyfrif y gost +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Prynu tir ar gyfer defnydd yn y dyfodol. Mae Ctrl yn dewis ardal yn ddeiagonal, tra fo Shift yn toglo adeiladu/amcangyfrif y gost # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Dewis Gwrthrych @@ -2568,6 +2635,7 @@ STR_TREES_RANDOM_TYPE :{BLACK}Coed o f STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Gosod coed o fath ar hap. Mae Shift yn toglo adeiladu/dangos amcangyfrif cost STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Coed ar hap STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Plannu coed ar hap ar draws y tirwedd +STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Plannu coedwigoedd mawr trwy lusgo ar draws y tirwedd # Land generation window (SE) STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Cynhyrchu Tirwedd @@ -2618,12 +2686,13 @@ STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM :{BLACK}Ar hap # Fund new industry window STR_FUND_INDUSTRY_CAPTION :{WHITE}Ariannu diwydiant newydd STR_FUND_INDUSTRY_SELECTION_TOOLTIP :{BLACK}Dewiswch ddiwydiant o'r rhestr -STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES :Llawer o ddiwydiannau ar hap +STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES :{BLACK}Creu diwydiannau ar hap STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP :{BLACK}Gorchuddio'r map gyda diwydiannau wedi'i lleoli ar hap STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST :{BLACK}Côst: {YELLOW}{CURRENCY_LONG} STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY :{BLACK}Mwynchwilio STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY :{BLACK}Adeiladu STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY :{BLACK}Ariannu +STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_QUERY :{YELLOW}Ydych chi'n siŵr eich bod eisiau dileu pob diwydiant? # Industry cargoes window STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION :{WHITE}Cadwyn ddiwydiant ar gyfer diwydiant {STRING} @@ -2665,6 +2734,7 @@ STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Llwythi a dderbynir: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) STR_LANG_AREA_INFORMATION_RAIL_TYPE :{BLACK}Math rheilffordd: {LTBLUE}{STRING} +STR_LANG_AREA_INFORMATION_ROAD_TYPE :{BLACK}Math lôn: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Terfyn cyflymder rheilffordd: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Terfyn cyflymder ffordd: {LTBLUE}{VELOCITY} @@ -2712,7 +2782,7 @@ STR_LAI_ROAD_DESCRIPTION_TRAMWAY :Tramffordd STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION :{STRING} (wrthi'n cael ei adeiladu) STR_LAI_TREE_NAME_TREES :Coed -STR_LAI_TREE_NAME_RAINFOREST :Coedwig law +STR_LAI_TREE_NAME_RAINFOREST :Coedwig Law STR_LAI_TREE_NAME_CACTUS_PLANTS :Planhigion Cactws STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION :Gorsaf reilffordd @@ -2771,11 +2841,15 @@ STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP :{BLACK}Nifer y STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK}Nifer o fframiau fideo a lunir bob eiliad. STR_FRAMERATE_SPEED_FACTOR_TOOLTIP :{BLACK}Pa mor gyflym mae'r gêm yn rhedeg, o gymharu a'r cyflymder i'w ddisgwyl ar gyfradd efelychu arferol. STR_FRAMERATE_AVERAGE :{WHITE}Cymedr +STR_FRAMERATE_MEMORYUSE :{WHITE}Cof STR_FRAMERATE_FPS_GOOD :{LTBLUE}{DECIMAL} frâm yr eiliad +STR_FRAMERATE_FPS_BAD :{RED}{DECIMAL} ffrâm yr eiliad +STR_FRAMERATE_BYTES_GOOD :{LTBLUE}{BYTES} ###length 15 STR_FRAMERATE_GL_ECONOMY :{BLACK} Trin cargo: STR_FRAMERATE_VIDEO :{BLACK}Allbwn fideo: +STR_FRAMERATE_GAMESCRIPT :{BLACK} Sgript gêm: ###length 15 STR_FRAMETIME_CAPTION_VIDEO :Allbwn fideo @@ -2804,6 +2878,10 @@ STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Manylion STR_SAVELOAD_DETAIL_NOT_AVAILABLE :{BLACK}Dim gwybodaeth ar gael STR_SAVELOAD_DETAIL_COMPANY_INDEX :{SILVER}{COMMA}: {WHITE}{STRING} STR_SAVELOAD_DETAIL_GRFSTATUS :{SILVER}NewGRF: {WHITE}{STRING} +STR_SAVELOAD_FILTER_TITLE :{BLACK}Hidlydd: +STR_SAVELOAD_OVERWRITE_TITLE :{WHITE}Trosysgrifennu Ffeil +STR_SAVELOAD_OVERWRITE_WARNING :{YELLOW}Ydych chi'n siwr eich bod chi eisiau trosysgrifennu'r ffeil bresennol? +STR_SAVELOAD_PARENT_DIRECTORY :{STRING} (Plygell rhiant) STR_SAVELOAD_OSKTITLE :{BLACK}Rhowch enw ar gyfer y gêm a gadwyd @@ -2818,12 +2896,17 @@ STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP :{BLACK}Dewis ar STR_MAPGEN_DATE :{BLACK}Dyddiad: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Nifer diwydiannau: STR_MAPGEN_LAND_GENERATOR :{BLACK}Cynhyrchydd Tir: +STR_MAPGEN_SNOW_COVERAGE :Gorchuddiad eira: +STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_TERRAIN_TYPE :{BLACK}Math Tirwedd: STR_MAPGEN_SEA_LEVEL :{BLACK}Lefel y Môr: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Afonydd: STR_MAPGEN_SMOOTHNESS :{BLACK}Llyfnder: STR_MAPGEN_VARIETY :{BLACK}Dosbarthiad amrywiaeth: STR_MAPGEN_GENERATE :{WHITE}Cynhyrchu +STR_MAPGEN_NEWGRF_SETTINGS :{BLACK}Gosodiadau NewGRF +STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP :{BLACK}Dangos gosodiadau NewGRF +STR_MAPGEN_GS_SETTINGS :{BLACK}Gosodiadau sgript gêm ###length 21 STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH :Saesneg (Gwreiddiol) @@ -2865,6 +2948,7 @@ STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Enw'r Ma STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Maint: STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} x {NUM} +STR_MAPGEN_SNOW_COVERAGE_QUERY_CAPT :{WHITE}Gorchuddiad eira (mewn %) STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Newid y flwyddyn gychwyn # SE Map generation @@ -3136,18 +3220,21 @@ STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT :Prynu hawliau c STR_LOCAL_AUTHORITY_ACTION_BRIBE :Llwgrwobrwyo awdurdod lleol ###length 8 -STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{YELLOW}Dechrau ymgyrch hysbyseb bach yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{} Côst: {CURRENCY_LONG} -STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{YELLOW}Dechrau ymgyrch hysbyseb gymhedrol yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{} Côst: {CURRENCY_LONG} -STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{YELLOW}Dechrau ymgyrch hysbyseb fawr yn yr adral, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd .{} Cost: {CURRENCY_LONG} -STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{YELLOW} Ariannu gwaith ffordd ar y rhwydwaith ffyrdd trefol. Bydd yn amharu'n fawr ar drafnidiaeth y dref am hyd at 6 mis .{} Cost: {CURRENCY_LONG} -STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{YELLOW} Adeiladu cerflun er clod eich cwmni.{} Côst: {CURRENCY_LONG} -STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{YELLOW} Ariannu adeiladu adeiladau masnachol newydd yn y dref.{} Côst: {CURRENCY_LONG} STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{YELLOW}Prynu'r hawl i fod yr unig gyflenwr cludiant yn y dref am flwyddyn. Bydd awdurdod y dref ond yn caniatáy i deithwyr a chargo ddefnyddio eich gorsafoedd chi{} Cost: {CURRENCY_LONG} STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{YELLOW} Llwgrwobrwyo'r awdurdod lleol i wella'ch gradd, ond byddwch mewn perygl o dderbyn côsb sylweddol os cewch chi'ch dal.{} Côst: {CURRENCY_LONG} +STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{PUSH_COLOUR}{YELLOW}Dechrau ymgyrch hysbyseb bach yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{}Mae'n rhoi hwb dros-dro i sgôr gorsafoedd mewn radiws bach o amgylch canol y dref{}{POP_COLOUR}Cost: {CURRENCY_LONG} +STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{PUSH_COLOUR}{YELLOW}Dechrau ymgyrch hysbyseb gymhedrol yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{}Mae'n rhoi hwb dros-dro i sgôr gorsafoedd mewn radiw gymhedrol o amgylch canol y dref{}{POP_COLOUR}Cost: {CURRENCY_LONG} +STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{PUSH_COLOUR}{YELLOW}Dechrau ymgyrch hysbyseb fawr yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{}Mae'n rhoi hwb dros-dro i sgôr gorsafoedd mewn radiws mawr o amgylch canol y dref{}{POP_COLOUR}Cost: {CURRENCY_LONG} +STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{PUSH_COLOUR}{YELLOW} Ariannu gwaith ffordd ar y rhwydwaith ffyrdd trefol.{}Bydd yn amharu'n fawr ar drafnidiaeth y dref am hyd at 6 mis.{}{POP_COLOUR}Cost: {CURRENCY_LONG} +STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{PUSH_COLOUR}{YELLOW} Adeiladu cerflun er clod eich cwmni.{}Mae'n rhoi heb parhaol i sgôr gorsagoeddyn y dref yma.{}{POP_COLOUR}Cost: {CURRENCY_LONG} +STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{PUSH_COLOUR}{YELLOW} Ariannu adeiladu adeiladau masnachol newydd yn y dref.{}Mae'n rhoi heb dros-dro i tyfiant tref yn y dref yma.{}{POP_COLOUR}Côst: {CURRENCY_LONG} # Goal window STR_GOALS_CAPTION :{WHITE}Amcanion {COMPANY} STR_GOALS_SPECTATOR_CAPTION :{WHITE}Amcanion Bydol +STR_GOALS_GLOBAL_BUTTON :{BLACK}Bydol +STR_GOALS_GLOBAL_BUTTON_HELPTEXT :{BLACK}Dangos amcanion bydol +STR_GOALS_COMPANY_BUTTON_HELPTEXT :{BLACK}Dangos amcanion y cwmni STR_GOALS_TEXT :{ORANGE}{STRING} STR_GOALS_NONE :{ORANGE}- Dim - STR_GOALS_PROGRESS :{ORANGE}{STRING} @@ -3155,10 +3242,10 @@ STR_GOALS_PROGRESS_COMPLETE :{GREEN}{STRING} STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Cliciwch ar amcan i ganoli'r brif olygfa ar y diwydiant/tref/teil Mae Ctrl+Clic yn agor ffenestr golwg newydd ar leoliad y diwydiant/tref/teil # Goal question window -STR_GOAL_QUESTION_CAPTION_QUESTION :Cwestiwn -STR_GOAL_QUESTION_CAPTION_INFORMATION :Gwybodaeth -STR_GOAL_QUESTION_CAPTION_WARNING :Rhybudd -STR_GOAL_QUESTION_CAPTION_ERROR :Gwall +STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Cwestiwn +STR_GOAL_QUESTION_CAPTION_INFORMATION :{BLACK}Gwybodaeth +STR_GOAL_QUESTION_CAPTION_WARNING :{BLACK}Rhybudd +STR_GOAL_QUESTION_CAPTION_ERROR :{YELLOW}Gwall # Goal Question button list ###length 18 @@ -3290,24 +3377,31 @@ STR_FINANCES_CAPTION :{WHITE}Cyllid { STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 +STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Costau Gweithredol +STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Costau Cyfalaf ###length 13 STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Adeiladu STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Cerbydau Newydd -STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Costau Rhedeg Trenau -STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Costau Rhedeg Cerbydau Ffordd -STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Costau Rhedeg Awyrennau -STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Costau Rhedeg Llongau +STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trenau +STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Cerbydau Ffordd +STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Awyrennau +STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Llongau +STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Tanadeiledd +STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Trenau +STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Awyrennau STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Llog y Benthyciad STR_FINANCES_SECTION_OTHER :{GOLD}Arall -STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} -STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG} +STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} +STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Balans Banc STR_FINANCES_LOAN_TITLE :{WHITE}Benthyciad +STR_FINANCES_INTEREST_RATE :{WHITE}Llog y Benthyciad: {BLACK}{NUM}% STR_FINANCES_MAX_LOAN :{WHITE}Uchafswm Benthyciad: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} +STR_FINANCES_BANK_BALANCE :{WHITE}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Benthyg {CURRENCY_LONG} STR_FINANCES_BORROW_TOOLTIP :{BLACK}Cynyddu maint y benthyciad. Mae Ctrl+Clic yn benthyca gymait ag y sydd bosib STR_FINANCES_REPAY_BUTTON :{BLACK}Ad-dalu {CURRENCY_LONG} @@ -3345,6 +3439,7 @@ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ailadeil STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Manylion STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Gweld cyfansymau tanadeiledd manwl STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Rhoi arian +STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Rhoi arian i'r cwmni yma STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Gwyneb Newydd STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Dewiswch wyneb newydd ar gyfer y rheolwr @@ -3381,6 +3476,8 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL :{WHITE}{CURRENC STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Diwydiannau STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Dim - STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY} +STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING} +STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} a {NUM} mwy... STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Enwau diwydiannau - cliciwch ar enw i ganoli'r sgrin ar ddiwydiant. Mae Ctrl+Clic yn agor ffenest golwg newydd ar leoliad y diwydiant # Industry view @@ -3391,9 +3488,10 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Canoli'r STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Lefel cynhyrchu: {YELLOW}{COMMA}% STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Mae'r diwydiant wedi datgan ei fod ar fin cau! +STR_INDUSTRY_VIEW_REQUIRES_N_CARGO :{BLACK}Angen: {YELLOW}{STRING}{STRING} STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Angen: -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{0:STRING}{BLACK}{3:STRING} STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} yn disgwyl{STRING} STR_CONFIG_GAME_PRODUCTION :{WHITE}Newid cynnyrch (lluosrif o 8, hyd at 2040) @@ -3453,7 +3551,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grŵp - STR_GROUP_CREATE_TOOLTIP :{BLACK}Cliciwch i greu grŵp STR_GROUP_DELETE_TOOLTIP :{BLACK}Dileu'r grŵp a ddewiswyd STR_GROUP_RENAME_TOOLTIP :{BLACK}Ailenwi'r grŵp a ddewiswyd -STR_GROUP_REPLACE_PROTECTION_TOOLTIP :{BLACK}Cliciwch i amddiffyn y grŵp rhag awtoddisodli gêm-eang +STR_GROUP_REPLACE_PROTECTION_TOOLTIP :{BLACK}Cliciwch i amddiffyn y grŵp rhag awtoddisodli bydol. Mae Ctrl+clic hefyd yn amddiffyn is-grwpiau STR_QUERY_GROUP_DELETE_CAPTION :{WHITE}Dileu Grŵp STR_GROUP_DELETE_QUERY_TEXT :{WHITE} Ydych chi'n siwer eich bod am ddileu'r grŵp yma ac unrhyw ddisgynyddion? @@ -3480,6 +3578,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION :Cerbydau Ffordd # Vehicle availability ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_ALL_CAPTION :Cerbydau Rheilffordd Newydd +STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION :Cerbydau Ffordd Newydd STR_BUY_VEHICLE_SHIP_CAPTION :Llongau Newydd STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Awyrennau Newydd @@ -3500,12 +3599,15 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Gallu cl STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Wageni Pŵer: {GOLD}+{POWER}{BLACK} Pwysau: {GOLD}+{WEIGHT_SHORT} STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modd ei ailffitio i: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Pob math o lwyth +STR_PURCHASE_INFO_NONE :Dim STR_PURCHASE_INFO_ALL_BUT :Popeth ond{CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Grym Tynnu Uchaf: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Pellter cyrhaeddiad: {GOLD}{COMMA} teil STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Math awyren: {GOLD}{STRING} ###length 3 +STR_CARGO_TYPE_FILTER_ALL :Pob math o lwyth +STR_CARGO_TYPE_FILTER_NONE :Dim ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Rhestr dewis trenau. Cliciwch ar gerbyd am wybodaeth. Mae Ctrl+Clicio'n toglu cuddio'r math cerbyd @@ -3520,8 +3622,10 @@ STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Prynu Ll STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Prynu Awyren ###length VEHICLE_TYPES +STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Prynu ac Ailffitio Cerbyd STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Prynu ac Ailffitio Cerbyd STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Prynu ac Ailffitio Llong +STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Prynu ac Ailffitio Awyrennau ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Adeiladu'r cerbyd trên sydd wedi'i amlygu. Mae Shift+Clic yn dangos amcangyfrif o'r gost @@ -3667,7 +3771,7 @@ STR_ENGINE_PREVIEW_AIRCRAFT :awyren STR_ENGINE_PREVIEW_SHIP :llong STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Côst: {CURRENCY_LONG} Pwysau: {WEIGHT_SHORT}{}Cyflymder: {VELOCITY} Pŵer: {POWER}{}Côst Rhedeg: {CURRENCY_LONG}/bl{}Gallu cludo: {CARGO_LONG} -STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Cost: {CURRENCY_LONG} Pwysau: {WEIGHT_SHORT}{}Cyflymder: {VELOCITY} Pŵer: {POWER} Grym Uchaf: {6:FORCE}{}Cost Rhedeg: {4:CURRENCY_LONG}/bl{}Cynhwysedd: {5:CARGO_LONG} +STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Cost: {0:CURRENCY_LONG} Pwysau: {1:WEIGHT_SHORT}{}Cyflymder: {2:VELOCITY} Pŵer: {3:POWER} Grym Uchaf: {6:FORCE}{}Cost Rhedeg: {4:CURRENCY_LONG}/bl{}Cynhwysedd: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Cost: {CURRENCY_LONG} Cyflym. Uchaf: {VELOCITY}{}Cynhwysedd: {CARGO_LONG}{}Cost Rhedeg: {CURRENCY_LONG}/bl STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST :{BLACK}Cost: {CURRENCY_LONG} Cyflym. Uchaf: {VELOCITY}{}Math awyren: {STRING}{}Cynhwysedd: {CARGO_LONG}, {CARGO_LONG}{}Cost rhedeg: {CURRENCY_LONG}/bl STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}Cost: {CURRENCY_LONG} Cyflym. Uchaf: {VELOCITY}{}Math awyren: {STRING}{}Cynhwysedd: {CARGO_LONG}{}Cost Rhedeg: {CURRENCY_LONG}/bl @@ -3716,7 +3820,9 @@ STR_REPLACE_ELRAIL_VEHICLES :Cerbydau Rheilf STR_REPLACE_MONORAIL_VEHICLES :Cerbydau Monoreilffordd STR_REPLACE_MAGLEV_VEHICLES :Cerbydau Maglef +STR_REPLACE_ROAD_VEHICLES :Cerbydau Ffordd +STR_REPLACE_REMOVE_WAGON :{BLACK}Tynnu wagenni: ({STRING}): {ORANGE}{STRING} STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gwneud i awtoddisodli gadw hyd y trên yr un peth drwy dynnu wagenni (gan ddechrau yn y blaen), os byddai newid yr injan yn gwneud y trên yn hirach # Vehicle view @@ -3747,10 +3853,10 @@ STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Ailffiti STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Ailffitio awyren i gario llwyth o fath gwahanol ###length VEHICLE_TYPES -STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion trên. Mae Ctrl+Clic yn ddangos amserlen y trên -STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion cerbyd. Mae Ctrl+Clic yn ddangos amserlen y cerbyd -STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion llong. Mae Ctrl+Clic yn ddangos amserlen y long -STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion awyren. Mae Ctrl + clic yn ddangos amserlen y awyren +STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion trên. Mae Ctrl+Clic yn dangos amserlen y trên +STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion cerbyd. Mae Ctrl+Clic yn dangos amserlen y cerbyd +STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion llong. Mae Ctrl+Clic yn dangos amserlen y llong +STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Dangos gorchmynion awyren. Mae Ctrl + clic yn dangos amserlen y awyren ###length VEHICLE_TYPES STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos manylion trên @@ -3777,6 +3883,7 @@ STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Mynd tu STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_VEL :{ORANGE}Mynd tua {DEPOT}, {VELOCITY} STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL :{LTBLUE}Mynd am wasanaeth yn {DEPOT}, {VELOCITY} +STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_VEL :{ORANGE}Methu cyrraedd {DEPOT}, {VELOCITY} # Vehicle stopped/started animations ###length 2 @@ -3807,6 +3914,7 @@ STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Pwys: {L STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Pwys: {LTBLUE}{WEIGHT_SHORT} {BLACK}Pŵer: {LTBLUE}{POWER}{BLACK} Cyflym. Max: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE} STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Elw eleni: {LTBLUE}{CURRENCY_LONG} (llynedd: {CURRENCY_LONG}) +STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_MIN_PERFORMANCE :{BLACK}Elw eleni: {LTBLUE}{CURRENCY_LONG} (Elw llynedd : {CURRENCY_LONG}) {BLACK}Perfformiad isafsymol: {LTBLUE}{POWER_TO_WEIGHT} STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Dibynadwyedd: {LTBLUE}{COMMA}% {BLACK}Toriadau ers gwasanaeth olaf: {LTBLUE}{COMMA} STR_VEHICLE_INFO_BUILT_VALUE :{LTBLUE}{ENGINE} {BLACK}Codi: {LTBLUE}{NUM}{BLACK} Pris: {LTBLUE}{CURRENCY_LONG} @@ -4062,7 +4170,7 @@ STR_TIMETABLE_TRAVEL_FOR_SPEED :Teithio am {STR STR_TIMETABLE_TRAVEL_FOR_ESTIMATED :Teithio (am {STRING}, heb ei amserlennu) STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED :Teitho (am {STRING}, heb ei amserlennu) dim cyflymach na {VELOCITY} STR_TIMETABLE_STAY_FOR_ESTIMATED :(aros am {STRING}, heb ei amserlennu) -STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED :(teitiho am {STRING}, heb ei amserlennu) +STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED :(teithio am {STRING}, heb ei amserlennu) STR_TIMETABLE_STAY_FOR :aros am {STRING} STR_TIMETABLE_AND_TRAVEL_FOR :a theithio am {STRING} STR_TIMETABLE_DAYS :{COMMA}{NBSP}diwrnod @@ -4153,11 +4261,12 @@ STR_AI_CONFIG_MOVE_DOWN :{BLACK}Symud i STR_AI_CONFIG_MOVE_DOWN_TOOLTIP :{BLACK}Symud yr AI a ddewiswyd i lawr y rhestr STR_AI_CONFIG_GAMESCRIPT :{SILVER}Sgript Gêm +STR_AI_CONFIG_GAMESCRIPT_PARAM :{SILVER}Paramedrau STR_AI_CONFIG_AI :{SILVER}AIau -STR_AI_CONFIG_CHANGE_AI :AI -STR_AI_CONFIG_CHANGE_GAMESCRIPT :Sgript Gêm +STR_AI_CONFIG_CHANGE_AI :{BLACK} Dewis AI STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Llwytho sgript arall +STR_AI_CONFIG_CHANGE_GAMESCRIPT :Dewis Sgript Gêm STR_AI_CONFIG_CONFIGURE :{BLACK}Ffurfweddu STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}ffurfweddu paramedrau'r sgript @@ -4176,6 +4285,8 @@ STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Dewis y STR_AI_LIST_CANCEL :{BLACK}Canslo STR_AI_LIST_CANCEL_TOOLTIP :{BLACK}Peidio newid y sgript +STR_SCREENSHOT_CAPTION :{WHITE}Creu ciplun +STR_SCREENSHOT_WORLD_SCREENSHOT :{BLACK}Ciplun map cyfan # AI Parameters STR_AI_SETTINGS_CAPTION_AI :AI @@ -4234,6 +4345,7 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Mae'r gêm a ga STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Ffeil annarllenadwy STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Ffeil anysgrifenadwy STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Methodd y gwirio cyfanrwydd data +STR_GAME_SAVELOAD_ERROR_PATCHPACK :Mae'r gêm a gadwyd wedi ei chadw mewn fersiwn addasiedig STR_GAME_SAVELOAD_NOT_AVAILABLE : STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb gynhaliaeth tramiau. Dileuwyd y tramiau @@ -4314,6 +4426,7 @@ STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... nid STR_ERROR_CURRENCY_REQUIRED :{WHITE}... angen {CURRENCY_LONG} STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Does dim modd ad-dalu benthyciad... STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}Does dim modd rhoi arian sydd wedi ei fenthyg gan y banc i ffwrdd... +STR_ERROR_CAN_T_GIVE_MONEY :{WHITE}Methu rhoi arian i'r cwmni yma... STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Methu prynu cwmni... STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Methu adeiladu pencadlys cwmni... STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Methu prynu cyfran o 25% o'r cwmni hwn... @@ -4440,6 +4553,7 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :math depo anghy STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}Aeth gormod o amser heibio i allu adnewyddu {VEHICLE} STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Ni weithredwyd unrhyw reolau awtogyfnewid/adnewyddu STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(terfyn arian) +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Nid yw'r cerbyd newydd yn gallu cario {STRING} # Rail construction errors STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Cyfuniad trac amhosib @@ -4467,6 +4581,7 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM :{WHITE}Methu cl STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Methu dileu tramffordd oddi yma... STR_ERROR_THERE_IS_NO_ROAD :{WHITE}... nid oes ffordd yno STR_ERROR_THERE_IS_NO_TRAMWAY :{WHITE}... nid oes tramffordd yno +STR_ERROR_CAN_T_CONVERT_TRAMWAY :{WHITE}Methu trosi'r math tram yma... STR_ERROR_NO_SUITABLE_ROAD :{WHITE}Dim lôn addas # Waterway construction errors @@ -4612,6 +4727,7 @@ STR_ERROR_CAN_T_SKIP_TO_ORDER :{WHITE}Does dim STR_ERROR_CAN_T_COPY_SHARE_ORDER :{WHITE}... ni all y cerbyd fynd i bob gorsaf STR_ERROR_CAN_T_ADD_ORDER :{WHITE}... ni all y cerbyd fynd i'r orsaf honno STR_ERROR_CAN_T_ADD_ORDER_SHARED :{WHITE}... ni all cerbyd sy'n rhannu'r gorchymyn hwn fynd i'r orsaf honno +STR_ERROR_CAN_T_SHARE_ORDER_VEHICLE_LIST :{WHITE}... nid yw bob cerbyd yn rhannu gorchmynion STR_ERROR_CAN_T_SHARE_ORDER_LIST :{WHITE}Does dim modd rhannu'r rhestr gorchmynion... STR_ERROR_CAN_T_STOP_SHARING_ORDER_LIST :{WHITE}Methu rhoi'r gorau i rannu rhestr gorchmynion... @@ -4760,7 +4876,7 @@ STR_SV_STNAME_SIDINGS :Cilffordd {STRI STR_SV_STNAME_BRANCH :Cangen {STRING} STR_SV_STNAME_UPPER :Blaenau {STRING} STR_SV_STNAME_LOWER :Dyffryn {STRING} -STR_SV_STNAME_HELIPORT :Hofrenyddborth {STRING} +STR_SV_STNAME_HELIPORT :Hofrenfa {STRING} STR_SV_STNAME_FOREST :Coedwig {STRING} STR_SV_STNAME_FALLBACK :{STRING} Gorsaf #{NUM} diff --git a/src/network/core/tcp_admin.cpp b/src/network/core/tcp_admin.cpp index de1c22131c..877ee93b26 100644 --- a/src/network/core/tcp_admin.cpp +++ b/src/network/core/tcp_admin.cpp @@ -47,7 +47,13 @@ NetworkRecvStatus NetworkAdminSocketHandler::HandlePacket(Packet *p) { PacketAdminType type = (PacketAdminType)p->Recv_uint8(); - switch (this->HasClientQuit() ? INVALID_ADMIN_PACKET : type) { + if (this->HasClientQuit()) { + Debug(net, 0, "[tcp/admin] Received invalid packet from '{}' ({})", this->admin_name, this->admin_version); + this->CloseConnection(); + return NETWORK_RECV_STATUS_MALFORMED_PACKET; + } + + switch (type) { case ADMIN_PACKET_ADMIN_JOIN: return this->Receive_ADMIN_JOIN(p); case ADMIN_PACKET_ADMIN_QUIT: return this->Receive_ADMIN_QUIT(p); case ADMIN_PACKET_ADMIN_UPDATE_FREQUENCY: return this->Receive_ADMIN_UPDATE_FREQUENCY(p); @@ -87,12 +93,7 @@ NetworkRecvStatus NetworkAdminSocketHandler::HandlePacket(Packet *p) case ADMIN_PACKET_SERVER_PONG: return this->Receive_SERVER_PONG(p); default: - if (this->HasClientQuit()) { - Debug(net, 0, "[tcp/admin] Received invalid packet type {} from '{}' ({})", type, this->admin_name, this->admin_version); - } else { - Debug(net, 0, "[tcp/admin] Received illegal packet from '{}' ({})", this->admin_name, this->admin_version); - } - + Debug(net, 0, "[tcp/admin] Received invalid packet type {} from '{}' ({})", type, this->admin_name, this->admin_version); this->CloseConnection(); return NETWORK_RECV_STATUS_MALFORMED_PACKET; } diff --git a/src/network/core/tcp_game.cpp b/src/network/core/tcp_game.cpp index 2e99659133..aea4ef6825 100644 --- a/src/network/core/tcp_game.cpp +++ b/src/network/core/tcp_game.cpp @@ -20,6 +20,8 @@ #include "../../safeguards.h" +static std::vector> _deferred_deletions; + /** * Create a new socket for the game connection. * @param s The socket to connect with. @@ -64,9 +66,15 @@ NetworkRecvStatus NetworkGameSocketHandler::HandlePacket(Packet *p) { PacketGameType type = (PacketGameType)p->Recv_uint8(); + if (this->HasClientQuit()) { + Debug(net, 0, "[tcp/game] Received invalid packet from client {}", this->client_id); + this->CloseConnection(); + return NETWORK_RECV_STATUS_MALFORMED_PACKET; + } + this->last_packet = std::chrono::steady_clock::now(); - switch (this->HasClientQuit() ? PACKET_END : type) { + switch (type) { case PACKET_SERVER_FULL: return this->Receive_SERVER_FULL(p); case PACKET_SERVER_BANNED: return this->Receive_SERVER_BANNED(p); case PACKET_CLIENT_JOIN: return this->Receive_CLIENT_JOIN(p); @@ -113,13 +121,8 @@ NetworkRecvStatus NetworkGameSocketHandler::HandlePacket(Packet *p) case PACKET_SERVER_CONFIG_UPDATE: return this->Receive_SERVER_CONFIG_UPDATE(p); default: + Debug(net, 0, "[tcp/game] Received invalid packet type {} from client {}", type, this->client_id); this->CloseConnection(); - - if (this->HasClientQuit()) { - Debug(net, 0, "[tcp/game] Received invalid packet type {} from client {}", type, this->client_id); - } else { - Debug(net, 0, "[tcp/game] Received illegal packet from client {}", this->client_id); - } return NETWORK_RECV_STATUS_MALFORMED_PACKET; } } @@ -198,3 +201,15 @@ NetworkRecvStatus NetworkGameSocketHandler::Receive_SERVER_MOVE(Packet *p) { ret NetworkRecvStatus NetworkGameSocketHandler::Receive_CLIENT_MOVE(Packet *p) { return this->ReceiveInvalidPacket(PACKET_CLIENT_MOVE); } NetworkRecvStatus NetworkGameSocketHandler::Receive_SERVER_COMPANY_UPDATE(Packet *p) { return this->ReceiveInvalidPacket(PACKET_SERVER_COMPANY_UPDATE); } NetworkRecvStatus NetworkGameSocketHandler::Receive_SERVER_CONFIG_UPDATE(Packet *p) { return this->ReceiveInvalidPacket(PACKET_SERVER_CONFIG_UPDATE); } + +void NetworkGameSocketHandler::DeferDeletion() +{ + _deferred_deletions.emplace_back(this); + this->is_pending_deletion = true; +} + +/* static */ void NetworkGameSocketHandler::ProcessDeferredDeletions() +{ + /* Calls deleter on all items */ + _deferred_deletions.clear(); +} diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index cd0facd781..e1372b73bc 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -154,7 +154,8 @@ public: class NetworkGameSocketHandler : public NetworkTCPSocketHandler { /* TODO: rewrite into a proper class */ private: - NetworkClientInfo *info; ///< Client info related to this socket + NetworkClientInfo *info; ///< Client info related to this socket + bool is_pending_deletion = false; ///< Whether this socket is pending deletion protected: NetworkRecvStatus ReceiveInvalidPacket(PacketGameType type); @@ -543,6 +544,11 @@ public: const char *ReceiveCommand(Packet *p, CommandPacket *cp); void SendCommand(Packet *p, const CommandPacket *cp); + + bool IsPendingDeletion() const { return this->is_pending_deletion; } + + void DeferDeletion(); + static void ProcessDeferredDeletions(); }; #endif /* NETWORK_CORE_TCP_GAME_H */ diff --git a/src/network/network.cpp b/src/network/network.cpp index c3b4974c36..f4ae3a361e 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -599,6 +599,7 @@ void NetworkClose(bool close_admins) _network_coordinator_client.CloseAllConnections(); } + NetworkGameSocketHandler::ProcessDeferredDeletions(); TCPConnecter::KillAll(); @@ -996,12 +997,15 @@ void NetworkUpdateServerGameType() */ static bool NetworkReceive() { + bool result; if (_network_server) { ServerNetworkAdminSocketHandler::Receive(); - return ServerNetworkGameSocketHandler::Receive(); + result = ServerNetworkGameSocketHandler::Receive(); } else { - return ClientNetworkGameSocketHandler::Receive(); + result = ClientNetworkGameSocketHandler::Receive(); } + NetworkGameSocketHandler::ProcessDeferredDeletions(); + return result; } /* This sends all buffered commands (if possible) */ @@ -1013,6 +1017,7 @@ static void NetworkSend() } else { ClientNetworkGameSocketHandler::Send(); } + NetworkGameSocketHandler::ProcessDeferredDeletions(); } /** @@ -1027,6 +1032,7 @@ void NetworkBackgroundLoop() TCPConnecter::CheckCallbacks(); NetworkHTTPSocketHandler::HTTPReceive(); QueryNetworkGameSocketHandler::SendReceive(); + NetworkGameSocketHandler::ProcessDeferredDeletions(); NetworkBackgroundUDPLoop(); } diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index e01daa126e..ac4da07ee9 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -160,6 +160,8 @@ ClientNetworkGameSocketHandler::~ClientNetworkGameSocketHandler() NetworkRecvStatus ClientNetworkGameSocketHandler::CloseConnection(NetworkRecvStatus status) { assert(status != NETWORK_RECV_STATUS_OKAY); + if (this->IsPendingDeletion()) return status; + assert(this->sock != INVALID_SOCKET); if (!this->HasClientQuit()) { @@ -174,7 +176,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::CloseConnection(NetworkRecvSta CSleep(3 * MILLISECONDS_PER_TICK); } - delete this; + this->DeferDeletion(); return status; } @@ -185,6 +187,8 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::CloseConnection(NetworkRecvSta */ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res) { + if (this->IsPendingDeletion()) return; + /* First, send a CLIENT_ERROR to the server, so it knows we are * disconnected (and why!) */ NetworkErrorCode errorno; diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index d3cbdf9e3a..67d59bddda 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -224,6 +224,8 @@ ServerNetworkGameSocketHandler::ServerNetworkGameSocketHandler(SOCKET s) : Netwo */ ServerNetworkGameSocketHandler::~ServerNetworkGameSocketHandler() { + delete this->GetInfo(); + if (_redirect_console_to_client == this->client_id) _redirect_console_to_client = INVALID_CLIENT_ID; OrderBackup::ResetUser(this->client_id); @@ -256,7 +258,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta * connection. This handles that case gracefully without having to make * that code any more complex or more aware of the validity of the socket. */ - if (this->sock == INVALID_SOCKET) return status; + if (this->IsPendingDeletion() || this->sock == INVALID_SOCKET) return status; if (status != NETWORK_RECV_STATUS_CLIENT_QUIT && status != NETWORK_RECV_STATUS_SERVER_ERROR && !this->HasClientQuit() && this->status >= STATUS_AUTHORIZED) { /* We did not receive a leave message from this client... */ @@ -292,8 +294,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta this->SendPackets(true); - delete this->GetInfo(); - delete this; + this->DeferDeletion(); InvalidateWindowData(WC_CLIENT_LIST, 0); diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 630cd18f2d..cd5cb53a49 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -202,10 +202,10 @@ struct OskWindow : public Window { this->parent->SetWidgetDirty(this->text_btn); } - void OnFocusLost() override + void OnFocusLost(bool closing) override { VideoDriver::GetInstance()->EditBoxLostFocus(); - this->Close(); + if (!closing) this->Close(); } }; diff --git a/src/rev.cpp.in b/src/rev.cpp.in index c2437fdcda..1ee2559d7c 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -35,7 +35,7 @@ bool IsReleasedVersion() * * shows a "M", if the binary is made from modified source code. */ -const char _openttd_revision[] = "13.3"; +const char _openttd_revision[] = "13.4"; /** * The text version of OpenTTD's build date. @@ -48,7 +48,7 @@ const char _openttd_build_date[] = __DATE__ " " __TIME__; /** * The git revision hash of this version. */ -const char _openttd_revision_hash[] = "d854bb82e51bb5a4bd59a0363f34d22384758aa0"; +const char _openttd_revision_hash[] = "7e457a367e67f4e1b7d28ebd769e3a649ea60175"; /** * The year of this version. @@ -77,7 +77,7 @@ const byte _openttd_revision_tagged = 1; * It should never contain things like "beta", but only the release version * we are compatible with. */ -const char _openttd_content_version[] = "13.3"; +const char _openttd_content_version[] = "13.4"; /** * The NewGRF revision of OTTD: @@ -95,4 +95,4 @@ const char _openttd_content_version[] = "13.3"; * the "patch" part of the version. To make sure "1.11.0" is smaller than "12.0", we * have to adjust the major by 16. */ -const uint32 _openttd_newgrf_version = (13 + 16) << 24 | 3 << 20 | 1 << 19 | 28004; +const uint32 _openttd_newgrf_version = (13 + 16) << 24 | 4 << 20 | 1 << 19 | 28004; diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 3730341005..e731793c5e 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1026,7 +1026,7 @@ uint BaseSettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int if (cur_row >= max_row) return cur_row; bool rtl = _current_text_dir == TD_RTL; - int offset = (rtl ? -(int)_circle_size.width : _circle_size.width) / 2; + int offset = (rtl ? -(int)_circle_size.width : (int)_circle_size.width) / 2; int level_width = rtl ? -WidgetDimensions::scaled.hsep_indent : WidgetDimensions::scaled.hsep_indent; int x = rtl ? right : left; @@ -1044,7 +1044,7 @@ uint BaseSettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int int bottom_y = (flags & SEF_LAST_FIELD) ? halfway_y : y + SETTING_HEIGHT - 1; GfxDrawLine(x + offset, y, x + offset, bottom_y, colour); /* Small horizontal line from the last vertical line */ - GfxDrawLine(x + offset, halfway_y, x + level_width - WidgetDimensions::scaled.hsep_normal, halfway_y, colour); + GfxDrawLine(x + offset, halfway_y, x + level_width - (rtl ? -WidgetDimensions::scaled.hsep_normal : WidgetDimensions::scaled.hsep_normal), halfway_y, colour); x += level_width; this->DrawSetting(settings_ptr, rtl ? left : x, rtl ? x : right, y, this == selected); diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 18118dc60d..eeba700c86 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -201,9 +201,12 @@ struct DropdownWindow : Window { if (nwc != nullptr) SetBit(nwc->disp_flags, NDB_DROPDOWN_CLOSED); } - void OnFocusLost() override + void OnFocusLost(bool closing) override { - this->Close(); + if (!closing) { + this->instant_close = false; + this->Close(); + } } Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number) override diff --git a/src/window.cpp b/src/window.cpp index 5644364507..fa632c3e81 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -469,7 +469,7 @@ void SetFocusedWindow(Window *w) _focused_window = w; /* So we can inform it that it lost focus */ - if (old_focused != nullptr) old_focused->OnFocusLost(); + if (old_focused != nullptr) old_focused->OnFocusLost(false); if (_focused_window != nullptr) _focused_window->OnFocus(); } @@ -545,7 +545,7 @@ void Window::OnFocus() /** * Called when window loses focus */ -void Window::OnFocusLost() +void Window::OnFocusLost(bool closing) { if (this->nested_focus != nullptr && this->nested_focus->type == WWT_EDITBOX) VideoDriver::GetInstance()->EditBoxLostFocus(); } @@ -1127,7 +1127,7 @@ void Window::Close() /* Make sure we don't try to access this window as the focused window when it doesn't exist anymore. */ if (_focused_window == this) { - this->OnFocusLost(); + this->OnFocusLost(true); _focused_window = nullptr; } diff --git a/src/window_gui.h b/src/window_gui.h index 00dfd9960a..798d6d32dc 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -521,9 +521,16 @@ public: */ virtual void SetStringParameters(int widget) const {} + /** + * The window has gained focus. + */ virtual void OnFocus(); - virtual void OnFocusLost(); + /** + * The window has lost focus. + * @param closing True iff the window has lost focus in the process of closing. + */ + virtual void OnFocusLost(bool closing); /** * A key has been pressed. diff --git a/update.sh b/update.sh index 2ef4965881..cbe45bc624 100755 --- a/update.sh +++ b/update.sh @@ -3,7 +3,7 @@ dir=`mktemp -d` curdir=`pwd` echo $dir cd $dir -wget https://proxy.binaries.openttd.org/openttd-releases/$version/openttd-$version-source.tar.xz +wget https://cdn.openttd.org/openttd-releases/$version/openttd-$version-source.tar.xz tar xf openttd-$version-source.tar.xz ttdir=$dir/openttd-$version cp -rT $ttdir $curdir