diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 5f781dfb00..1837150dae 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -7,13 +7,18 @@ on: required: true type: string + recipe_id_full: + required: true + type: string + build_id: required: true type: number - recipe_id_full: - required: true - type: string + build_info: + required: false + default: true + type: boolean recipe_id_latest: required: false @@ -45,11 +50,6 @@ on: default: true type: boolean - create_from_source: - required: false - default: false - type: boolean - env: CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} @@ -92,7 +92,7 @@ jobs: path: | $HOME/.conan/data $HOME/.conan/conan_download_cache - key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache + key: conan-${{ inputs.runs_on }}-${{ runner.arch }}-create-cache - name: Cache Conan local repository packages (Powershell) uses: actions/cache@v3 @@ -102,7 +102,7 @@ jobs: C:\Users\runneradmin\.conan\data C:\.conan C:\Users\runneradmin\.conan\conan_download_cache - key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache + key: conan-${{ inputs.runs_on }}-${{ runner.arch }}-create-cache - name: Install MacOS system requirements if: ${{ runner.os == 'Macos' }} @@ -114,7 +114,7 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt update sudo apt upgrade - sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y + sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config flex bison -y - name: Install GCC-12 on ubuntu-22.04 if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} @@ -140,34 +140,48 @@ jobs: if: ${{ inputs.conan_config_branch == '' }} run: conan config install https://github.com/Ultimaker/conan-config.git - - name: Create the Packages - if: ${{ !inputs.create_from_source }} + - name: Create the lock file + if: ${{ inputs.build_info }} run: | conan_build_info --v2 start ${{ inputs.project_name }} ${{ github.run_number }}000${{ inputs.build_id }} - conan lock create --reference ${{ inputs.recipe_id_full }} --build=missing --update - conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock - conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} - conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} - conan_build_info --v2 stop + conan lock create --reference ${{ inputs.recipe_id_full }} --lockfile-out=conan.lock - - name: Create the Packages (from source) - if: ${{ inputs.create_from_source }} - run: conan create . ${{ inputs.recipe_id_full }} --build=missing --update + - name: Create the Packages using lockfile + if: ${{ inputs.build_info }} + run: conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock --lockfile-out=conan.lock - - name: Remove the latest alias - if: ${{ inputs.create_from_source && inputs.recipe_id_latest != '' && runner.os == 'Linux' }} - run: | - conan remove ${{ inputs.recipe_id_latest }} -r cura -f || true - conan remove ${{ inputs.recipe_id_latest }} -r cura-ce -f || true + - name: Create the Packages + if: ${{ ! inputs.build_info }} + run: conan install ${{ inputs.recipe_id_full }} --build=missing --update - - name: Create the latest alias - if: ${{ inputs.create_from_source && inputs.recipe_id_latest != '' && always() }} - run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} + - name: Create the build info + if: ${{ inputs.build_info }} + run: conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} - name: Upload the Package(s) if: always() run: conan upload "*" -r cura --all -c + - name: Upload the build info + if: ${{ inputs.build_info }} + run: | + conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} + conan_build_info --v2 stop + - name: Upload the Package(s) community if: ${{ always() && inputs.conan_upload_community == true }} run: conan upload "*" -r cura-ce -c + + - name: Upload the log and build artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + name: log-${{ inputs.runs_on }}-${{ runner.arch }} + path: | + buildinfo.json + conan.lock + conanbuildinfo.txt + conaninfo.txt + graph_info.json + build/** + retention-days: 1 diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 0a3d4447c1..f88f815139 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -81,9 +81,9 @@ jobs: uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main with: - project_name: cura - build_id: 1 + project_name: ${{ needs.conan-recipe-version.outputs.project_name }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} + build_id: 1 runs_on: 'ubuntu-20.04' python_version: '3.10.x' conan_logging_level: 'info' diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index eb1824c8f7..345fad2220 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -29,14 +29,18 @@ on: description: "is current branch a release branch?" value: ${{ jobs.get-semver.outputs.release_branch }} - recipe_user: + user: description: "The conan user" value: ${{ jobs.get-semver.outputs.user }} - recipe_channel: + channel: description: "The conan channel" value: ${{ jobs.get-semver.outputs.channel }} + project_name: + description: "The conan projectname" + value: ${{ inputs.project_name }} + jobs: get-semver: @@ -63,8 +67,7 @@ jobs: if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} with: fetch-depth: 0 - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} + ref: ${{ github.base_ref }} - name: Setup Python and pip uses: actions/setup-python@v4 @@ -82,6 +85,7 @@ jobs: name: Get Conan broadcast data run: | import subprocess + import os from conans import tools from conans.errors import ConanException from git import Repo @@ -115,7 +119,7 @@ jobs: elif ref_name in ("main", "master"): channel = 'testing' else: - channel = repo.active_branch.name.split("_")[0].replace("-", "_").lower() + channel = "_".join(repo.active_branch.name.replace("-", "_").split("_")[:2]).lower() if "pull_request" in event_name: channel = f"pr_{issue_number}" @@ -167,28 +171,29 @@ jobs: reset_patch = 0 actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" - # %% print to output - cmd_name = ["echo", f"::set-output name=name::{project_name}"] - subprocess.call(cmd_name) - cmd_version = ["echo", f"::set-output name=version::{actual_version}"] - subprocess.call(cmd_version) - cmd_channel = ["echo", f"::set-output name=channel::{channel}"] - subprocess.call(cmd_channel) - cmd_id_full= ["echo", f"::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}"] - subprocess.call(cmd_id_full) - cmd_id_latest = ["echo", f"::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}"] - subprocess.call(cmd_id_latest) - cmd_semver_full = ["echo", f"::set-output name=semver_full::{actual_version}"] - subprocess.call(cmd_semver_full) - cmd_is_release_branch = ["echo", f"::set-output name=is_release_branch::{str(is_release_branch).lower()}"] - subprocess.call(cmd_is_release_branch) + # %% Set the environment output + output_env = os.environ["GITHUB_OUTPUT"] + content = "" + if os.path.exists(output_env): + with open(output_env, "r") as f: + content = f.read() + + with open(output_env, "w") as f: + f.write(content) + f.writelines(f"name={project_name}\n") + f.writelines(f"version={actual_version}\n") + f.writelines(f"channel={channel}\n") + f.writelines(f"recipe_id_full={project_name}/{actual_version}@{user}/{channel}\n") + f.writelines(f"recipe_id_latest={project_name}/latest@{user}/{channel}\n") + f.writelines(f"semver_full={actual_version}\n") + f.writelines(f"is_release_branch={str(is_release_branch).lower()}\n") print("::group::Conan Recipe Information") print(f"name = {project_name}") print(f"version = {actual_version}") print(f"user = {user}") print(f"channel = {channel}") - print(f"= {project_name}/{actual_version}@{user}/{channel}") + print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}") print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}") print(f"semver_full = {actual_version}") print(f"is_release_branch = {str(is_release_branch).lower()}") diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml new file mode 100644 index 0000000000..25f56063af --- /dev/null +++ b/.github/workflows/cura-all-installers.yml @@ -0,0 +1,112 @@ +name: Cura All Installers +run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }} + +on: + workflow_dispatch: + inputs: + cura_conan_version: + description: 'Cura Conan Version' + default: 'cura/latest@ultimaker/testing' + required: true + type: string + conan_args: + description: 'Conan args: eq.: --require-override' + default: '' + required: false + type: string + conan_config: + description: 'Conan config branch to use' + default: '' + required: false + type: string + enterprise: + description: 'Build Cura as an Enterprise edition' + default: false + required: true + type: boolean + staging: + description: 'Use staging API' + default: false + required: true + type: boolean + installer: + description: 'Create the installer' + default: true + required: true + type: boolean + build_windows: + description: 'Build for Windows' + default: true + required: true + type: boolean + build_linux: + description: 'Build for Linux' + default: true + required: true + type: boolean + build_macos: + description: 'Build for MacOs' + default: true + required: true + type: boolean + + # Run the nightly at 3:25 UTC on working days + schedule: + - cron: '25 3 * * 1-5' + +jobs: + windows-installer-create: + if: ${{ inputs.build_windows }} + uses: ./.github/workflows/cura-installer.yml + with: + platform: 'windows-2022' + os_name: 'win64' + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + conan_config: ${{ inputs.conan_config }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + installer: ${{ inputs.installer }} + secrets: inherit + + linux-installer-create: + if: ${{ inputs.build_linux }} + uses: ./.github/workflows/cura-installer.yml + with: + platform: 'ubuntu-20.04' + os_name: 'linux' + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + conan_config: ${{ inputs.conan_config }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + installer: ${{ inputs.installer }} + secrets: inherit + + linux-modern-installer-create: + if: ${{ inputs.build_linux }} + uses: ./.github/workflows/cura-installer.yml + with: + platform: 'ubuntu-22.04' + os_name: 'linux-modern' + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + conan_config: ${{ inputs.conan_config }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + installer: ${{ inputs.installer }} + secrets: inherit + + macos-installer-create: + if: ${{ inputs.build_macos }} + uses: ./.github/workflows/cura-installer.yml + with: + platform: 'macos-11' + os_name: 'mac' + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + conan_config: ${{ inputs.conan_config }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + installer: ${{ inputs.installer }} + secrets: inherit diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index d0f9fb895e..082c707488 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -1,42 +1,50 @@ name: Cura Installer -run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }} +run-name: ${{ inputs.cura_conan_version }} for ${{ inputs.platform }} by @${{ github.actor }} on: - workflow_dispatch: + workflow_call: inputs: + platform: + description: 'Selected Installer OS' + default: 'ubuntu-20.04' + required: true + type: string + os_name: + description: 'OS Friendly Name' + default: 'linux' + required: true + type: string cura_conan_version: description: 'Cura Conan Version' default: 'cura/latest@ultimaker/testing' required: true + type: string conan_args: description: 'Conan args: eq.: --require-override' default: '' required: false + type: string conan_config: description: 'Conan config branch to use' default: '' required: false + type: string enterprise: description: 'Build Cura as an Enterprise edition' - required: true default: false + required: true type: boolean staging: description: 'Use staging API' - required: true default: false + required: true type: boolean installer: description: 'Create the installer' - required: true default: true + required: true type: boolean - # Run the nightly at 3:25 UTC on working days - #FIXME: Provide the same default values as the workflow dispatch - schedule: - - cron: '25 3 * * 1-5' - env: CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} @@ -59,16 +67,7 @@ env: jobs: cura-installer-create: - runs-on: ${{ matrix.os }} - - strategy: - fail-fast: false - matrix: - include: - - { os: macos-11, os_id: 'mac' } - - { os: windows-2022, os_id: 'win64' } - - { os: ubuntu-20.04, os_id: 'linux' } - - { os: ubuntu-22.04, os_id: 'linux-modern' } + runs-on: ${{ inputs.platform }} steps: - name: Checkout @@ -213,38 +212,38 @@ jobs: cp openssl/lib/*.lib ./cura_inst/Lib/ - name: Create the Cura dist - run: pyinstaller ./cura_inst/Ultimaker-Cura.spec + run: pyinstaller ./cura_inst/UltiMaker-Cura.spec - name: Archive the artifacts (bash) if: ${{ github.event.inputs.installer == 'false' && runner.os != 'Windows' }} - run: tar -zcf "./Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}.tar.gz" "./Ultimaker-Cura/" + run: tar -zcf "./UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.tar.gz" "./UltiMaker-Cura/" working-directory: dist - name: Archive the artifacts (Powershell) if: ${{ github.event.inputs.installer == 'false' && runner.os == 'Windows' }} - run: Compress-Archive -Path ".\Ultimaker-Cura" -DestinationPath ".\Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}.zip" + run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.zip" working-directory: dist - name: Create the Windows exe installer (Powershell) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }} run: | - python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}.exe" + python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe" working-directory: dist - name: Create the Linux AppImage (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Linux' }} - run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}.AppImage" + run: python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.AppImage" working-directory: dist - name: Create the MacOS dmg (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }} - run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}.dmg" + run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.dmg" working-directory: dist - name: Upload the artifacts uses: actions/upload-artifact@v3 with: - name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ matrix.os_id }} + name: UltiMaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ inputs.os_name }} path: | dist/*.tar.gz dist/*.zip diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml new file mode 100644 index 0000000000..d146d080de --- /dev/null +++ b/.github/workflows/printer-linter-format.yml @@ -0,0 +1,45 @@ +name: printer-linter-format + +on: + push: + branches: + - main + - '[1-9].[0-9]' + - '[1-9].[0-9][0-9]' + path: + - 'resources/**' + +jobs: + printer-linter-format: + name: Printer linter auto format + + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: 3.11.x + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-printer-linter.txt + + - uses: technote-space/get-diff-action@v6 + with: + PATTERNS: | + resources/+(definitions|extruders)/*.def.json + resources/+(intent|quality|variants)/**/*.inst.cfg + + - name: Install Python requirements for runner + if: env.GIT_DIFF && !env.MATCHED_FILES + run: pip install -r .github/workflows/requirements-printer-linter.txt + +# - name: Format file +# if: env.GIT_DIFF && !env.MATCHED_FILES +# run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} + + - uses: stefanzweifel/git-auto-commit-action@v4 + if: env.GIT_DIFF && !env.MATCHED_FILES + with: + commit_message: "Applied printer-linter format" diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml new file mode 100644 index 0000000000..b218ebe623 --- /dev/null +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -0,0 +1,59 @@ +name: printer-linter-pr-diagnose + +on: + pull_request: + path: + - 'resources/**' + +jobs: + printer-linter-diagnose: + name: Printer linter PR diagnose + + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: 3.11.x + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-printer-linter.txt + + - uses: technote-space/get-diff-action@v6 + with: + PATTERNS: | + resources/+(extruders|definitions)/*.def.json + resources/+(intent|quality|variants)/**/*.inst.cfg + + - name: Install Python requirements for runner + if: env.GIT_DIFF && !env.MATCHED_FILES + run: pip install -r .github/workflows/requirements-printer-linter.txt + + - name: Create results directory + run: mkdir printer-linter-result + + - name: Diagnose file(s) + if: env.GIT_DIFF && !env.MATCHED_FILES + run: python printer-linter/src/terminal.py --diagnose --report printer-linter-result/fixes.yml ${{ env.GIT_DIFF_FILTERED }} + + - name: Save PR metadata + run: | + echo ${{ github.event.number }} > printer-linter-result/pr-id.txt + echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt + echo ${{ github.event.pull_request.head.ref }} > printer-linter-result/pr-head-ref.txt + + - uses: actions/upload-artifact@v2 + with: + name: printer-linter-result + path: printer-linter-result/ + + - name: Run clang-tidy-pr-comments action + uses: platisd/clang-tidy-pr-comments@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + clang_tidy_fixes: result.yml + request_changes: true diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml new file mode 100644 index 0000000000..f47e22c5c5 --- /dev/null +++ b/.github/workflows/printer-linter-pr-post.yml @@ -0,0 +1,80 @@ +name: printer-linter-pr-post + +on: + workflow_run: + workflows: [ "printer-linter-pr-diagnose" ] + types: [ completed ] + +jobs: + clang-tidy-results: + # Trigger the job only if the previous (insecure) workflow completed successfully + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + steps: + - name: Download analysis results + uses: actions/github-script@v3.1.0 + with: + script: | + let artifacts = await github.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + let matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "printer-linter-result" + })[0]; + let download = await github.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: "zip", + }); + let fs = require("fs"); + fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data)); + + - name: Set environment variables + run: | + mkdir printer-linter-result + unzip printer-linter-result.zip -d printer-linter-result + echo "pr_id=$(cat printer-linter-result/pr-id.txt)" >> $GITHUB_ENV + echo "pr_head_repo=$(cat printer-linter-result/pr-head-repo.txt)" >> $GITHUB_ENV + echo "pr_head_ref=$(cat printer-linter-result/pr-head-ref.txt)" >> $GITHUB_ENV + + - uses: actions/checkout@v2 + with: + repository: ${{ env.pr_head_repo }} + ref: ${{ env.pr_head_ref }} + persist-credentials: false + + - name: Redownload analysis results + uses: actions/github-script@v3.1.0 + with: + script: | + let artifacts = await github.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + let matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "printer-linter-result" + })[0]; + let download = await github.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: "zip", + }); + let fs = require("fs"); + fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data)); + + - name: Extract analysis results + run: | + mkdir printer-linter-result + unzip printer-linter-result.zip -d printer-linter-result + + - name: Run clang-tidy-pr-comments action + uses: platisd/clang-tidy-pr-comments@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + clang_tidy_fixes: printer-linter-result/fixes.yml + pull_request_id: ${{ env.pr_id }} diff --git a/.github/workflows/requirements-printer-linter.txt b/.github/workflows/requirements-printer-linter.txt new file mode 100644 index 0000000000..4818cc5419 --- /dev/null +++ b/.github/workflows/requirements-printer-linter.txt @@ -0,0 +1 @@ +pyyaml \ No newline at end of file diff --git a/.gitignore b/.gitignore index 26fe1ccf4a..1e8fd47664 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ conanbuildinfo.txt graph_info.json Ultimaker-Cura.spec .run/ +/printer-linter/src/printerlinter.egg-info/ diff --git a/.printer-linter b/.printer-linter new file mode 100644 index 0000000000..f9f105e1f7 --- /dev/null +++ b/.printer-linter @@ -0,0 +1,15 @@ +checks: + diagnostic-mesh-file-extension: true + diagnostic-mesh-file-size: true + diagnostic-definition-redundant-override: true +fixes: + diagnostic-definition-redundant-override: true +format: + format-definition-bracket-newline: true + format-definition-paired-coordinate-array: true + format-definition-sort-keys: true + format-definition-indent: 4 + format-definition-single-value-single-line: true # Format dicts and lists with a single item on one line "dict": { "value": 10 } + format-profile-space-around-delimiters: true + format-profile-sort-keys: true +diagnostic-mesh-file-size: 1200000 \ No newline at end of file diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 1c8ff0551c..87ef7d205d 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. CuraAppName = "{{ cura_app_name }}" diff --git a/Ultimaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja similarity index 100% rename from Ultimaker-Cura.spec.jinja rename to UltiMaker-Cura.spec.jinja diff --git a/conanfile.py b/conanfile.py index 16764213f3..111d4f9b9c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -16,12 +16,12 @@ required_conan_version = ">=1.52.0" class CuraConan(ConanFile): name = "cura" license = "LGPL-3.0" - author = "Ultimaker B.V." + author = "UltiMaker" url = "https://github.com/Ultimaker/cura" description = "3D printer / slicing GUI built on top of the Uranium framework" topics = ("conan", "python", "pyqt5", "qt", "qml", "3d-printing", "slicer") build_policy = "missing" - exports = "LICENSE*", "Ultimaker-Cura.spec.jinja", "CuraVersion.py.jinja" + exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja" settings = "os", "compiler", "build_type", "arch" no_copy_source = True # We won't build so no need to copy sources to the build folder @@ -44,7 +44,7 @@ class CuraConan(ConanFile): "staging": "False", "devtools": False, "cloud_api_version": "1", - "display_name": "Ultimaker Cura", + "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented "internal": False, } @@ -226,13 +226,13 @@ class CuraConan(ConanFile): # Collect all dll's from PyQt6 and place them in the root binaries.extend([(f"{p}", ".") for p in Path(self._site_packages, "PyQt6", "Qt6").glob("**/*.dll")]) - with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f: + with open(Path(__file__).parent.joinpath("UltiMaker-Cura.spec.jinja"), "r") as f: pyinstaller = Template(f.read()) version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) cura_version = Version(version) - with open(Path(location, "Ultimaker-Cura.spec"), "w") as f: + with open(Path(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( name = str(self.options.display_name).replace(" ", "-"), display_name = self.options.display_name, diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 92d5eb6b64..3a345cca26 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -1,11 +1,11 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. # --------- # General constants used in Cura # --------- DEFAULT_CURA_APP_NAME = "cura" -DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" +DEFAULT_CURA_DISPLAY_NAME = "UltiMaker Cura" DEFAULT_CURA_VERSION = "dev" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index 541a270058..e6214d7073 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -1,5 +1,5 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. import platform import traceback @@ -110,7 +110,7 @@ class CrashHandler: layout = QVBoxLayout(dialog) label = QLabel() - label.setText(catalog.i18nc("@label crash message", """

Oops, Ultimaker Cura has encountered something that doesn't seem right.

+ label.setText(catalog.i18nc("@label crash message", """

Oops, UltiMaker Cura has encountered something that doesn't seem right.

We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

Backups can be found in the configuration folder.

Please send us this Crash Report to fix the problem.

@@ -119,7 +119,7 @@ class CrashHandler: layout.addWidget(label) # "send report" check box and show details - self._send_report_checkbox = QCheckBox(catalog.i18nc("@action:button", "Send crash report to Ultimaker"), dialog) + self._send_report_checkbox = QCheckBox(catalog.i18nc("@action:button", "Send crash report to UltiMaker"), dialog) self._send_report_checkbox.setChecked(True) show_details_button = QPushButton(catalog.i18nc("@action:button", "Show detailed crash report"), dialog) diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py index 24375b72ce..b84dc26f0a 100644 --- a/cura/Machines/Models/MachineListModel.py +++ b/cura/Machines/Models/MachineListModel.py @@ -5,7 +5,7 @@ # online cloud connected printers are represented within this ListModel. Additional information such as the number of # connected printers for each printer type is gathered. -from typing import Optional +from typing import Optional, List, cast from PyQt6.QtCore import Qt, QTimer, QObject, pyqtSlot, pyqtProperty, pyqtSignal @@ -14,7 +14,6 @@ from UM.Settings.ContainerStack import ContainerStack from UM.Settings.Interfaces import ContainerInterface from UM.i18n import i18nCatalog from UM.Util import parseBool -from cura.PrinterOutput.PrinterOutputDevice import ConnectionType from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.GlobalStack import GlobalStack @@ -29,11 +28,13 @@ class MachineListModel(ListModel): MachineCountRole = Qt.ItemDataRole.UserRole + 6 IsAbstractMachineRole = Qt.ItemDataRole.UserRole + 7 ComponentTypeRole = Qt.ItemDataRole.UserRole + 8 + IsNetworkedMachineRole = Qt.ItemDataRole.UserRole + 9 - def __init__(self, parent: Optional[QObject] = None) -> None: + def __init__(self, parent: Optional[QObject] = None, machines_filter: List[GlobalStack] = None, listenToChanges: bool = True) -> None: super().__init__(parent) self._show_cloud_printers = False + self._machines_filter = machines_filter self._catalog = i18nCatalog("cura") @@ -45,17 +46,18 @@ class MachineListModel(ListModel): self.addRoleName(self.MachineCountRole, "machineCount") self.addRoleName(self.IsAbstractMachineRole, "isAbstractMachine") self.addRoleName(self.ComponentTypeRole, "componentType") + self.addRoleName(self.IsNetworkedMachineRole, "isNetworked") self._change_timer = QTimer() self._change_timer.setInterval(200) self._change_timer.setSingleShot(True) self._change_timer.timeout.connect(self._update) - # Listen to changes - CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerChanged) - CuraContainerRegistry.getInstance().containerMetaDataChanged.connect(self._onContainerChanged) - CuraContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChanged) - self._updateDelayed() + if listenToChanges: + CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerChanged) + CuraContainerRegistry.getInstance().containerMetaDataChanged.connect(self._onContainerChanged) + CuraContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChanged) + self._updateDelayed() showCloudPrintersChanged = pyqtSignal(bool) @@ -79,17 +81,33 @@ class MachineListModel(ListModel): def _updateDelayed(self) -> None: self._change_timer.start() + def _getMachineStacks(self) -> List[ContainerStack]: + return CuraContainerRegistry.getInstance().findContainerStacks(type = "machine") + + def _getAbstractMachineStacks(self) -> List[ContainerStack]: + return CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True") + + def set_machines_filter(self, machines_filter: Optional[List[GlobalStack]]) -> None: + self._machines_filter = machines_filter + self._update() + def _update(self) -> None: self.clear() from cura.CuraApplication import CuraApplication machines_manager = CuraApplication.getInstance().getMachineManager() - other_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine") + other_machine_stacks = self._getMachineStacks() other_machine_stacks.sort(key = lambda machine: machine.getName().upper()) - abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True") + abstract_machine_stacks = self._getAbstractMachineStacks() abstract_machine_stacks.sort(key = lambda machine: machine.getName().upper(), reverse = True) + + if self._machines_filter is not None: + filter_ids = [machine_filter.id for machine_filter in self._machines_filter] + other_machine_stacks = [machine for machine in other_machine_stacks if machine.id in filter_ids] + abstract_machine_stacks = [machine for machine in abstract_machine_stacks if machine.id in filter_ids] + for abstract_machine in abstract_machine_stacks: definition_id = abstract_machine.definition.getId() online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) @@ -113,18 +131,13 @@ class MachineListModel(ListModel): other_machine_stacks.remove(stack) if len(abstract_machine_stacks) > 0: - if self._show_cloud_printers: - self.appendItem({"componentType": "HIDE_BUTTON", - "isOnline": True, - "isAbstractMachine": False, - "machineCount": 0 - }) - else: - self.appendItem({"componentType": "SHOW_BUTTON", - "isOnline": True, - "isAbstractMachine": False, - "machineCount": 0 - }) + self.appendItem({ + "componentType": "HIDE_BUTTON" if self._show_cloud_printers else "SHOW_BUTTON", + "isOnline": True, + "isAbstractMachine": False, + "machineCount": 0, + "catergory": "connected", + }) for stack in other_machine_stacks: self.addItem(stack, False) @@ -134,11 +147,13 @@ class MachineListModel(ListModel): return self.appendItem({ - "componentType": "MACHINE", - "name": container_stack.getName(), - "id": container_stack.getId(), - "metadata": container_stack.getMetaData().copy(), - "isOnline": is_online, - "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)), - "machineCount": machine_count, - }) + "componentType": "MACHINE", + "name": container_stack.getName(), + "id": container_stack.getId(), + "metadata": container_stack.getMetaData().copy(), + "isOnline": is_online, + "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)), + "isNetworked": cast(GlobalStack, container_stack).hasNetworkedConnection() if isinstance(container_stack, GlobalStack) else False, + "machineCount": machine_count, + "catergory": "connected" if is_online else "other", + }) diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index f2e6cd27ec..62bf31982a 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -274,7 +274,7 @@ class AuthorizationService: self._unable_to_get_data_message.show() else: self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info", - "Unable to reach the Ultimaker account server."), + "Unable to reach the UltiMaker account server."), title = i18n_catalog.i18nc("@info:title", "Log-in failed"), message_type = Message.MessageType.ERROR) Logger.warning("Unable to get user profile using auth data from preferences.") diff --git a/cura/Settings/ActiveQuality.py b/cura/Settings/ActiveQuality.py new file mode 100644 index 0000000000..420d1f24fc --- /dev/null +++ b/cura/Settings/ActiveQuality.py @@ -0,0 +1,48 @@ +from dataclasses import dataclass +from typing import List + +from UM import i18nCatalog + +catalog = i18nCatalog("cura") + + +@dataclass +class ActiveQuality: + """ Represents the active intent+profile combination, contains all information needed to display active quality. """ + intent_category: str = "" # Name of the base intent. For example "visual" or "engineering". + intent_name: str = "" # Name of the base intent formatted for display. For Example "Visual" or "Engineering" + profile: str = "" # Name of the base profile. For example "Fine" or "Fast" + custom_profile: str = "" # Name of the custom profile, this is based on profile. For example "MyCoolCustomProfile" + layer_height: float = None # Layer height of quality in mm. For example 0.4 + is_experimental: bool = False # If the quality experimental. + + def getMainStringParts(self) -> List[str]: + string_parts = [] + + if self.custom_profile is not None: + string_parts.append(self.custom_profile) + else: + string_parts.append(self.profile) + if self.intent_category is not "default": + string_parts.append(self.intent_name) + + return string_parts + + def getTailStringParts(self) -> List[str]: + string_parts = [] + + if self.custom_profile is not None: + string_parts.append(self.profile) + if self.intent_category is not "default": + string_parts.append(self.intent_name) + + if self.layer_height: + string_parts.append(f"{self.layer_height}mm") + + if self.is_experimental: + string_parts.append(catalog.i18nc("@label", "Experimental")) + + return string_parts + + def getStringParts(self) -> List[str]: + return self.getMainStringParts() + self.getTailStringParts() diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 27d8fbbc78..b8a5e7d885 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -40,6 +40,7 @@ from cura.Settings.cura_empty_instance_containers import (empty_definition_chang empty_material_container, empty_quality_container, empty_quality_changes_container, empty_intent_container) from cura.UltimakerCloud.UltimakerCloudConstants import META_UM_LINKED_TO_ACCOUNT +from .ActiveQuality import ActiveQuality from .CuraStackBuilder import CuraStackBuilder @@ -1631,33 +1632,31 @@ class MachineManager(QObject): # Examples: # - "my_profile - Fine" (only based on a default quality, no intent involved) # - "my_profile - Engineering - Fine" (based on an intent) - @pyqtProperty("QVariantMap", notify = activeQualityDisplayNameChanged) - def activeQualityDisplayNameMap(self) -> Dict[str, str]: + @pyqtProperty("QList", notify = activeQualityDisplayNameChanged) + def activeQualityDisplayNameStringParts(self) -> List[str]: + return self.activeQualityDisplayNameMap().getStringParts() + + @pyqtProperty("QList", notify = activeQualityDisplayNameChanged) + def activeQualityDisplayNameMainStringParts(self) -> List[str]: + return self.activeQualityDisplayNameMap().getMainStringParts() + + @pyqtProperty("QList", notify = activeQualityDisplayNameChanged) + def activeQualityDisplayNameTailStringParts(self) -> List[str]: + return self.activeQualityDisplayNameMap().getTailStringParts() + + def activeQualityDisplayNameMap(self) -> ActiveQuality: global_stack = self._application.getGlobalContainerStack() if global_stack is None: - return {"main": "", - "suffix": ""} + return ActiveQuality() - display_name = global_stack.quality.getName() - - intent_category = self.activeIntentCategory - if intent_category != "default": - intent_display_name = IntentCategoryModel.translation(intent_category, - "name", - intent_category.title()) - display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name, - the_rest = display_name) - - main_part = display_name - suffix_part = "" - - # Not a custom quality - if global_stack.qualityChanges != empty_quality_changes_container: - main_part = self.activeQualityOrQualityChangesName - suffix_part = display_name - - return {"main": main_part, - "suffix": suffix_part} + return ActiveQuality( + profile = global_stack.quality.getName(), + intent_category = self.activeIntentCategory, + intent_name = IntentCategoryModel.translation(self.activeIntentCategory, "name", self.activeIntentCategory.title()), + custom_profile = self.activeQualityOrQualityChangesName if global_stack.qualityChanges is not empty_quality_changes_container else None, + layer_height = self.activeQualityLayerHeight if self.isActiveQualitySupported else None, + is_experimental = self.isActiveQualityExperimental and self.isActiveQualitySupported + ) @pyqtSlot(str) def setIntentByCategory(self, intent_category: str) -> None: @@ -1776,7 +1775,9 @@ class MachineManager(QObject): @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: global_container_stack = self._application.getGlobalContainerStack() - return (not global_container_stack is None) and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container + return global_container_stack is not None\ + and global_container_stack.quality == empty_quality_container \ + and global_container_stack.qualityChanges == empty_quality_changes_container @pyqtProperty(bool, notify = activeQualityGroupChanged) def isActiveQualityCustom(self) -> bool: diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index 14ee0e4d8e..d0ebfe1742 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -17,4 +17,4 @@ export OPENSSL_CONF="$scriptdir/openssl.cnf" # unset `QT_STYLE_OVERRIDE` as a precaution unset QT_STYLE_OVERRIDE -$scriptdir/Ultimaker-Cura "$@" +$scriptdir/UltiMaker-Cura "$@" diff --git a/packaging/AppImage/create_appimage.py b/packaging/AppImage/create_appimage.py index bb8396f43c..242c45aa5d 100644 --- a/packaging/AppImage/create_appimage.py +++ b/packaging/AppImage/create_appimage.py @@ -1,6 +1,7 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. + import argparse # Command line arguments parsing and help. from jinja2 import Template import os # Finding installation directory. @@ -71,6 +72,6 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description = "Create AppImages of Cura.") parser.add_argument("dist_path", type=str, help="Path to where PyInstaller installed the distribution of Cura.") parser.add_argument("version", type=str, help="Full version number of Cura (e.g. '5.1.0-beta')") - parser.add_argument("filename", type = str, help = "Filename of the AppImage (e.g. 'Ultimaker-Cura-5.1.0-beta-Linux-X64.AppImage')") + parser.add_argument("filename", type = str, help = "Filename of the AppImage (e.g. 'UltiMaker-Cura-5.1.0-beta-Linux-X64.AppImage')") args = parser.parse_args() build_appimage(args.dist_path, args.version, args.filename) diff --git a/packaging/AppImage/cura.appdata.xml b/packaging/AppImage/cura.appdata.xml index de940af939..5f187b8bb8 100644 --- a/packaging/AppImage/cura.appdata.xml +++ b/packaging/AppImage/cura.appdata.xml @@ -3,16 +3,16 @@ com.ultimaker.cura CC0-1.0 LGPL-3.0 - Ultimaker Cura + UltiMaker Cura Slicer to prepare your 3D printing projects -

Ultimaker Cura is a slicer, an application that prepares your model for 3D printing. Optimized, expert-tested profiles for 3D printers and materials mean you can start printing reliably in no time. And with industry-standard software integration, you can streamline your workflow for maximum efficiency.

+

UltiMaker Cura is a slicer, an application that prepares your model for 3D printing. Optimized, expert-tested profiles for 3D printers and materials mean you can start printing reliably in no time. And with industry-standard software integration, you can streamline your workflow for maximum efficiency.

 https://ultimaker.com/en/software/ultimaker-cura Print preparation screen - https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png + https://raw.githubusercontent.com/Ultimaker/Cura/main/cura-logo.PNG diff --git a/packaging/AppImage/cura.desktop.jinja b/packaging/AppImage/cura.desktop.jinja index 1026d10cb0..1230d4ff5c 100644 --- a/packaging/AppImage/cura.desktop.jinja +++ b/packaging/AppImage/cura.desktop.jinja @@ -1,11 +1,11 @@ [Desktop Entry] -Name=Ultimaker Cura -Name[de]=Ultimaker Cura +Name=UltiMaker Cura +Name[de]=UltiMaker Cura GenericName=3D Printing Software GenericName[de]=3D-Druck-Software GenericName[nl]=3D-Print Software Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great. -Exec=Ultimaker-Cura %F +Exec=UltiMaker-Cura %F Icon=cura-icon Terminal=false Type=Application diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 39543d9921..9996b24773 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura's build system is released under the terms of the AGPLv3 or higher. !define APP_NAME "{{ app_name }}" @@ -64,7 +64,7 @@ InstallDir "$PROGRAMFILES64\${APP_NAME}" !ifdef REG_START_MENU !define MUI_STARTMENUPAGE_NODISABLE -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Ultimaker Cura" +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltiMaker Cura" !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}" !define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}" @@ -113,8 +113,8 @@ CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE CreateShortCut "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe" !ifdef WEB_SITE -WriteIniStr "$INSTDIR\Ultimaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}" -CreateShortCut "$SMPROGRAMS\$SM_Folder\Ultimaker Cura website.lnk" "$INSTDIR\Ultimaker Cura website.url" +WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}" +CreateShortCut "$SMPROGRAMS\$SM_Folder\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url" !endif !insertmacro MUI_STARTMENU_WRITE_END !endif @@ -125,8 +125,8 @@ CreateShortCut "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP CreateShortCut "$SMPROGRAMS\{{ app_name }}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe" !ifdef WEB_SITE -WriteIniStr "$INSTDIR\Ultimaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}" -CreateShortCut "$SMPROGRAMS\{{ app_name }}\Ultimaker Cura website.lnk" "$INSTDIR\Ultimaker Cura website.url" +WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}" +CreateShortCut "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url" !endif !endif @@ -170,7 +170,7 @@ RmDir /r /REBOOTOK "$INSTDIR" Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" Delete "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" !ifdef WEB_SITE -Delete "$SMPROGRAMS\$SM_Folder\Ultimaker Cura website.lnk" +Delete "$SMPROGRAMS\$SM_Folder\UltiMaker Cura website.lnk" !endif RmDir "$SMPROGRAMS\$SM_Folder" !endif @@ -179,7 +179,7 @@ RmDir "$SMPROGRAMS\$SM_Folder" Delete "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk" Delete "$SMPROGRAMS\{{ app_name }}\Uninstall ${APP_NAME}.lnk" !ifdef WEB_SITE -Delete "$SMPROGRAMS\{{ app_name }}\Ultimaker Cura website.lnk" +Delete "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk" !endif RmDir "$SMPROGRAMS\{{ app_name }}" !endif diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py index c8d28c82a4..5ec31c8e35 100644 --- a/packaging/NSIS/create_windows_installer.py +++ b/packaging/NSIS/create_windows_installer.py @@ -1,5 +1,7 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. + + import os import argparse # Command line arguments parsing and help. import subprocess @@ -16,15 +18,15 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): dist_loc = Path(os.getcwd(), dist_path) source_loc = Path(os.getcwd(), source_path) instdir = Path("$INSTDIR") - dist_paths = [p.relative_to(dist_loc.joinpath("Ultimaker-Cura")) for p in sorted(dist_loc.joinpath("Ultimaker-Cura").rglob("*")) if p.is_file()] + dist_paths = [p.relative_to(dist_loc.joinpath("UltiMaker-Cura")) for p in sorted(dist_loc.joinpath("UltiMaker-Cura").rglob("*")) if p.is_file()] mapped_out_paths = {} for dist_path in dist_paths: if "__pycache__" not in dist_path.parts: out_path = instdir.joinpath(dist_path).parent if out_path not in mapped_out_paths: - mapped_out_paths[out_path] = [(dist_loc.joinpath("Ultimaker-Cura", dist_path), instdir.joinpath(dist_path))] + mapped_out_paths[out_path] = [(dist_loc.joinpath("UltiMaker-Cura", dist_path), instdir.joinpath(dist_path))] else: - mapped_out_paths[out_path].append((dist_loc.joinpath("Ultimaker-Cura", dist_path), instdir.joinpath(dist_path))) + mapped_out_paths[out_path].append((dist_loc.joinpath("UltiMaker-Cura", dist_path), instdir.joinpath(dist_path))) rmdir_paths = set() for rmdir_f in mapped_out_paths.values(): @@ -40,13 +42,13 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): nsis_content = template.render( - app_name = f"Ultimaker Cura {os.getenv('CURA_VERSION_FULL')}", - main_app = "Ultimaker-Cura.exe", + app_name = f"UltiMaker Cura {os.getenv('CURA_VERSION_FULL')}", + main_app = "UltiMaker-Cura.exe", version = os.getenv('CURA_VERSION_FULL'), version_major = os.environ.get("CURA_VERSION_MAJOR"), version_minor = os.environ.get("CURA_VERSION_MINOR"), version_patch = os.environ.get("CURA_VERSION_PATCH"), - company = "Ultimaker B.V.", + company = "UltiMaker", web_site = "https://ultimaker.com", year = datetime.now().year, cura_license_file = str(source_loc.joinpath("packaging", "cura_license.txt")), @@ -58,7 +60,7 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): destination = filename ) - with open(dist_loc.joinpath("Ultimaker-Cura.nsi"), "w") as f: + with open(dist_loc.joinpath("UltiMaker-Cura.nsi"), "w") as f: f.write(nsis_content) shutil.copy(source_loc.joinpath("packaging", "NSIS", "fileassoc.nsh"), dist_loc.joinpath("fileassoc.nsh")) @@ -66,7 +68,7 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): def build(dist_path: str): dist_loc = Path(os.getcwd(), dist_path) - command = ["makensis", "/V2", "/P4", str(dist_loc.joinpath("Ultimaker-Cura.nsi"))] + command = ["makensis", "/V2", "/P4", str(dist_loc.joinpath("UltiMaker-Cura.nsi"))] subprocess.run(command) @@ -74,7 +76,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description = "Create Windows exe installer of Cura.") parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.") parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder") - parser.add_argument("filename", type = str, help = "Filename of the exe (e.g. 'Ultimaker-Cura-5.1.0-beta-Windows-X64.exe')") + parser.add_argument("filename", type = str, help = "Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.exe')") args = parser.parse_args() generate_nsi(args.source_path, args.dist_path, args.filename) build(args.dist_path) diff --git a/packaging/NSIS/cura_banner_nsis.bmp b/packaging/NSIS/cura_banner_nsis.bmp index 8643510664..31c5344a2f 100644 Binary files a/packaging/NSIS/cura_banner_nsis.bmp and b/packaging/NSIS/cura_banner_nsis.bmp differ diff --git a/packaging/dmg/cura_background_dmg.png b/packaging/dmg/cura_background_dmg.png index e838608293..8f2fb50b05 100644 Binary files a/packaging/dmg/cura_background_dmg.png and b/packaging/dmg/cura_background_dmg.png differ diff --git a/packaging/dmg/dmg_sign_noterize.py b/packaging/dmg/dmg_sign_noterize.py index 8baf58e43c..fcda1e378e 100644 --- a/packaging/dmg/dmg_sign_noterize.py +++ b/packaging/dmg/dmg_sign_noterize.py @@ -1,3 +1,7 @@ +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + + import os import argparse # Command line arguments parsing and help. import subprocess @@ -14,11 +18,11 @@ def build_dmg(source_path: str, dist_path: str, filename: str) -> None: "--app-drop-link", "520", "272", "--volicon", f"{source_path}/packaging/icons/VolumeIcons_Cura.icns", "--icon-size", "90", - "--icon", "Ultimaker-Cura.app", "169", "272", + "--icon", "UltiMaker-Cura.app", "169", "272", "--eula", f"{source_path}/packaging/cura_license.txt", "--background", f"{source_path}/packaging/dmg/cura_background_dmg.png", f"{dist_path}/{filename}", - f"{dist_path}/Ultimaker-Cura.app"] + f"{dist_path}/UltiMaker-Cura.app"] subprocess.run(arguments) @@ -57,7 +61,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description = "Create dmg of Cura.") parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.") parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder") - parser.add_argument("filename", type = str, help = "Filename of the dmg (e.g. 'Ultimaker-Cura-5.1.0-beta-Linux-X64.dmg')") + parser.add_argument("filename", type = str, help = "Filename of the dmg (e.g. 'UltiMaker-Cura-5.1.0-beta-Linux-X64.dmg')") args = parser.parse_args() build_dmg(args.source_path, args.dist_path, args.filename) sign(args.dist_path, args.filename) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index bec50b5660..c839c46e7c 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -9,6 +9,7 @@ from typing import cast, Dict, List, Optional, Tuple, Any, Set import xml.etree.ElementTree as ET +from UM.Util import parseBool from UM.Workspace.WorkspaceReader import WorkspaceReader from UM.Application import Application @@ -599,7 +600,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._dialog.setNumUserSettings(num_user_settings) self._dialog.setActiveMode(active_mode) self._dialog.setUpdatableMachines(updatable_machines) - self._dialog.setMachineName(machine_name) self._dialog.setMaterialLabels(material_labels) self._dialog.setMachineType(machine_type) self._dialog.setExtruders(extruders) @@ -608,6 +608,36 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._dialog.setMissingPackagesMetadata(missing_package_metadata) self._dialog.show() + # Choosing the initially selected printer in MachineSelector + is_networked_machine = False + is_abstract_machine = False + if global_stack and isinstance(global_stack, GlobalStack): + # The machine included in the project file exists locally already, no need to change selected printers. + is_networked_machine = global_stack.hasNetworkedConnection() + is_abstract_machine = parseBool(existing_global_stack.getMetaDataEntry("is_abstract_machine", False)) + self._dialog.setMachineToOverride(global_stack.getId()) + self._dialog.setResolveStrategy("machine", "override") + elif self._dialog.updatableMachinesModel.count > 0: + # The machine included in the project file does not exist. There is another machine of the same type. + # This will always default to an abstract machine first. + machine = self._dialog.updatableMachinesModel.getItem(0) + machine_name = machine["name"] + is_networked_machine = machine["isNetworked"] + is_abstract_machine = machine["isAbstractMachine"] + self._dialog.setMachineToOverride(machine["id"]) + self._dialog.setResolveStrategy("machine", "override") + else: + # The machine included in the project file does not exist. There are no other printers of the same type. Default to "Create New". + machine_name = i18n_catalog.i18nc("@button", "Create new") + is_networked_machine = False + is_abstract_machine = False + self._dialog.setMachineToOverride(None) + self._dialog.setResolveStrategy("machine", "new") + + self._dialog.setIsNetworkedMachine(is_networked_machine) + self._dialog.setIsAbstractMachine(is_abstract_machine) + self._dialog.setMachineName(machine_name) + # Block until the dialog is closed. self._dialog.waitForClose() @@ -670,7 +700,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): temp_preferences = Preferences() try: serialized = archive.open("Cura/preferences.cfg").read().decode("utf-8") - except KeyError: + except KeyError as e: # If there is no preferences file, it's not a workspace, so notify user of failure. Logger.log("w", "File %s is not a valid workspace.", file_name) message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tags or !", @@ -702,7 +732,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): application.expandedCategoriesChanged.emit() # Notify the GUI of the change # If there are no machines of the same type, create a new machine. - if self._resolve_strategies["machine"] != "override" or self._dialog.updatableMachinesModel.count <= 1: + if self._resolve_strategies["machine"] != "override" or self._dialog.updatableMachinesModel.count == 0: # We need to create a new machine machine_name = self._container_registry.uniqueName(self._machine_info.name) diff --git a/plugins/3MFReader/UpdatableMachinesModel.py b/plugins/3MFReader/UpdatableMachinesModel.py deleted file mode 100644 index 9d6eee6c3e..0000000000 --- a/plugins/3MFReader/UpdatableMachinesModel.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2020 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from typing import Dict, List - -from PyQt6.QtCore import Qt - -from UM.Qt.ListModel import ListModel -from cura.Settings.GlobalStack import GlobalStack - -create_new_list_item = { - "id": "new", - "name": "Create new", - "displayName": "Create new", - "type": "default_option" # to make sure we are not mixing the "Create new" option with a printer with id "new" -} # type: Dict[str, str] - - -class UpdatableMachinesModel(ListModel): - """Model that holds cura packages. - - By setting the filter property the instances held by this model can be changed. - """ - - def __init__(self, parent = None) -> None: - super().__init__(parent) - - self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id") - self.addRoleName(Qt.ItemDataRole.UserRole + 2, "name") - self.addRoleName(Qt.ItemDataRole.UserRole + 3, "displayName") - self.addRoleName(Qt.ItemDataRole.UserRole + 4, "type") # Either "default_option" or "machine" - - def update(self, machines: List[GlobalStack]) -> None: - items = [create_new_list_item] # type: List[Dict[str, str]] - - for machine in sorted(machines, key = lambda printer: printer.name): - items.append({ - "id": machine.id, - "name": machine.name, - "displayName": "Update " + machine.name, - "type": "machine" - }) - self.setItems(items) diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 0a8f7784b2..afa1deecfd 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -5,6 +5,7 @@ from PyQt6.QtCore import pyqtSignal, QObject, pyqtProperty, QCoreApplication, QU from PyQt6.QtGui import QDesktopServices from typing import List, Optional, Dict, cast +from cura.Machines.Models.MachineListModel import MachineListModel from cura.Settings.GlobalStack import GlobalStack from UM.Application import Application from UM.FlameProfiler import pyqtSlot @@ -14,8 +15,6 @@ from UM.Message import Message from UM.PluginRegistry import PluginRegistry from UM.Settings.ContainerRegistry import ContainerRegistry -from .UpdatableMachinesModel import UpdatableMachinesModel - import os import threading import time @@ -63,10 +62,12 @@ class WorkspaceDialog(QObject): self._extruders = [] self._objects_on_plate = False self._is_printer_group = False - self._updatable_machines_model = UpdatableMachinesModel(self) + self._updatable_machines_model = MachineListModel(self, listenToChanges=False) self._missing_package_metadata: List[Dict[str, str]] = [] self._plugin_registry: PluginRegistry = CuraApplication.getInstance().getPluginRegistry() self._install_missing_package_dialog: Optional[QObject] = None + self._is_abstract_machine = False + self._is_networked_machine = False machineConflictChanged = pyqtSignal() qualityChangesConflictChanged = pyqtSignal() @@ -80,6 +81,8 @@ class WorkspaceDialog(QObject): intentNameChanged = pyqtSignal() machineNameChanged = pyqtSignal() updatableMachinesChanged = pyqtSignal() + isAbstractMachineChanged = pyqtSignal() + isNetworkedChanged = pyqtSignal() materialLabelsChanged = pyqtSignal() objectsOnPlateChanged = pyqtSignal() numUserSettingsChanged = pyqtSignal() @@ -161,13 +164,31 @@ class WorkspaceDialog(QObject): self.machineNameChanged.emit() @pyqtProperty(QObject, notify = updatableMachinesChanged) - def updatableMachinesModel(self) -> UpdatableMachinesModel: - return cast(UpdatableMachinesModel, self._updatable_machines_model) + def updatableMachinesModel(self) -> MachineListModel: + return cast(MachineListModel, self._updatable_machines_model) def setUpdatableMachines(self, updatable_machines: List[GlobalStack]) -> None: - self._updatable_machines_model.update(updatable_machines) + self._updatable_machines_model.set_machines_filter(updatable_machines) self.updatableMachinesChanged.emit() + @pyqtProperty(bool, notify = isAbstractMachineChanged) + def isAbstractMachine(self) -> bool: + return self._is_abstract_machine + + @pyqtSlot(bool) + def setIsAbstractMachine(self, is_abstract_machine: bool) -> None: + self._is_abstract_machine = is_abstract_machine + self.isAbstractMachineChanged.emit() + + @pyqtProperty(bool, notify = isNetworkedChanged) + def isNetworked(self) -> bool: + return self._is_networked_machine + + @pyqtSlot(bool) + def setIsNetworkedMachine(self, is_networked_machine: bool) -> None: + self._is_networked_machine = is_networked_machine + self.isNetworkedChanged.emit() + @pyqtProperty(str, notify=qualityTypeChanged) def qualityType(self) -> str: return self._quality_type diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 4899c6873a..d1a000bae4 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -11,47 +11,48 @@ import Cura 1.1 as Cura UM.Dialog { - id: base + id: workspaceDialog title: catalog.i18nc("@title:window", "Open Project") - minimumWidth: UM.Theme.getSize("popup_dialog").width - minimumHeight: UM.Theme.getSize("popup_dialog").height - width: minimumWidth - backgroundColor: UM.Theme.getColor("main_background") margin: UM.Theme.getSize("default_margin").width - property int comboboxHeight: UM.Theme.getSize("default_margin").height + minimumWidth: UM.Theme.getSize("modal_window_minimum").width + minimumHeight: UM.Theme.getSize("modal_window_minimum").height - onClosing: manager.notifyClosed() - onVisibleChanged: + backgroundColor: UM.Theme.getColor("detail_background") + + headerComponent: Rectangle { - if (visible) + height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height + color: UM.Theme.getColor("main_background") + + UM.Label { - machineResolveComboBox.currentIndex = 0 - qualityChangesResolveComboBox.currentIndex = 0 - materialResolveComboBox.currentIndex = 0 + id: titleLabel + text: catalog.i18nc("@action:title", "Summary - Cura Project") + font: UM.Theme.getFont("large") + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: UM.Theme.getSize("default_margin").height + anchors.leftMargin: UM.Theme.getSize("default_margin").height } } - Flickable + Rectangle { - clip: true - width: parent.width - height: parent.height - contentHeight: dialogSummaryItem.height - ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar } + anchors.fill: parent + UM.I18nCatalog { id: catalog; name: "cura" } + color: UM.Theme.getColor("main_background") - Item + Flickable { id: dialogSummaryItem - width: verticalScrollBar.visible ? parent.width - verticalScrollBar.width - UM.Theme.getSize("default_margin").width : parent.width - height: childrenRect.height - anchors.margins: 10 * screenScaleFactor + width: parent.width + height: parent.height - UM.I18nCatalog - { - id: catalog - name: "cura" - } + clip: true + + contentHeight: contentColumn.height + ScrollBar.vertical: UM.ScrollBar { id: scrollbar } ListModel { @@ -68,373 +69,245 @@ UM.Dialog Column { - width: parent.width + id: contentColumn + width: parent.width - scrollbar.width - UM.Theme.getSize("default_margin").width height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").height + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width - Column + WorkspaceSection { - width: parent.width - height: childrenRect.height - - UM.Label + id: printerSection + title: catalog.i18nc("@action:label", "Printer settings") + iconSource: UM.Theme.getIcon("Printer") + content: Column { - id: titleLabel - text: catalog.i18nc("@action:title", "Summary - Cura Project") - font: UM.Theme.getFont("large") - } + spacing: UM.Theme.getSize("default_margin").height + leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width - Rectangle - { - id: separator - color: UM.Theme.getColor("text") - width: parent.width - height: UM.Theme.getSize("default_lining").height - } - } - - Item - { - width: parent.width - height: childrenRect.height - - UM.TooltipArea - { - id: machineResolveStrategyTooltip - anchors.top: parent.top - anchors.right: parent.right - width: (parent.width / 3) | 0 - height: visible ? comboboxHeight : 0 - visible: base.visible && machineResolveComboBox.model.count > 1 - text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?") - Cura.ComboBox + WorkspaceRow { - id: machineResolveComboBox - model: manager.updatableMachinesModel - visible: machineResolveStrategyTooltip.visible - textRole: "displayName" - width: parent.width - height: UM.Theme.getSize("button").height - onCurrentIndexChanged: + leftLabelText: catalog.i18nc("@action:label", "Type") + rightLabelText: manager.machineType + } + + WorkspaceRow + { + leftLabelText: catalog.i18nc("@action:label", manager.isPrinterGroup ? "Printer Group" : "Printer Name") + rightLabelText: manager.machineName == catalog.i18nc("@button", "Create new") ? "" : manager.machineName + } + } + + comboboxTitle: catalog.i18nc("@action:label", "Open With") + comboboxTooltipText: catalog.i18nc("@info:tooltip", "Printer settings will be updated to match the settings saved with the project.") + comboboxVisible: workspaceDialog.visible && manager.updatableMachinesModel.count > 1 + combobox: Cura.MachineSelector + { + id: machineSelector + headerCornerSide: Cura.RoundedRectangle.Direction.All + width: parent.width + height: parent.height + machineListModel: manager.updatableMachinesModel + machineName: manager.machineName + + isConnectedCloudPrinter: false + isCloudRegistered: false + isNetworkPrinter: manager.isNetworked + isGroup: manager.isAbstractMachine + connectionStatus: "" + + minDropDownWidth: machineSelector.width + + buttons: [ + Cura.SecondaryButton { - if (model.getItem(currentIndex).id == "new" - && model.getItem(currentIndex).type == "default_option") + id: createNewPrinter + text: catalog.i18nc("@button", "Create new") + fixedWidthMode: true + width: parent.width - leftPadding * 1.5 + onClicked: { + toggleContent() manager.setResolveStrategy("machine", "new") - } - else - { - manager.setResolveStrategy("machine", "override") - manager.setMachineToOverride(model.getItem(currentIndex).id) + machineSelector.machineName = catalog.i18nc("@button", "Create new") + manager.setIsAbstractMachine(false) + manager.setIsNetworkedMachine(false) } } + ] - onVisibleChanged: - { - if (!visible) {return} - - currentIndex = 0 - // If the project printer exists in Cura, set it as the default dropdown menu option. - // No need to check object 0, which is the "Create new" option - for (var i = 1; i < model.count; i++) - { - if (model.getItem(i).name == manager.machineName) - { - currentIndex = i - break - } - } - // The project printer does not exist in Cura. If there is at least one printer of the same - // type, select the first one, else set the index to "Create new" - if (currentIndex == 0 && model.count > 1) - { - currentIndex = 1 - } - } - } - } - - Column - { - width: parent.width - height: childrenRect.height - - UM.Label + onSelectPrinter: function(machine) { - id: printer_settings_label - text: catalog.i18nc("@action:label", "Printer settings") - font: UM.Theme.getFont("default_bold") - } - - Row - { - width: parent.width - height: childrenRect.height - - UM.Label - { - text: catalog.i18nc("@action:label", "Type") - width: (parent.width / 3) | 0 - } - UM.Label - { - text: manager.machineType - width: (parent.width / 3) | 0 - } - } - - Row - { - width: parent.width - height: childrenRect.height - - UM.Label - { - text: catalog.i18nc("@action:label", manager.isPrinterGroup ? "Printer Group" : "Printer Name") - width: (parent.width / 3) | 0 - } - UM.Label - { - text: manager.machineName - width: (parent.width / 3) | 0 - wrapMode: Text.WordWrap - } + toggleContent(); + machineSelector.machineName = machine.name + manager.setResolveStrategy("machine", "override") + manager.setMachineToOverride(machine.id) + manager.setIsAbstractMachine(machine.isAbstractMachine) + manager.setIsNetworkedMachine(machine.isNetworked) } } } - Item + WorkspaceSection { - width: parent.width - height: childrenRect.height - - UM.TooltipArea + id: profileSection + title: catalog.i18nc("@action:label", "Profile settings") + iconSource: UM.Theme.getIcon("Sliders") + content: Column { - anchors.right: parent.right - anchors.top: parent.top - width: (parent.width / 3) | 0 - height: visible ? comboboxHeight : 0 + id: profileSettingsValuesTable + spacing: UM.Theme.getSize("default_margin").height + leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width + + WorkspaceRow + { + leftLabelText: catalog.i18nc("@action:label", "Name") + rightLabelText: manager.qualityName + } + + WorkspaceRow + { + leftLabelText: catalog.i18nc("@action:label", "Intent") + rightLabelText: manager.intentName + } + + WorkspaceRow + { + leftLabelText: catalog.i18nc("@action:label", "Not in profile") + rightLabelText: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.numUserSettings).arg(manager.numUserSettings) + visible: manager.numUserSettings != 0 + } + + WorkspaceRow + { + leftLabelText: catalog.i18nc("@action:label", "Derivative from") + rightLabelText: catalog.i18ncp("@action:label", "%1, %2 override", "%1, %2 overrides", manager.numSettingsOverridenByQualityChanges).arg(manager.qualityType).arg(manager.numSettingsOverridenByQualityChanges) + visible: manager.numSettingsOverridenByQualityChanges != 0 + } + } + + comboboxVisible: manager.qualityChangesConflict + combobox: Cura.ComboBox + { + id: qualityChangesResolveComboBox + model: resolveStrategiesModel + textRole: "label" visible: manager.qualityChangesConflict - text: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?") - Cura.ComboBox - { - model: resolveStrategiesModel - textRole: "label" - id: qualityChangesResolveComboBox - width: parent.width - height: UM.Theme.getSize("button").height - onActivated: - { - manager.setResolveStrategy("quality_changes", resolveStrategiesModel.get(index).key) - } - } - } + contentLeftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width + textFont: UM.Theme.getFont("medium") - Column - { - width: parent.width - height: childrenRect.height - - UM.Label + background: Cura.RoundedRectangle { - text: catalog.i18nc("@action:label", "Profile settings") - font: UM.Theme.getFont("default_bold") + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") + color: qualityChangesResolveComboBox.hovered ? UM.Theme.getColor("expandable_hover") : UM.Theme.getColor("action_button") + cornerSide: Cura.RoundedRectangle.Direction.All + radius: UM.Theme.getSize("default_radius").width } - Row + // This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded + currentIndex: { - width: parent.width - height: childrenRect.height - - UM.Label - { - text: catalog.i18nc("@action:label", "Name") - width: (parent.width / 3) | 0 - } - UM.Label - { - text: manager.qualityName - width: (parent.width / 3) | 0 - wrapMode: Text.WordWrap - } + currentIndex = 0 } - Row + onCurrentIndexChanged: { - width: parent.width - height: childrenRect.height - - UM.Label - { - text: catalog.i18nc("@action:label", "Intent") - width: (parent.width / 3) | 0 - } - UM.Label - { - text: manager.intentName - width: (parent.width / 3) | 0 - wrapMode: Text.WordWrap - } - } - - Row - { - width: parent.width - height: childrenRect.height - - UM.Label - { - text: catalog.i18nc("@action:label", "Not in profile") - visible: manager.numUserSettings != 0 - width: (parent.width / 3) | 0 - } - UM.Label - { - text: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.numUserSettings).arg(manager.numUserSettings) - visible: manager.numUserSettings != 0 - width: (parent.width / 3) | 0 - } - } - - Row - { - width: parent.width - height: childrenRect.height - - UM.Label - { - text: catalog.i18nc("@action:label", "Derivative from") - visible: manager.numSettingsOverridenByQualityChanges != 0 - width: (parent.width / 3) | 0 - } - UM.Label - { - text: catalog.i18ncp("@action:label", "%1, %2 override", "%1, %2 overrides", manager.numSettingsOverridenByQualityChanges).arg(manager.qualityType).arg(manager.numSettingsOverridenByQualityChanges) - width: (parent.width / 3) | 0 - visible: manager.numSettingsOverridenByQualityChanges != 0 - wrapMode: Text.WordWrap - } + manager.setResolveStrategy("quality_changes", resolveStrategiesModel.get(currentIndex).key) } } } - Item + WorkspaceSection { - width: parent.width - height: childrenRect.height - - UM.TooltipArea + id: materialSection + title: catalog.i18nc("@action:label", "Material settings") + iconSource: UM.Theme.getIcon("Spool") + content: Column { - id: materialResolveTooltip - anchors.right: parent.right - anchors.top: parent.top - width: (parent.width / 3) | 0 - height: visible ? comboboxHeight : 0 - visible: manager.materialConflict - text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?") - Cura.ComboBox - { - model: resolveStrategiesModel - textRole: "label" - id: materialResolveComboBox - width: parent.width - height: UM.Theme.getSize("button").height - onActivated: - { - manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key) - } - } - } - - Column - { - width: parent.width - height: childrenRect.height - Row - { - height: childrenRect.height - width: parent.width - spacing: UM.Theme.getSize("narrow_margin").width - - UM.Label - { - text: catalog.i18nc("@action:label", "Material settings") - font: UM.Theme.getFont("default_bold") - width: (parent.width / 3) | 0 - } - } + spacing: UM.Theme.getSize("default_margin").height + leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width Repeater { model: manager.materialLabels - delegate: Row + delegate: WorkspaceRow { - width: parent.width - height: childrenRect.height - UM.Label - { - text: catalog.i18nc("@action:label", "Name") - width: (parent.width / 3) | 0 - } - UM.Label - { - text: modelData - width: (parent.width / 3) | 0 - wrapMode: Text.WordWrap - } + leftLabelText: catalog.i18nc("@action:label", "Name") + rightLabelText: modelData } } } + + comboboxVisible: manager.materialConflict + + combobox: Cura.ComboBox + { + id: materialResolveComboBox + model: resolveStrategiesModel + textRole: "label" + visible: manager.materialConflict + contentLeftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width + textFont: UM.Theme.getFont("medium") + + background: Cura.RoundedRectangle + { + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") + color: materialResolveComboBox.hovered ? UM.Theme.getColor("expandable_hover") : UM.Theme.getColor("action_button") + cornerSide: Cura.RoundedRectangle.Direction.All + radius: UM.Theme.getSize("default_radius").width + } + + // This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded + currentIndex: + { + currentIndex = 0 + } + + onCurrentIndexChanged: + { + manager.setResolveStrategy("material", resolveStrategiesModel.get(currentIndex).key) + } + } } - Column + WorkspaceSection { - width: parent.width - height: childrenRect.height + id: visibilitySection + title: catalog.i18nc("@action:label", "Setting visibility") + iconSource: UM.Theme.getIcon("Eye") + content: Column + { + spacing: UM.Theme.getSize("default_margin").height + leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width + bottomPadding: UM.Theme.getSize("narrow_margin").height - UM.Label - { - text: catalog.i18nc("@action:label", "Setting visibility") - font: UM.Theme.getFont("default_bold") - } - Row - { - width: parent.width - height: childrenRect.height - UM.Label + WorkspaceRow { - text: catalog.i18nc("@action:label", "Mode") - width: (parent.width / 3) | 0 + leftLabelText: catalog.i18nc("@action:label", "Mode") + rightLabelText: manager.activeMode } - UM.Label + + WorkspaceRow { - text: manager.activeMode - width: (parent.width / 3) | 0 - } - } - Row - { - width: parent.width - height: childrenRect.height - visible: manager.hasVisibleSettingsField - UM.Label - { - text: catalog.i18nc("@action:label", "Visible settings:") - width: (parent.width / 3) | 0 - } - UM.Label - { - text: catalog.i18nc("@action:label", "%1 out of %2" ).arg(manager.numVisibleSettings).arg(manager.totalNumberOfSettings) - width: (parent.width / 3) | 0 + leftLabelText: catalog.i18nc("@action:label", "%1 out of %2" ).arg(manager.numVisibleSettings).arg(manager.totalNumberOfSettings) + rightLabelText: manager.activeMode + visible: manager.hasVisibleSettingsField } } } Row { + id: clearBuildPlateWarning width: parent.width height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width visible: manager.hasObjectsOnPlate + UM.ColorImage { width: warningLabel.height @@ -459,14 +332,18 @@ UM.Dialog color: warning ? UM.Theme.getColor("warning") : "transparent" anchors.bottom: parent.bottom width: parent.width - height: childrenRect.height + 2 * base.margin + height: childrenRect.height + (warning ? 2 * workspaceDialog.margin : workspaceDialog.margin) Column { height: childrenRect.height - spacing: base.margin + spacing: workspaceDialog.margin + + anchors.leftMargin: workspaceDialog.margin + anchors.rightMargin: workspaceDialog.margin + anchors.bottomMargin: workspaceDialog.margin + anchors.topMargin: warning ? workspaceDialog.margin : 0 - anchors.margins: base.margin anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top @@ -476,7 +353,7 @@ UM.Dialog id: warningRow height: childrenRect.height visible: warning - spacing: base.margin + spacing: workspaceDialog.margin UM.ColorImage { width: UM.Theme.getSize("extruder_icon").width @@ -500,7 +377,7 @@ UM.Dialog } } - buttonSpacing: UM.Theme.getSize("default_margin").width + buttonSpacing: UM.Theme.getSize("wide_margin").width rightButtons: [ Cura.TertiaryButton @@ -532,6 +409,19 @@ UM.Dialog } ] + onClosing: manager.notifyClosed() onRejected: manager.onCancelButtonClicked() onAccepted: manager.onOkButtonClicked() + onVisibleChanged: + { + if (visible) + { + // Force relead the comboboxes + // Since this dialog is only created once the first time you open it, these comboxes need to be reloaded + // each time it is shown after the first time so that the indexes will update correctly. + materialSection.reloadValues() + profileSection.reloadValues() + printerSection.reloadValues() + } + } } diff --git a/plugins/3MFReader/WorkspaceRow.qml b/plugins/3MFReader/WorkspaceRow.qml new file mode 100644 index 0000000000..8d9f1f25b3 --- /dev/null +++ b/plugins/3MFReader/WorkspaceRow.qml @@ -0,0 +1,34 @@ +// Copyright (c) 2022 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 + +import UM 1.5 as UM +import Cura 1.1 as Cura + +Row +{ + property alias leftLabelText: leftLabel.text + property alias rightLabelText: rightLabel.text + + width: parent.width + height: visible ? childrenRect.height : 0 + + UM.Label + { + id: leftLabel + text: catalog.i18nc("@action:label", "Type") + width: Math.round(parent.width / 4) + wrapMode: Text.WordWrap + } + UM.Label + { + id: rightLabel + text: manager.machineType + width: Math.round(parent.width / 3) + wrapMode: Text.WordWrap + } +} \ No newline at end of file diff --git a/plugins/3MFReader/WorkspaceSection.qml b/plugins/3MFReader/WorkspaceSection.qml new file mode 100644 index 0000000000..0c94ab5d6a --- /dev/null +++ b/plugins/3MFReader/WorkspaceSection.qml @@ -0,0 +1,128 @@ +// Copyright (c) 2022 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 + + +import UM 1.5 as UM + + +Item +{ + property alias title: sectionTitle.text + property alias iconSource: sectionTitleIcon.source + property Component content: Item { visible: false } + + property alias comboboxTitle: comboboxLabel.text + property Component combobox: Item { visible: false } + property string comboboxTooltipText: "" + property bool comboboxVisible: false + + width: parent.width + height: childrenRect.height + anchors.leftMargin: UM.Theme.getSize("default_margin").width + + Row + { + id: sectionTitleRow + anchors.top: parent.top + bottomPadding: UM.Theme.getSize("default_margin").height + spacing: UM.Theme.getSize("default_margin").width + + UM.ColorImage + { + id: sectionTitleIcon + anchors.verticalCenter: parent.verticalCenter + source: "" + height: UM.Theme.getSize("medium_button_icon").height + color: UM.Theme.getColor("text") + width: height + } + UM.Label + { + id: sectionTitle + text: "" + anchors.verticalCenter: parent.verticalCenter + font: UM.Theme.getFont("default_bold") + } + } + + Item + { + id: comboboxTooltip + width: Math.round(parent.width / 2.5) + height: visible ? UM.Theme.getSize("default_margin").height : 0 + anchors.top: parent.top + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + visible: comboboxVisible + + UM.Label + { + id: comboboxLabel + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: UM.Theme.getSize("default_margin").height + visible: comboboxVisible && text != "" + text: "" + font: UM.Theme.getFont("default_bold") + } + + Loader + { + id: comboboxLoader + width: parent.width + height: UM.Theme.getSize("button").height + anchors.top: comboboxLabel.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + anchors.left: parent.left + sourceComponent: combobox + } + + MouseArea + { + id: helpIconMouseArea + anchors.right: parent.right + anchors.verticalCenter: comboboxLabel.verticalCenter + width: childrenRect.width + height: childrenRect.height + hoverEnabled: true + + UM.ColorImage + { + width: UM.Theme.getSize("section_icon").width + height: width + + visible: comboboxTooltipText != "" + source: UM.Theme.getIcon("Help") + color: UM.Theme.getColor("text") + + UM.ToolTip + { + text: comboboxTooltipText + visible: helpIconMouseArea.containsMouse + targetPoint: Qt.point(parent.x + Math.round(parent.width / 2), parent.y) + x: 0 + y: parent.y + parent.height + UM.Theme.getSize("default_margin").height + width: UM.Theme.getSize("tooltip").width + } + } + } + } + + + Loader + { + width: parent.width + height: content.height + anchors.top: sectionTitleRow.bottom + sourceComponent: content + } + + function reloadValues() + { + comboboxLoader.sourceComponent = null + comboboxLoader.sourceComponent = combobox + } +} \ No newline at end of file diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index db27f8a6a3..78185137af 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. import argparse #To run the engine in debug mode if the front-end is in debug mode. @@ -166,7 +166,7 @@ class CuraEngineBackend(QObject, Backend): self._slicing_error_message.addAction( action_id = "report_bug", name = catalog.i18nc("@message:button", "Report a bug"), - description = catalog.i18nc("@message:description", "Report a bug on Ultimaker Cura's issue tracker."), + description = catalog.i18nc("@message:description", "Report a bug on UltiMaker Cura's issue tracker."), icon = "[no_icon]" ) self._slicing_error_message.actionTriggered.connect(self._reportBackendError) diff --git a/plugins/Marketplace/CloudSync/CloudPackageChecker.py b/plugins/Marketplace/CloudSync/CloudPackageChecker.py index 53087e0502..d3f20a84ed 100644 --- a/plugins/Marketplace/CloudSync/CloudPackageChecker.py +++ b/plugins/Marketplace/CloudSync/CloudPackageChecker.py @@ -1,5 +1,5 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. import json from typing import List, Dict, Any, Set @@ -142,7 +142,7 @@ class CloudPackageChecker(QObject): sync_message = Message(self._i18n_catalog.i18nc( "@info:generic", "Do you want to sync material and software packages with your account?"), - title = self._i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account", )) + title = self._i18n_catalog.i18nc("@info:title", "Changes detected from your UltiMaker account", )) sync_message.addAction("sync", name = self._i18n_catalog.i18nc("@action:button", "Sync"), icon = "", diff --git a/plugins/Marketplace/CloudSync/DownloadPresenter.py b/plugins/Marketplace/CloudSync/DownloadPresenter.py index 8325c27eb7..35764ad654 100644 --- a/plugins/Marketplace/CloudSync/DownloadPresenter.py +++ b/plugins/Marketplace/CloudSync/DownloadPresenter.py @@ -1,5 +1,5 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. import tempfile from typing import Dict, List, Any @@ -92,7 +92,7 @@ class DownloadPresenter: lifetime = 0, use_inactivity_timer = False, progress = 0.0, - title = i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account")) + title = i18n_catalog.i18nc("@info:title", "Changes detected from your UltiMaker account")) def _onFinished(self, package_id: str, reply: QNetworkReply) -> None: self._progress[package_id]["received"] = self._progress[package_id]["total"] diff --git a/plugins/Marketplace/PackageModel.py b/plugins/Marketplace/PackageModel.py index 078bfc879e..fa909b4120 100644 --- a/plugins/Marketplace/PackageModel.py +++ b/plugins/Marketplace/PackageModel.py @@ -92,7 +92,7 @@ class PackageModel(QObject): "display_name": display_name, "package_version": package_version, "package_type": package_type, - "description": "The material package associated with the Cura project could not be found on the Ultimaker marketplace. Use the partial material profile definition stored in the Cura project file at your own risk." + "description": catalog.i18nc("@label:label Ultimaker Marketplace is a brand name, don't translate", "The material package associated with the Cura project could not be found on the Ultimaker Marketplace. Use the partial material profile definition stored in the Cura project file at your own risk.") } package_model = cls(package_data) package_model.setIsMissingPackageInformation(True) diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index 9358a04f07..2280cc90ed 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 @@ -12,7 +13,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner"); bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight") - bannerText: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.") + bannerText: catalog.i18nc("@text", "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.") bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/4411125921426/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-manage" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false); diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index c10a937d67..6527a76358 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import UM 1.4 as UM @@ -9,7 +9,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner") bannerIcon: UM.Theme.getIcon("Spool") - bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") + bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your UltiMaker 3D printers.") bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-materials" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_material_banner", false); diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index 739e0c01a7..c4f96374dc 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import UM 1.4 as UM @@ -9,7 +9,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner") bannerIcon: UM.Theme.getIcon("Shop") - bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.") + bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users.") bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-plugins" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) diff --git a/plugins/Marketplace/resources/qml/VerifiedIcon.qml b/plugins/Marketplace/resources/qml/VerifiedIcon.qml index e701c5a91b..dd22d40246 100644 --- a/plugins/Marketplace/resources/qml/VerifiedIcon.qml +++ b/plugins/Marketplace/resources/qml/VerifiedIcon.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 @@ -18,9 +18,9 @@ Control { switch(packageData.packageType) { - case "plugin": return catalog.i18nc("@info", "Ultimaker Verified Plug-in"); - case "material": return catalog.i18nc("@info", "Ultimaker Certified Material"); - default: return catalog.i18nc("@info", "Ultimaker Verified Package"); + case "plugin": return catalog.i18nc("@info", "UltiMaker Verified Plug-in"); + case "material": return catalog.i18nc("@info", "UltiMaker Certified Material"); + default: return catalog.i18nc("@info", "UltiMaker Verified Package"); } } visible: parent.hovered diff --git a/plugins/MonitorStage/MonitorMenu.qml b/plugins/MonitorStage/MonitorMenu.qml index bc95c276e8..ba99c3119e 100644 --- a/plugins/MonitorStage/MonitorMenu.qml +++ b/plugins/MonitorStage/MonitorMenu.qml @@ -19,5 +19,7 @@ Item width: UM.Theme.getSize("machine_selector_widget").width height: parent.height anchors.centerIn: parent + + machineListModel: Cura.MachineListModel {} } } \ No newline at end of file diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 2d4b3e01e5..be7aebcf7a 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -150,6 +150,7 @@ Item width: parent.width / 2 - UM.Theme.getSize("default_margin").width height: UM.Theme.getSize("setting_control").height textRole: "text" + forceHighlight: base.hovered model: ListModel { diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index 42c3c8dde6..ab9b9b1b3d 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -55,6 +55,50 @@ Item Layout.preferredWidth: parent.machineSelectorWidth Layout.fillWidth: true Layout.fillHeight: true + + machineManager: Cura.MachineManager + onSelectPrinter: function(machine) + { + toggleContent(); + Cura.MachineManager.setActiveMachine(machine.id); + } + + machineListModel: Cura.MachineListModel {} + + buttons: [ + Cura.SecondaryButton + { + id: addPrinterButton + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + text: catalog.i18nc("@button", "Add printer") + // The maximum width of the button is half of the total space, minus the padding of the parent, the left + // padding of the component and half the spacing because of the space between buttons. + fixedWidthMode: true + width: Math.round(parent.width / 2 - leftPadding * 1.5) + onClicked: + { + machineSelection.toggleContent() + Cura.Actions.addMachine.trigger() + } + }, + Cura.SecondaryButton + { + id: managePrinterButton + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + text: catalog.i18nc("@button", "Manage printers") + fixedWidthMode: true + // The maximum width of the button is half of the total space, minus the padding of the parent, the right + // padding of the component and half the spacing because of the space between buttons. + width: Math.round(parent.width / 2 - rightPadding * 1.5) + onClicked: + { + machineSelection.toggleContent() + Cura.Actions.configureMachines.trigger() + } + } + ] } Cura.ConfigurationMenu diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 310fa29c17..e0954dc55e 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -70,7 +70,7 @@ Window left: parent.left right: parent.right } - text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:") + text: catalog.i18nc("@text:window", "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:") wrapMode: Text.WordWrap } diff --git a/plugins/UFPReader/UFPReader.py b/plugins/UFPReader/UFPReader.py index 71061f938b..8596de9bf0 100644 --- a/plugins/UFPReader/UFPReader.py +++ b/plugins/UFPReader/UFPReader.py @@ -21,7 +21,7 @@ class UFPReader(MeshReader): MimeTypeDatabase.addMimeType( MimeType( name = "application/x-ufp", - comment = "Ultimaker Format Package", + comment = "UltiMaker Format Package", suffixes = ["ufp"] ) ) diff --git a/plugins/UFPReader/__init__.py b/plugins/UFPReader/__init__.py index cfea4b9882..ce4bf9730e 100644 --- a/plugins/UFPReader/__init__.py +++ b/plugins/UFPReader/__init__.py @@ -1,5 +1,5 @@ -#Copyright (c) 2019 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. import sys @@ -19,7 +19,7 @@ def getMetaData(): { "mime_type": "application/x-ufp", "extension": "ufp", - "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package") + "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package") } ] } diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index d7671d02c8..d76bcb1b83 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -1,6 +1,7 @@ # Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json +from dataclasses import asdict from typing import cast, List, Dict from Charon.VirtualFile import VirtualFile # To open UFP files. @@ -40,7 +41,7 @@ class UFPWriter(MeshWriter): MimeTypeDatabase.addMimeType( MimeType( name = "application/x-ufp", - comment = "Ultimaker Format Package", + comment = "UltiMaker Format Package", suffixes = ["ufp"] ) ) @@ -225,8 +226,7 @@ class UFPWriter(MeshWriter): "changes": {}, "all_settings": {}, }, - "intent": machine_manager.activeIntentCategory, - "quality": machine_manager.activeQualityOrQualityChangesName, + "quality": asdict(machine_manager.activeQualityDisplayNameMap()), } global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) diff --git a/plugins/UFPWriter/__init__.py b/plugins/UFPWriter/__init__.py index 9db6b042f8..ae51f78e95 100644 --- a/plugins/UFPWriter/__init__.py +++ b/plugins/UFPWriter/__init__.py @@ -1,5 +1,5 @@ -#Copyright (c) 2018 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. import sys @@ -25,7 +25,7 @@ def getMetaData(): "mime_type": "application/x-ufp", "mode": MeshWriter.OutputMode.BinaryMode, "extension": "ufp", - "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package") + "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package") } ] } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 9d6ffba17b..2488e55bd1 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -284,7 +284,7 @@ Item MonitorInfoBlurb { id: cameraDisabledInfo - text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." + + text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." + " Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam.") target: cameraButton } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index 33e8adf256..2a0609dab4 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 9daf563460..c5c144d273 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -1,5 +1,5 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. from time import time import os diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index abfe863749..5ec0db8a66 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -1,5 +1,5 @@ -# Copyright (c) 2021 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. import os from typing import Dict, List, Optional, Set diff --git a/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py index caed6ddf91..e31615816e 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py @@ -1,5 +1,6 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + from UM import i18nCatalog from UM.Message import Message from cura.CuraApplication import CuraApplication diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml index 8136e63a47..cb176a3ae4 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -27,7 +27,7 @@ Cura.MachineAction anchors.topMargin: UM.Theme.getSize("default_margin").height width: parent.width wrapMode: Text.WordWrap - text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original") + text: catalog.i18nc("@label","Please select any upgrades made to this UltiMaker Original") font: UM.Theme.getFont("medium") } diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 527fa4ec13..524b7f099c 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1125,21 +1125,28 @@ class XmlMaterialProfile(InstanceContainer): id_list = list(id_list) return id_list + __product_to_id_map: Optional[Dict[str, List[str]]] = None + @classmethod def getProductIdMap(cls) -> Dict[str, List[str]]: """Gets a mapping from product names in the XML files to their definition IDs. This loads the mapping from a file. """ + if cls.__product_to_id_map is not None: + return cls.__product_to_id_map plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("XmlMaterialProfile")) product_to_id_file = os.path.join(plugin_path, "product_to_id.json") with open(product_to_id_file, encoding = "utf-8") as f: - product_to_id_map = json.load(f) - product_to_id_map = {key: [value] for key, value in product_to_id_map.items()} + contents = "" + for line in f: + contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) + cls.__product_to_id_map = json.loads(contents) + cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. #However it is not always loaded with that default; this mapping is also used in serialize() without that default. - return product_to_id_map + return cls.__product_to_id_map @staticmethod def _parseCompatibleValue(value: str): diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/plugins/XmlMaterialProfile/product_to_id.json index 053c8d13f5..07e14f1276 100644 --- a/plugins/XmlMaterialProfile/product_to_id.json +++ b/plugins/XmlMaterialProfile/product_to_id.json @@ -1,14 +1,11 @@ { - "Ultimaker 2": "ultimaker2", - "Ultimaker 2 Extended": "ultimaker2_extended", - "Ultimaker 2 Extended+": "ultimaker2_extended_plus", - "Ultimaker 2 Go": "ultimaker2_go", - "Ultimaker 2+": "ultimaker2_plus", - "Ultimaker 2+ Connect": "ultimaker2_plus_connect", - "Ultimaker 3": "ultimaker3", - "Ultimaker 3 Extended": "ultimaker3_extended", - "Ultimaker S3": "ultimaker_s3", - "Ultimaker S5": "ultimaker_s5", + "Ultimaker #": "ultimaker#", + "Ultimaker # Extended": "ultimaker#_extended", + "Ultimaker # Extended+": "ultimaker#_extended_plus", + "Ultimaker # Go": "ultimaker#_go", + "Ultimaker #+": "ultimaker#_plus", + "Ultimaker #+ Connect": "ultimaker#_plus_connect", + "Ultimaker S#": "ultimaker_s#", "Ultimaker Original": "ultimaker_original", "Ultimaker Original+": "ultimaker_original_plus", "Ultimaker Original Dual Extrusion": "ultimaker_original_dual", diff --git a/printer-linter/README.md b/printer-linter/README.md new file mode 100644 index 0000000000..fc6a9a8e29 --- /dev/null +++ b/printer-linter/README.md @@ -0,0 +1,33 @@ +# Printer Linter +Printer linter is a python package that does linting on Cura definitions files. +Running this on your definition files will get them ready for a pull request. + +## Running Locally +From the Cura root folder. + +```python3 printer-linter/src/terminal.py "flashforge_dreamer_nx.def.json" "flashforge_base.def.json" --fix --format``` + +## Developing +### Printer Linter Rules +Inside ```.printer-linter``` you can find a list of rules. These are seperated into roughly three categories. + +1. Checks + 1. These rules are about checking if a file meets some requirements that can't be fixed by replacing its content. + 2. An example of a check is ```diagnostic-mesh-file-extension``` this checks if a mesh file extension is acceptable. +2. Format + 1. These rules are purely about how a file is structured, not content. + 2. An example of a format rule is ```format-definition-bracket-newline``` This rule says that when assigning a dict value the bracket should go on a new line. +3. Fixes + 1. These are about the content of the file. + 2. An example of a fix is ```diagnostic-definition-redundant-override``` This removes settings that have already been defined by a parent definition + +### Linters +Linters find issues within a file. There are separate linters for each type of file. The linter that is used is decided by the create function in factory.py. All linters implement the abstract class Linter. + +A Linter class returns an iterator of Diagnostics, each diagnostic is an issue with the file. The diagnostics can also contain suggested fixes. + +### Formatters +Formatters load a file reformat it and write it to disk. There are separate formatters for each file type. All formatters implement the abstract class Formatter. + +Formatters should format based on the Format rules in .printer-linter + diff --git a/printer-linter/pyproject.toml b/printer-linter/pyproject.toml new file mode 100644 index 0000000000..74c6531c87 --- /dev/null +++ b/printer-linter/pyproject.toml @@ -0,0 +1,17 @@ +[project] +name = "printerlinter" +description = "Cura UltiMaker printer linting tool" +version = "0.1.0" +authors = [ + { name = "UltiMaker", email = "cura@ultimaker.com" } +] +dependencies = [ + "pyyaml" +] + +[project.scripts] +printer-linter = "terminal:main" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/printer-linter/setup.cfg b/printer-linter/setup.cfg new file mode 100644 index 0000000000..68b0484162 --- /dev/null +++ b/printer-linter/setup.cfg @@ -0,0 +1,10 @@ +[metadata] +name = printerlinter + +[options] +package_dir= + =src +packages=find: + +[options.packages.find] +where=src \ No newline at end of file diff --git a/printer-linter/setup.py b/printer-linter/setup.py new file mode 100644 index 0000000000..25536050b2 --- /dev/null +++ b/printer-linter/setup.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +from setuptools import setup + +if __name__ == "__main__": + setup() diff --git a/printer-linter/src/printerlinter/__init__.py b/printer-linter/src/printerlinter/__init__.py new file mode 100644 index 0000000000..3ec571c3c6 --- /dev/null +++ b/printer-linter/src/printerlinter/__init__.py @@ -0,0 +1,4 @@ +from .diagnostic import Diagnostic +from .factory import getLinter + +__all__ = ["Diagnostic", "getLinter"] diff --git a/printer-linter/src/printerlinter/diagnostic.py b/printer-linter/src/printerlinter/diagnostic.py new file mode 100644 index 0000000000..27f4fdd14a --- /dev/null +++ b/printer-linter/src/printerlinter/diagnostic.py @@ -0,0 +1,34 @@ +from pathlib import Path +from typing import Optional, List, Dict, Any + +from .replacement import Replacement + + +class Diagnostic: + def __init__(self, file: Path, diagnostic_name: str, message: str, level: str, offset: int, replacements: Optional[List[Replacement]] = None) -> None: + """ A diagnosis of an issue in "file" at "offset" in that file. May include suggested replacements. + + @param file: The path to the file this diagnostic is for. + @param diagnostic_name: The name of the diagnostic rule that spawned this result. A list can be found in .printer-linter. + @param message: A message explaining the issue with this file. + @param level: How important this diagnostic is, ranges from Warning -> Error. + @param offset: The offset in file where the issue is. + @param replacements: A list of Replacement that contain replacement text. + """ + self.file = file + self.diagnostic_name = diagnostic_name + self.message = message + self.offset = offset + self.level = level + self.replacements = replacements + + def toDict(self) -> Dict[str, Any]: + return {"DiagnosticName": self.diagnostic_name, + "DiagnosticMessage": { + "Message": self.message, + "FilePath": self.file.as_posix(), + "FileOffset": self.offset, + "Replacements": [] if self.replacements is None else [r.toDict() for r in self.replacements], + }, + "Level": self.level + } diff --git a/printer-linter/src/printerlinter/factory.py b/printer-linter/src/printerlinter/factory.py new file mode 100644 index 0000000000..d27f82244b --- /dev/null +++ b/printer-linter/src/printerlinter/factory.py @@ -0,0 +1,26 @@ +from pathlib import Path +from typing import Optional + +from .linters.profile import Profile +from .linters.defintion import Definition +from .linters.linter import Linter +from .linters.meshes import Meshes + + +def getLinter(file: Path, settings: dict) -> Optional[Linter]: + """ Returns a Linter depending on the file format """ + if not file.exists(): + return None + + if ".inst" in file.suffixes and ".cfg" in file.suffixes: + return Profile(file, settings) + + if ".def" in file.suffixes and ".json" in file.suffixes: + if file.stem in ("fdmprinter.def", "fdmextruder.def"): + return None + return Definition(file, settings) + + if file.parent.stem == "meshes": + return Meshes(file, settings) + + return None diff --git a/printer-linter/src/printerlinter/formatters/__init__.py b/printer-linter/src/printerlinter/formatters/__init__.py new file mode 100644 index 0000000000..00d9c7eef3 --- /dev/null +++ b/printer-linter/src/printerlinter/formatters/__init__.py @@ -0,0 +1,4 @@ +from .def_json_formatter import DefJsonFormatter +from .inst_cfg_formatter import InstCfgFormatter + +__all__ = ["DefJsonFormatter", "InstCfgFormatter"] \ No newline at end of file diff --git a/printer-linter/src/printerlinter/formatters/def_json_formatter.py b/printer-linter/src/printerlinter/formatters/def_json_formatter.py new file mode 100644 index 0000000000..f99fe5bfb4 --- /dev/null +++ b/printer-linter/src/printerlinter/formatters/def_json_formatter.py @@ -0,0 +1,84 @@ +import json +import re +from collections import OrderedDict +from pathlib import Path +from typing import Dict + +from .formatter import FileFormatter + + +# Dictionary items with matching keys will be sorted as if they were the value +# Example: "version" will be sorted as if it was "0" +TOP_LEVEL_SORT_PRIORITY = { + "version": "0", + "name": "1", + "inherits": "3", +} + +METADATA_SORT_PRIORITY = { + "visible": "0", + "author": "1", + "manufacturer": "2", + "file_formats": "3", + "platform": "4", +} + + +class DefJsonFormatter(FileFormatter): + def formatFile(self, file: Path): + """ Format .def.json files according to the rules in settings. + + You can assume that you will be running regex on standard formatted json files, because we load the json first and then + dump it to a string. This means you only have to write regex that works on the output of json.dump() + """ + + definition = json.loads(file.read_text(), object_pairs_hook=OrderedDict) + + if self._settings["format"].get("format-definition-sort-keys", True): + definition = self.order_keys(definition) + + content = json.dumps(definition, indent=self._settings["format"].get("format-definition-indent", 4)) + + if self._settings["format"].get("format-definition-bracket-newline", True): + newline = re.compile(r"(\B\s+)(\"[\w\"]+)(\:\s\{)") + content = newline.sub(r"\1\2:\1{", content) + + if self._settings["format"].get("format-definition-single-value-single-line", True): + single_value_dict = re.compile(r"(:)(\s*\n?.*\{\s+)(\".*)(\d*\s*\})(.*\n,?)") + content = single_value_dict.sub(r"\1 { \3 }\5", content) + + single_value_list = re.compile(r"(:)(\s*\n?.*\[\s+)(\".*)(\d*\s*\])(.*\n,?)") + content = single_value_list.sub(r"\1 [ \3 ]\5", content) + + if self._settings["format"].get("format-definition-paired-coordinate-array", True): + paired_coordinates = re.compile(r"(\s*\[)\s*([-\d\.]+),\s*([-\d\.]+)[\s]*(\])") + content = paired_coordinates.sub(r"\1\2, \3\4", content) + + file.write_text(content) + + def order_keys(self, json_content: OrderedDict) -> OrderedDict: + """ Orders json keys lexicographically """ + # First order all keys (Recursive) lexicographically + json_content_text = json.dumps(json_content, sort_keys=True) + json_content = json.loads(json_content_text, object_pairs_hook=OrderedDict) + + # Do a custom ordered sort on the top level items in the json. This is so that keys like "version" appear at the top. + json_content = self.custom_sort_keys(json_content, TOP_LEVEL_SORT_PRIORITY) + + # Do a custom ordered sort on collections that are one level deep into the json + if "metadata" in json_content.keys(): + json_content["metadata"] = self.custom_sort_keys(json_content["metadata"], METADATA_SORT_PRIORITY) + + return json_content + + + def custom_sort_keys(self, ordered_dictionary: OrderedDict, sort_priority: Dict[str, str]) -> OrderedDict: + """ Orders keys in dictionary lexicographically, except for keys with matching strings in sort_priority. + + Keys in ordered_dictionary that match keys in sort_priority will sort based on the value in sort_priority. + + @param ordered_dictionary: A dictionary that will have it's top level keys sorted + @param sort_priority: A mapping from string keys to alternative strings to be used instead when sorting. + @return: A dictionary sorted by it's top level keys + """ + return OrderedDict(sorted(ordered_dictionary.items(), key=lambda x: sort_priority[x[0]] if str(x[0]) in sort_priority.keys() else str(x[0]))) diff --git a/printer-linter/src/printerlinter/formatters/formatter.py b/printer-linter/src/printerlinter/formatters/formatter.py new file mode 100644 index 0000000000..c668744f42 --- /dev/null +++ b/printer-linter/src/printerlinter/formatters/formatter.py @@ -0,0 +1,16 @@ +from abc import ABC, abstractmethod +from pathlib import Path + + +class FileFormatter(ABC): + def __init__(self, settings: dict) -> None: + """ Yields Diagnostics for file, these are issues with the file such as bad text format or too large file size. + + @param file: A file to generate diagnostics for + @param settings: A list of settings containing rules for creating diagnostics + """ + self._settings = settings + + @abstractmethod + def formatFile(self, file: Path) -> None: + pass \ No newline at end of file diff --git a/printer-linter/src/printerlinter/formatters/inst_cfg_formatter.py b/printer-linter/src/printerlinter/formatters/inst_cfg_formatter.py new file mode 100644 index 0000000000..c4113bcb48 --- /dev/null +++ b/printer-linter/src/printerlinter/formatters/inst_cfg_formatter.py @@ -0,0 +1,21 @@ +import configparser +import json +import re +from collections import OrderedDict +from pathlib import Path + +from .formatter import FileFormatter + +class InstCfgFormatter(FileFormatter): + def formatFile(self, file: Path): + """ Format .inst.cfg files according to the rules in settings """ + config = configparser.ConfigParser() + config.read(file) + + if self._settings["format"].get("format-profile-sort-keys", True): + for section in config._sections: + config._sections[section] = OrderedDict(sorted(config._sections[section].items(), key=lambda t: t[0])) + config._sections = OrderedDict(sorted(config._sections.items(), key=lambda t: t[0])) + + with open(file, "w") as f: + config.write(f, space_around_delimiters=self._settings["format"].get("format-profile-space-around-delimiters", True)) \ No newline at end of file diff --git a/printer-linter/src/printerlinter/linters/__init__.py b/printer-linter/src/printerlinter/linters/__init__.py new file mode 100644 index 0000000000..a4a48acb3d --- /dev/null +++ b/printer-linter/src/printerlinter/linters/__init__.py @@ -0,0 +1,6 @@ +from .profile import Profile +from .meshes import Meshes +from .linter import Linter +from .defintion import Definition + +__all__ = ["Profile", "Meshes", "Linter", "Definition"] \ No newline at end of file diff --git a/printer-linter/src/printerlinter/linters/defintion.py b/printer-linter/src/printerlinter/linters/defintion.py new file mode 100644 index 0000000000..dc272ccd9c --- /dev/null +++ b/printer-linter/src/printerlinter/linters/defintion.py @@ -0,0 +1,122 @@ +import json +import re +from pathlib import Path +from typing import Iterator + +from ..diagnostic import Diagnostic +from .linter import Linter +from ..replacement import Replacement + + +class Definition(Linter): + """ Finds issues in definition files, such as overriding default parameters """ + def __init__(self, file: Path, settings: dict) -> None: + super().__init__(file, settings) + self._definitions = {} + self._loadDefinitionFiles(file) + self._content = self._file.read_text() + self._loadBasePrinterSettings() + + @property + def base_def(self): + if "fdmextruder" in self._definitions: + return "fdmextruder" + return "fdmprinter" + + def check(self) -> Iterator[Diagnostic]: + if self._settings["checks"].get("diagnostic-definition-redundant-override", False): + for check in self.checkRedefineOverride(): + yield check + + # Add other which will yield Diagnostic's + # TODO: A check to determine if the user set value is with the min and max value defined in the parent and doesn't trigger a warning + # TODO: A check if the key exist in the first place + # TODO: Check if the model platform exist + + yield + + def checkRedefineOverride(self) -> Iterator[Diagnostic]: + """ Checks if definition file overrides its parents settings with the same value. """ + definition_name = list(self._definitions.keys())[0] + definition = self._definitions[definition_name] + if "overrides" in definition and definition_name not in ("fdmprinter", "fdmextruder"): + for key, value_dict in definition["overrides"].items(): + is_redefined, value, parent = self._isDefinedInParent(key, value_dict, definition['inherits']) + if is_redefined: + redefined = re.compile(r'.*(\"' + key + r'\"[\s\S]*?\{)[\s\S]*?(\}[,\"]?)') + found = redefined.search(self._content) + yield Diagnostic( + file = self._file, + diagnostic_name = "diagnostic-definition-redundant-override", + message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}", + level = "Warning", + offset = found.span(0)[0], + replacements = [Replacement( + file = self._file, + offset = found.span(1)[0], + length = found.span(2)[1] - found.span(1)[0], + replacement_text = "")] + ) + + def _loadDefinitionFiles(self, definition_file) -> None: + """ Loads definition file contents into self._definitions. Also load parent definition if it exists. """ + definition_name = Path(definition_file.stem).stem + + if not definition_file.exists() or definition_name in self._definitions: + return + + # Load definition file into dictionary + self._definitions[definition_name] = json.loads(definition_file.read_text()) + + # Load parent definition if it exists + if "inherits" in self._definitions[definition_name]: + if self._definitions[definition_name]['inherits'] in ("fdmextruder", "fdmprinter"): + parent_file = definition_file.parent.parent.joinpath("definitions", f"{self._definitions[definition_name]['inherits']}.def.json") + else: + parent_file = definition_file.parent.joinpath(f"{self._definitions[definition_name]['inherits']}.def.json") + self._loadDefinitionFiles(parent_file) + + def _isDefinedInParent(self, key, value_dict, inherits_from): + if "overrides" not in self._definitions[inherits_from]: + return self._isDefinedInParent(key, value_dict, self._definitions[inherits_from]["inherits"]) + + parent = self._definitions[inherits_from]["overrides"] + if key not in self._definitions[self.base_def]["overrides"]: + is_number = False + else: + is_number = self._definitions[self.base_def]["overrides"][key]["type"] in ("float", "int") + for value in value_dict.values(): + if key in parent: + check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None] + for check_value in check_values: + if is_number: + try: + v = str(float(value)) + except: + v = value + try: + cv = str(float(check_value)) + except: + cv = check_value + else: + v = value + cv = check_value + if v == cv: + return True, value, parent + + if "inherits" in parent: + return self._isDefinedInParent(key, value_dict, parent["inherits"]) + return False, None, None + + def _loadBasePrinterSettings(self): + """ TODO @Jelle please explain why this """ + settings = {} + for k, v in self._definitions[self.base_def]["settings"].items(): + self._getSetting(k, v, settings) + self._definitions[self.base_def] = {"overrides": settings} + + def _getSetting(self, name, setting, settings) -> None: + if "children" in setting: + for childname, child in setting["children"].items(): + self._getSetting(childname, child, settings) + settings |= {name: setting} diff --git a/printer-linter/src/printerlinter/linters/linter.py b/printer-linter/src/printerlinter/linters/linter.py new file mode 100644 index 0000000000..fbcd91196d --- /dev/null +++ b/printer-linter/src/printerlinter/linters/linter.py @@ -0,0 +1,20 @@ +from abc import ABC, abstractmethod +from pathlib import Path +from typing import Iterator + +from ..diagnostic import Diagnostic + + +class Linter(ABC): + def __init__(self, file: Path, settings: dict) -> None: + """ Yields Diagnostics for file, these are issues with the file such as bad text format or too large file size. + + @param file: A file to generate diagnostics for + @param settings: A list of settings containing rules for creating diagnostics + """ + self._settings = settings + self._file = file + + @abstractmethod + def check(self) -> Iterator[Diagnostic]: + pass \ No newline at end of file diff --git a/printer-linter/src/printerlinter/linters/meshes.py b/printer-linter/src/printerlinter/linters/meshes.py new file mode 100644 index 0000000000..d49caf7dc9 --- /dev/null +++ b/printer-linter/src/printerlinter/linters/meshes.py @@ -0,0 +1,47 @@ +from pathlib import Path +from typing import Iterator + +from ..diagnostic import Diagnostic +from .linter import Linter + + +class Meshes(Linter): + def __init__(self, file: Path, settings: dict) -> None: + """ Finds issues in model files, such as incorrect file format or too large size """ + super().__init__(file, settings) + self._max_file_size = self._settings.get("diagnostic-mesh-file-size", 1e6) + + def check(self) -> Iterator[Diagnostic]: + if self._settings["checks"].get("diagnostic-mesh-file-extension", False): + for check in self.checkFileFormat(): + yield check + + if self._settings["checks"].get("diagnostic-mesh-file-size", False): + for check in self.checkFileSize(): + yield check + + yield + + def checkFileFormat(self) -> Iterator[Diagnostic]: + """ Check if mesh is in supported format """ + if self._file.suffix.lower() not in (".3mf", ".obj", ".stl"): + yield Diagnostic( + file = self._file, + diagnostic_name = "diagnostic-mesh-file-extension", + message = f"Extension {self._file.suffix} not supported, use 3mf, obj or stl", + level = "Error", + offset = 1 + ) + yield + + def checkFileSize(self) -> Iterator[Diagnostic]: + """ Check if file is within size limits for Cura """ + if self._file.stat().st_size > self._max_file_size: + yield Diagnostic( + file = self._file, + diagnostic_name = "diagnostic-mesh-file-size", + message = f"Mesh file with a size {self._file.stat().st_size} is bigger then allowed maximum of {self._max_file_size}", + level = "Error", + offset = 1 + ) + yield diff --git a/printer-linter/src/printerlinter/linters/profile.py b/printer-linter/src/printerlinter/linters/profile.py new file mode 100644 index 0000000000..85cc2d9f0b --- /dev/null +++ b/printer-linter/src/printerlinter/linters/profile.py @@ -0,0 +1,9 @@ +from typing import Iterator + +from ..diagnostic import Diagnostic +from .linter import Linter + + +class Profile(Linter): + def check(self) -> Iterator[Diagnostic]: + yield diff --git a/printer-linter/src/printerlinter/replacement.py b/printer-linter/src/printerlinter/replacement.py new file mode 100644 index 0000000000..b9f390107d --- /dev/null +++ b/printer-linter/src/printerlinter/replacement.py @@ -0,0 +1,21 @@ +from pathlib import Path + +class Replacement: + def __init__(self, file: Path, offset: int, length: int, replacement_text: str): + """ Replacement text for file between offset and offset+length. + + @param file: File to replace text in + @param offset: Offset in file to start text replace + @param length: Length of text that will be replaced. offset -> offset+length is the section of text to replace. + @param replacement_text: Text to insert of offset in file. + """ + self.file = file + self.offset = offset + self.length = length + self.replacement_text = replacement_text + + def toDict(self) -> dict: + return {"FilePath": self.file.as_posix(), + "Offset": self.offset, + "Length": self.length, + "ReplacementText": self.replacement_text} diff --git a/printer-linter/src/terminal.py b/printer-linter/src/terminal.py new file mode 100644 index 0000000000..6e6d1af4e5 --- /dev/null +++ b/printer-linter/src/terminal.py @@ -0,0 +1,117 @@ +from argparse import ArgumentParser +from os import getcwd +from pathlib import Path +from typing import List + +import yaml + +from printerlinter import factory +from printerlinter.diagnostic import Diagnostic +from printerlinter.formatters.def_json_formatter import DefJsonFormatter +from printerlinter.formatters.inst_cfg_formatter import InstCfgFormatter + + +def main() -> None: + parser = ArgumentParser( + description="UltiMaker Cura printer linting, static analysis and formatting of Cura printer definitions and other resources") + parser.add_argument("--setting", required=False, type=Path, help="Path to the `.printer-linter` setting file") + parser.add_argument("--report", required=False, type=Path, help="Path where the diagnostic report should be stored") + parser.add_argument("--format", action="store_true", help="Format the files") + parser.add_argument("--diagnose", action="store_true", help="Diagnose the files") + parser.add_argument("--fix", action="store_true", help="Attempt to apply the suggested fixes on the files") + parser.add_argument("Files", metavar="F", type=Path, nargs="+", help="Files or directories to format") + + args = parser.parse_args() + files = extractFilePaths(args.Files) + setting_path = args.setting + to_format = args.format + to_fix = args.fix + to_diagnose = args.diagnose + report = args.report + + if not setting_path: + setting_path = Path(getcwd(), ".printer-linter") + + if not setting_path.exists(): + print(f"Can't find the settings: {setting_path}") + return + + with open(setting_path, "r") as f: + settings = yaml.load(f, yaml.FullLoader) + + full_body_check = {"Diagnostics": []} + + if to_fix or to_diagnose: + for file in files: + diagnostics = diagnoseIssuesWithFile(file, settings) + full_body_check["Diagnostics"].extend([d.toDict() for d in diagnostics]) + + results = yaml.dump(full_body_check, default_flow_style=False, indent=4, width=240) + + if report: + report.write_text(results) + else: + print(results) + + if to_fix: + for file in files: + if f"{file.as_posix()}" in full_body_check: + applyFixesToFile(file, settings, full_body_check) + + if to_format: + for file in files: + applyFormattingToFile(file, settings) + + +def diagnoseIssuesWithFile(file: Path, settings: dict) -> List[Diagnostic]: + """ For file, runs all diagnostic checks in settings and returns a list of diagnostics """ + linter = factory.getLinter(file, settings) + + if not linter: + return [] + + return list(filter(lambda d: d is not None, linter.check())) + + +def applyFixesToFile(file, settings, full_body_check) -> None: + if not file.exists(): + return + ext = ".".join(file.name.split(".")[-2:]) + + if ext == "def.json": + issues = full_body_check[f"{file.as_posix()}"] + for issue in issues: + if issue["diagnostic"] == "diagnostic-definition-redundant-override" and settings["fixes"].get( + "diagnostic-definition-redundant-override", True): + pass + + +def applyFormattingToFile(file: Path, settings) -> None: + if not file.exists(): + return + + ext = ".".join(file.name.split(".")[-2:]) + + if ext == "def.json": + formatter = DefJsonFormatter(settings) + formatter.formatFile(file) + + if ext == "inst.cfg": + formatter = InstCfgFormatter(settings) + formatter.formatFile(file) + + +def extractFilePaths(paths: List[Path]) -> List[Path]: + """ Takes list of files and directories, returns the files as well as all files within directories as a List """ + file_paths = [] + for path in paths: + if path.is_dir(): + file_paths.extend(path.rglob("**/*")) + else: + file_paths.append(path) + + return file_paths + + +if __name__ == "__main__": + main() diff --git a/requirements-dev.txt b/requirements-dev.txt index 819943e8b7..b1e52571ca 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ pytest pyinstaller pyinstaller-hooks-contrib +pyyaml sip==6.5.1 jinja2 diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 6e28222597..cdcd88f709 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -10,7 +10,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -27,7 +27,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -61,7 +61,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -78,7 +78,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -95,7 +95,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -112,7 +112,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -129,7 +129,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -146,7 +146,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -163,7 +163,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -180,7 +180,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -197,7 +197,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -214,7 +214,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -248,7 +248,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -265,7 +265,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -282,7 +282,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -316,7 +316,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -333,7 +333,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -350,7 +350,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -367,7 +367,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -384,7 +384,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -401,7 +401,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -418,7 +418,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -435,7 +435,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -452,7 +452,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -469,7 +469,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -486,7 +486,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -503,7 +503,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -520,7 +520,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -537,7 +537,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -554,7 +554,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -571,7 +571,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -588,7 +588,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -605,7 +605,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -622,7 +622,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -639,7 +639,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -656,7 +656,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -673,7 +673,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -690,7 +690,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -707,7 +707,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -724,7 +724,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -741,7 +741,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -758,7 +758,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -775,7 +775,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -792,7 +792,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -809,7 +809,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -826,7 +826,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -843,7 +843,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -860,7 +860,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -877,7 +877,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -894,7 +894,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -911,7 +911,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -928,7 +928,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -945,7 +945,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -962,7 +962,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -979,7 +979,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -997,7 +997,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -1031,7 +1031,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -1048,7 +1048,7 @@ "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" } @@ -1609,7 +1609,7 @@ "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1628,7 +1628,7 @@ "website": "https://ultimaker.com/products/materials/breakaway", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1647,7 +1647,7 @@ "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1666,7 +1666,7 @@ "website": "https://ultimaker.com/products/materials/cpe", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1685,7 +1685,7 @@ "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1704,7 +1704,7 @@ "website": "https://ultimaker.com/products/materials/pc", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1723,7 +1723,7 @@ "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1742,7 +1742,7 @@ "website": "https://ultimaker.com/products/materials/pp", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1761,7 +1761,7 @@ "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1780,7 +1780,7 @@ "website": "https://ultimaker.com/products/materials/tpu-95a", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", @@ -1799,7 +1799,7 @@ "website": "https://ultimaker.com/products/materials/tough-pla", "author": { "author_id": "UltimakerPackages", - "display_name": "Ultimaker B.V.", + "display_name": "UltiMaker", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", "description": "Professional 3D printing made accessible.", diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index 54fa459946..21919af4e1 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -29,7 +29,7 @@ "machine_center_is_zero": { "default_value": false }, "gantry_height": { "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21 ; metric values \nG90 ; absolute positioning \nM82 ; set extruder to absolute mode \nM107 ; start with the fan off \nM140 S{material_bed_temperature_layer_0} ; Start heating the bed \nG4 S60 ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0} ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500 ; BEEP heating done \nG28 X0 Y10 Z0 ; move X/Y to min endstops \nM420 S1 ; Enable leveling \nM420 Z2.0 ; Set leveling fading height to 2 mm \nG0 Z0.15 ; lift nozzle a bit \nG92 E0 ; zero the extruded length \nG1 X50 E20 F500 ; Extrude 20mm of filament in a 5cm line. \nG92 E0 ; zero the extruded length again \nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line" }, + "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21 ; metric values \nG90 ; absolute positioning \nM82 ; set extruder to absolute mode \nM900 K0 ; disable lin. adv. if not set in GCODE\nM107 ; start with the fan off \nM140 S{material_bed_temperature_layer_0} ; Start heating the bed \nG4 S60 ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0} ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500 ; BEEP heating done \nG28 X0 Y10 Z0 ; move X/Y to min endstops \nM420 S1 ; Enable leveling \nM420 Z2.0 ; Set leveling fading height to 2 mm \nG0 Z0.15 ; lift nozzle a bit \nG92 E0 ; zero the extruded length \nG1 X50 E20 F500 ; Extrude 20mm of filament in a 5cm line. \nG92 E0 ; zero the extruded length again \nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line" }, "machine_end_gcode": { "default_value": "M104 S0 ; Extruder off \nM140 S0 ; Heatbed off \nM107 ; Fan off \nG91 ; relative positioning \nG1 E-5 F300 ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0 ; homing \nG1 Y180 F2000 ; reset feedrate \nM84 ; disable stepper motors \nG90 ; absolute positioning \nM300 S440 P200 ; Make Print Completed Tones \nM300 S660 P250 ; beep \nM300 S880 P300 ; beep" }, "machine_max_acceleration_x": { "value": 3000 }, diff --git a/resources/definitions/dxu_umo.def.json b/resources/definitions/dxu_umo.def.json new file mode 100644 index 0000000000..715b1ada90 --- /dev/null +++ b/resources/definitions/dxu_umo.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "UMO+ DXU", + "inherits": "dxu", + "overrides": { + "machine_disallowed_areas": { + "default_value": [ + [[100, -102.5], [ 110, -102.5], [ 110, -62.5], [100, -62.5]] + ] + }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 205 }, + "machine_height": { "default_value": 200 }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.95 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 0.8 + }, + "machine_start_gcode" : { + "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here: https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200 ;change Y20 to Y0 ansonl\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y0 F7200\\nG92 E-12.0 ; increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nG1 Y50 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\"" + }, + "machine_end_gcode" : { + "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\"" + } + } +} diff --git a/resources/definitions/dxu_umo_dual.def.json b/resources/definitions/dxu_umo_dual.def.json new file mode 100644 index 0000000000..1744bf1d52 --- /dev/null +++ b/resources/definitions/dxu_umo_dual.def.json @@ -0,0 +1,33 @@ +{ + "version": 2, + "name": "UMO+ DXU Dual", + "inherits": "dxu_dual", + "overrides": { + "machine_disallowed_areas": { + "default_value": [ + [[100, -102.5], [ 110, -102.5], [ 110, -62.5], [100, -62.5]] + ] + }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 205 }, + "machine_height": { "default_value": 200 }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.95 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 0.8 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_start_gcode" : { + "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here: https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n; --- Multi-Extruder Settings\\n; speed_z_hop_0 = {speed_z_hop, 0}\\n; speed_z_hop_1 = {speed_z_hop, 1}\\n; retraction_amount_0 = {retraction_amount, 0}\\n; retraction_amount_1 = {retraction_amount, 1}\\n; retraction_hop_0 = {retraction_hop, 0}\\n; retraction_hop_1 = {retraction_hop, 1}\\n; retraction_hop_enabled_0 = {retraction_hop_enabled, 0}\\n; retraction_hop_enabled_1 = {retraction_hop_enabled, 1}\\n; retraction_prime_speed_0 = {retraction_prime_speed, 0}\\n; retraction_prime_speed_1 = {retraction_prime_speed, 1}\\n; retraction_retract_speed_0 = {retraction_retract_speed, 0}\\n; retraction_retract_speed_1 = {retraction_retract_speed, 1}\\n; retraction_speed_0 = {retraction_speed, 0}\\n; retraction_speed_1 = {retraction_speed, 1}\\n; retraction_enable_0 = {retraction_enable, 0}\\n; retraction_enable_1 = {retraction_enable, 1}\\n; speed_travel_0 = {speed_travel, 0}\\n; speed_travel_1 = {speed_travel, 1}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0 ;prime distance ;increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0\\nG1 E0 F200 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\nG1 Y100 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\"" + }, + "machine_end_gcode" : { + "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\"" + } + } +} diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a1daeaaccc..54e0d60b02 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4682,6 +4682,54 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "support_interface_wall_count": + { + "label": "Support Interface Wall Line Count", + "description": "The number of walls with which to surround support interface. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used.", + "default_value": 0, + "minimum_value": "0", + "minimum_value_warning": "0", + "maximum_value_warning": "0 if (support_skip_some_zags and support_interface_pattern == 'zigzag') else 3", + "maximum_value": "999999", + "type": "int", + "value": "1 if (support_interface_pattern == 'zigzag') else 0", + "enabled": "support_interface_enable or support_meshes_present", + "limit_to_extruder": "support_interface_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true, + "children": { + "support_roof_wall_count": { + "label": "Support Roof Wall Line Count", + "description": "The number of walls with which to surround support interface roof. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used.", + "default_value": 0, + "minimum_value": "0", + "minimum_value_warning": "0", + "maximum_value_warning": "0 if (support_skip_some_zags and support_interface_pattern == 'zigzag') else 3", + "maximum_value": "999999", + "type": "int", + "value": "support_interface_wall_count", + "enabled": "support_interface_enable or support_meshes_present", + "limit_to_extruder": "support_interface_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + }, + "support_bottom_wall_count": { + "label": "Support Bottom Wall Line Count", + "description": "The number of walls with which to surround support interface floor. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used.", + "default_value": 0, + "minimum_value": "0", + "minimum_value_warning": "0", + "maximum_value_warning": "0 if (support_skip_some_zags and support_interface_pattern == 'zigzag') else 3", + "maximum_value": "999999", + "type": "int", + "value": "support_interface_wall_count", + "enabled": "support_interface_enable or support_meshes_present", + "limit_to_extruder": "support_interface_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + } + } + }, "zig_zaggify_support": { "label": "Connect Support Lines", @@ -6346,6 +6394,81 @@ "settable_per_mesh": false, "settable_per_extruder": false }, + "interlocking_enable": + { + "label": "Generate Interlocking Structure", + "description": "Whether to generate a structure at the interface between two models of a different material in order to improve the adhesion. The structure consists of cells of horizontal beams with alternating direction which connect to each other over the Z direction in order to interlock with the beams of the other material.", + "type": "bool", + "enabled": "extruders_enabled_count > 1", + "default_value": false, + "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_width": + { + "label": "Interlocking Beam Width", + "description": "The width of the beams of this material in the interlocking structure.", + "type": "float", + "unit": "mm", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 0.8, + "value": "2 * wall_line_width_0", + "minimum_value": "0.001", + "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", + "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", + "settable_per_mesh": true, + "settable_per_extruder": true + }, + "interlocking_orientation": + { + "label": "Interlocking Structure Orientation", + "description": "The direction of the beams of the interlocking structure in the XY plane as a rotation about the Z axis.", + "unit": "°", + "type": "float", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 22.5, + "resolve": "min(extruderValues('interlocking_orientation'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_layer_count": + { + "label": "Interlocking Beam Layer Count", + "description": "The height of the beams of the interlocking structure as measured in number of layers. Less layers is stronger, but more prone to manufacturing defects.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "resolve": "max(extruderValues('interlocking_beam_layer_count'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_depth": + { + "label": "Interlocking Depth", + "description": "The number of cells along the depth of the interface between two models where an interlocking structure is to be generated. Less cells is better, but too little cells can cause the not to be connected properly, which reduces the adhesion performance of the interlocking structure.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "resolve": "max(extruderValues('interlocking_depth'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_boundary_avoidance": + { + "label": "Interlocking Boundary Avoidance", + "description": "The distance close to the boundary of the print where not to generate an interlocking structure as measued in number of cells times 2. If set to a value lower than the Inerlocking Depth then the interlocking structure can become visible on the outside of the print near the interfaces where two models meet.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 3, + "minimum_value": "0", + "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", + "minimum_value_warning": "resolveOrValue('interlocking_depth')", + "settable_per_mesh": false, + "settable_per_extruder": false + }, "switch_extruder_retraction_amount": { "label": "Nozzle Switch Retraction Distance", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index d2787afe23..e7660f7c85 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -70,7 +70,7 @@ }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, - "minimum_support_area": { "value": "(2 + support_offset)**2" }, + "minimum_support_area": { "value": "4.0" }, "raft_base_speed": { "value": "raft_speed" }, "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" }, "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" }, @@ -86,6 +86,7 @@ "enabled": false }, "retraction_combing": { "value": "'no_outer_surfaces'" }, + "retraction_combing_max_distance": { "value": 15 }, "retraction_count_max": { "value": 25 }, "retraction_extrusion_window": { "value": 1 }, "roofing_layer_count": { "value": "1" }, @@ -93,7 +94,7 @@ "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" }, "skin_material_flow": { "value": "0.95 * material_flow" }, - "skin_material_flow_layer_0": { "value": "0.80 * material_flow_layer_0" }, + "skin_material_flow_layer_0": { "value": "0.85 * material_flow_layer_0" }, "skin_monotonic" : { "value": "roofing_layer_count == 0" }, "speed_equalize_flow_width_factor": { "value": "110.0" }, "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" }, diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index 4ab386a20a..fc1cf71481 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -1,5 +1,5 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. # Ultimaker , 2022. # @@ -424,8 +424,8 @@ msgstr "Nepodařilo se mi spustit nový proces přihlášení. Zkontrolujte, zda #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Nelze se dostat na server účtu Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Nelze se dostat na server účtu UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -701,8 +701,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Poslat záznam o pádu do Ultimakeru" +msgid "Send crash report to UltiMaker" +msgstr "Poslat záznam o pádu do UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -902,7 +902,7 @@ msgstr "Chyba sítě" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "Z vašeho Ultimaker účtu byla detekována nová tiskárna" msgstr[1] "Z vašeho Ultimaker účtu byly detekovány nové tiskárny" @@ -1056,8 +1056,8 @@ msgstr "Odstranit tiskárnu" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "Pokoušíte se připojit k tiskárně, na které není spuštěna aplikace Ultimaker Connect. Aktualizujte tiskárnu na nejnovější firmware." +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." +msgstr "Pokoušíte se připojit k tiskárně, na které není spuštěna aplikace UltiMaker Connect. Aktualizujte tiskárnu na nejnovější firmware." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1289,8 +1289,8 @@ msgstr "Nemohu zapsat do UFP souboru:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Balíček ve formátu Ultimaker" +msgid "UltiMaker Format Package" +msgstr "Balíček ve formátu UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1411,8 +1411,8 @@ msgstr "Chcete synchronizovat materiálové a softwarové balíčky s vaším ú #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Zjištěny změny z vašeho účtu Ultimaker" +msgid "Changes detected from your UltiMaker account" +msgstr "Zjištěny změny z vašeho účtu UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1572,8 +1572,8 @@ msgstr "Nahlásit chybu" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Nahlásit chybu v Ultimaker Cura issue trackeru." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Nahlásit chybu v UltiMaker Cura issue trackeru." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1702,8 +1702,8 @@ msgstr "Soubor projektu {0} je poškozený: {1}!" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." -msgstr "Soubor projektu {0} je vytvořený profily, které jsou této verzi Ultimaker Cura neznámé." +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." +msgstr "Soubor projektu {0} je vytvořený profily, které jsou této verzi UltiMaker Cura neznámé." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2348,8 +2348,8 @@ msgstr "Aktualizujte firmware tiskárny a spravujte frontu vzdáleně." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Vstup z webové kamery nemůže být pro cloudové tiskárny zobrazen v Ultimaker Cura. Klikněte na \"Spravovat tiskárnu\", abyste navštívili Ultimaker Digital Factory a zobrazili tuto webkameru." +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgstr "Vstup z webové kamery nemůže být pro cloudové tiskárny zobrazen v UltiMaker Cura. Klikněte na \"Spravovat tiskárnu\", abyste navštívili Ultimaker Digital Factory a zobrazili tuto webkameru." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2714,8 +2714,8 @@ msgstr "Další informace o anonymním shromažďování údajů" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu. Níže uvádíme příklad všech sdílených dat:" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgstr "UltiMaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu. Níže uvádíme příklad všech sdílených dat:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2739,8 +2739,8 @@ msgstr "Uložit projekt Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Vyberte prosím všechny upgrady provedené v tomto originálu Ultimaker" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Vyberte prosím všechny upgrady provedené v tomto originálu UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2835,8 +2835,8 @@ msgstr "Nainstalovat moduly" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." -msgstr "Urychlete váš postup práce a přizpůsobte si zážitek s Ultimaker Cura pomocí modulů, kterými přispěla naše úžasná komunita uživatelů." +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." +msgstr "Urychlete váš postup práce a přizpůsobte si zážitek s UltiMaker Cura pomocí modulů, kterými přispěla naše úžasná komunita uživatelů." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -2894,8 +2894,8 @@ msgstr "Instalovat materiály" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." -msgstr "Vyberte a nainstalujte materiálové profily optimalizované pro vaše 3D tiskárny Ultimaker." +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." +msgstr "Vyberte a nainstalujte materiálové profily optimalizované pro vaše 3D tiskárny UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3016,18 +3016,18 @@ msgstr "Načíst více" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Modul ověřený společností Ultimaker" +msgid "UltiMaker Verified Plug-in" +msgstr "Modul ověřený společností UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Materiál certifikovaný společností Ultimaker" +msgid "UltiMaker Certified Material" +msgstr "Materiál certifikovaný společností UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Balíček ověřený společností Ultimaker" +msgid "UltiMaker Verified Package" +msgstr "Balíček ověřený společností UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3036,8 +3036,8 @@ msgstr "Spravovat balíčky" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." -msgstr "Zde můžete spravovat své Ultimaker Cura moduly a materiály. Udržujte své moduly aktuální a pravidelně zálohujte své nastavení." +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgstr "Zde můžete spravovat své UltiMaker Cura moduly a materiály. Udržujte své moduly aktuální a pravidelně zálohujte své nastavení." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4308,8 +4308,8 @@ msgstr "Soukromí" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "Měla by být anonymní data o vašem tisku zaslána společnosti Ultimaker? Upozorňujeme, že nejsou odesílány ani ukládány žádné modely, adresy IP ani jiné osobní údaje." +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "Měla by být anonymní data o vašem tisku zaslána společnosti UltiMaker? Upozorňujeme, že nejsou odesílány ani ukládány žádné modely, adresy IP ani jiné osobní údaje." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4623,8 +4623,8 @@ msgstr "Podpora při problémech" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Přihlásit se do platformy Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Přihlásit se do platformy UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4638,8 +4638,8 @@ msgstr "Zálohovat a synchronizovat nastavení materiálů a moduly" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Sdílejte nápady a získejte pomoc od více než 48 0000 uživatelů v Ultimaker komunitě" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Sdílejte nápady a získejte pomoc od více než 48 0000 uživatelů v UltiMaker komunitě" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4648,18 +4648,18 @@ msgstr "Přeskočit" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Vytvořit účet Ultimaker zdarma" +msgid "Create a free UltiMaker Account" +msgstr "Vytvořit účet UltiMaker zdarma" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Pomožte nám zlepšovat Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Pomožte nám zlepšovat UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" -msgstr "Ultimaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu, včetně:" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" +msgstr "UltiMaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu, včetně:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4683,8 +4683,8 @@ msgstr "Nastavení tisku" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Data shromážděná společností Ultimaker Cura nebudou obsahovat žádné osobní údaje." +msgid "Data collected by UltiMaker Cura will not contain any personal information." +msgstr "Data shromážděná společností UltiMaker Cura nebudou obsahovat žádné osobní údaje." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4754,8 +4754,8 @@ msgstr "Nelze se připojit k zařízení." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Nemůžete se připojit k Vaší tiskárně Ultimaker?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Nemůžete se připojit k Vaší tiskárně UltiMaker?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4774,13 +4774,13 @@ msgstr "Připojit" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Vítejte v Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Vítejte v UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." -msgstr "Při nastavování postupujte podle těchto pokynů Ultimaker Cura. Bude to trvat jen několik okamžiků." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." +msgstr "Při nastavování postupujte podle těchto pokynů UltiMaker Cura. Bude to trvat jen několik okamžiků." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5465,7 +5465,7 @@ msgstr "Komplexní řešení pro 3D tisk z taveného filamentu." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" "Cura vyvíjí Ultimaker B.V. ve spolupráci s komunitou.\n" @@ -5674,23 +5674,23 @@ msgstr "Sledujte tiskové úlohy a znovu tiskněte z historie." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Rozšiřte Ultimaker Cura pomocí modulů a materiálových profilů." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Rozšiřte UltiMaker Cura pomocí modulů a materiálových profilů." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Staňte se expertem na 3D tisk díky Ultimaker e-learningu." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Staňte se expertem na 3D tisk díky UltiMaker e-learningu." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimaker podpora" +msgid "UltiMaker support" +msgstr "UltiMaker podpora" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Zjistěte, jak začít s Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Zjistěte, jak začít s UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5699,8 +5699,8 @@ msgstr "Položit otázku" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Poraďte se s Ultimaker komunitou." +msgid "Consult the UltiMaker Community." +msgstr "Poraďte se s UltiMaker komunitou." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5714,8 +5714,8 @@ msgstr "Dejte vývojářům vědět, že je něco špatně." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Navštivte web Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Navštivte web UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6011,8 +6011,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Vytvořit účet Ultimaker zdarma" +msgid "Create a free UltiMaker account" +msgstr "Vytvořit účet UltiMaker zdarma" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6026,8 +6026,8 @@ msgstr "Poslední aktualizace: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker Account" +msgid "UltiMaker Account" +msgstr "UltiMaker Account" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6241,13 +6241,13 @@ msgstr "Post Processing" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Spravuje síťová připojení k síťovým tiskárnám Ultimaker." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Spravuje síťová připojení k síťovým tiskárnám UltiMaker." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Síťové připojení Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Síťové připojení UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6281,8 +6281,8 @@ msgstr "Informace o slicování" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Poskytuje podporu pro psaní balíčků formátu Ultimaker." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Poskytuje podporu pro psaní balíčků formátu UltiMaker." #: /UFPWriter/plugin.json msgctxt "name" @@ -6297,7 +6297,7 @@ msgstr "Připojuje k Digitální knihovně. Umožňuje Cuře otevírat a ukláda #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Digitální knihovna Ultimaker" +msgstr "Digitální knihovna UltiMaker" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6331,13 +6331,13 @@ msgstr "Čtečka trimesh" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." -msgstr "Poskytuje akce strojů pro stroje Ultimaker (jako je průvodce vyrovnáváním postele, výběr upgradů atd.)." +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgstr "Poskytuje akce strojů pro stroje UltiMaker (jako je průvodce vyrovnáváním postele, výběr upgradů atd.)." #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Akce zařízení Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Akce zařízení UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6351,8 +6351,8 @@ msgstr "Čtečka kompresovaného G kódu" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." -msgstr "Spravuje rozšíření aplikace a umožňuje prohlížení rozšíření z webu Ultimaker." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." +msgstr "Spravuje rozšíření aplikace a umožňuje prohlížení rozšíření z webu UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6701,8 +6701,8 @@ msgstr "Zapisovač G kódu" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Poskytuje podporu pro čtení balíčků formátu Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Poskytuje podporu pro čtení balíčků formátu UltiMaker." #: /UFPReader/plugin.json msgctxt "name" @@ -7018,8 +7018,8 @@ msgstr "Fáze přípravy" #~ msgstr "Email" #~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" -#~ msgstr "Přihlaste se, abyste získali ověřené pluginy a materiály pro Ultimaker Cura Enterprise" +#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +#~ msgstr "Přihlaste se, abyste získali ověřené pluginy a materiály pro UltiMaker Cura Enterprise" #~ msgctxt "@label" #~ msgid "Version" @@ -7176,16 +7176,16 @@ msgstr "Fáze přípravy" #~ msgstr "Poskytuje zobrazení simulace." #~ msgctxt "@info:status" -#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "Odesílejte a sledujte tiskové úlohy odkudkoli pomocí účtu Ultimaker." +#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "Odesílejte a sledujte tiskové úlohy odkudkoli pomocí účtu UltiMaker." #~ msgctxt "@info:status Ultimaker Cloud should not be translated." #~ msgid "Connect to Ultimaker Digital Factory" #~ msgstr "Připojit se k Ultimaker Digital Factory" #~ msgctxt "@info" -#~ msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." -#~ msgstr "Vstup z webových kamer pro cloudové tiskárny nemůže být v Ultimaker Cura zobrazen." +#~ msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." +#~ msgstr "Vstup z webových kamer pro cloudové tiskárny nemůže být v UltiMaker Cura zobrazen." #~ msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" #~ msgid "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, it is recommended to update the firmware on your printer to version {latest_version}." @@ -7255,8 +7255,8 @@ msgstr "Fáze přípravy" #~ msgstr "Dokončit" #~ msgctxt "@label" -#~ msgid "Ultimaker Account" -#~ msgstr "Účet Ultimaker" +#~ msgid "UltiMaker Account" +#~ msgstr "Účet UltiMaker" #~ msgctxt "@text" #~ msgid "Your key to connected 3D printing" @@ -7271,8 +7271,8 @@ msgstr "Fáze přípravy" #~ msgstr "- Zůstaňte flexibilní díky synchronizaci nastavení a přístupu k ní kdekoli" #~ msgctxt "@text" -#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -#~ msgstr "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách Ultimaker" +#~ msgid "- Increase efficiency with a remote workflow on UltiMaker printers" +#~ msgstr "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách UltiMaker" #~ msgctxt "@text" #~ msgid "" @@ -7283,8 +7283,8 @@ msgstr "Fáze přípravy" #~ "Ultimaker Cura. Bude to trvat jen několik okamžiků." #~ msgctxt "@label" -#~ msgid "What's new in Ultimaker Cura" -#~ msgstr "Co je nového v Ultimaker Cura" +#~ msgid "What's new in UltiMaker Cura" +#~ msgstr "Co je nového v UltiMaker Cura" #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" @@ -7316,11 +7316,11 @@ msgstr "Fáze přípravy" #~ msgctxt "info:status" #~ msgid "
    {}
To establish a connection, please visit the Ultimaker Digital Factory." -#~ msgstr "
    {}
Chcete-li navázat spojení, navštivte Ultimaker Digital Factory." +#~ msgstr "
    {}
Chcete-li navázat spojení, navštivte Ultimaker Digital Factory." #~ msgctxt "@label ({} is printer name)" #~ msgid "{} will be removed until the next account sync.
To remove {} permanently, visit Ultimaker Digital Factory.

Are you sure you want to remove {} temporarily?" -#~ msgstr "{} bude odebrána až do další synchronizace účtu.
Chcete-li {} trvale odebrat, navštivte Ultimaker Digital Factory.

Opravdu chcete dočasně odebrat {}?" +#~ msgstr "{} bude odebrána až do další synchronizace účtu.
Chcete-li {} trvale odebrat, navštivte Ultimaker Digital Factory.

Opravdu chcete dočasně odebrat {}?" #~ msgctxt "@label" #~ msgid "" @@ -7396,8 +7396,8 @@ msgstr "Fáze přípravy" #~ msgstr "Připojeno přes Cloud" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Připojit k Ultimaker Cloudu" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Připojit k UltiMaker Cloudu" #~ msgctxt "@label" #~ msgid "You need to login first before you can rate" @@ -7424,16 +7424,16 @@ msgstr "Fáze přípravy" #~ msgstr "Autor" #~ msgctxt "@description" -#~ msgid "Get plugins and materials verified by Ultimaker" -#~ msgstr "Získejte pluginy a materiály ověřené společností Ultimaker" +#~ msgid "Get plugins and materials verified by UltiMaker" +#~ msgstr "Získejte pluginy a materiály ověřené společností UltiMaker" #~ msgctxt "@label The argument is a username." #~ msgid "Hi %1" #~ msgstr "Zdravím, %1" #~ msgctxt "@button" -#~ msgid "Ultimaker account" -#~ msgstr "Ultimaker účet" +#~ msgid "UltiMaker account" +#~ msgstr "UltiMaker účet" #~ msgctxt "@button" #~ msgid "Sign out" @@ -7512,20 +7512,20 @@ msgstr "Fáze přípravy" #~ msgstr "Jazyk:" #~ msgctxt "@label" -#~ msgid "Ultimaker Cloud" -#~ msgstr "Ultimaker Cloud" +#~ msgid "UltiMaker Cloud" +#~ msgstr "UltiMaker Cloud" #~ msgctxt "@text" #~ msgid "The next generation 3D printing workflow" #~ msgstr "Pracovní postup 3D tisku nové generace" #~ msgctxt "@text" -#~ msgid "- Send print jobs to Ultimaker printers outside your local network" -#~ msgstr "- Odeslat tiskové úlohy do tiskáren Ultimaker mimo vaši místní síť" +#~ msgid "- Send print jobs to UltiMaker printers outside your local network" +#~ msgstr "- Odeslat tiskové úlohy do tiskáren UltiMaker mimo vaši místní síť" #~ msgctxt "@text" -#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere" -#~ msgstr "- Uložte svá nastavení Ultimaker Cura do cloudu pro použití kdekoli" +#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere" +#~ msgstr "- Uložte svá nastavení UltiMaker Cura do cloudu pro použití kdekoli" #~ msgctxt "@text" #~ msgid "- Get exclusive access to print profiles from leading brands" diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 1f7068c22a..61764ad5ac 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -442,7 +442,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." +msgid "Unable to reach the UltiMaker account server." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 @@ -718,7 +718,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

Oops, UltiMaker Cura has encountered something that doesn't seem right." "

\n" "

We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -732,7 +732,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" +msgid "Send crash report to UltiMaker" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 @@ -932,8 +932,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" msgstr[0] "" msgstr[1] "" @@ -1087,7 +1087,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." msgstr "" @@ -1317,7 +1317,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" +msgid "UltiMaker Format Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 @@ -1441,7 +1441,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" +msgid "Changes detected from your UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 @@ -1604,7 +1604,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." +msgid "Report a bug on UltiMaker Cura's issue tracker." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 @@ -1750,7 +1750,7 @@ msgstr "" msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." +"unknown to this version of UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 @@ -2418,7 +2418,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." msgstr "" @@ -2799,7 +2799,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" msgstr "" @@ -2825,7 +2825,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 @@ -2928,7 +2928,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." msgstr "" @@ -2991,7 +2991,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." msgstr "" @@ -3114,17 +3114,17 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" +msgid "UltiMaker Verified Plug-in" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" +msgid "UltiMaker Certified Material" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" +msgid "UltiMaker Verified Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 @@ -3135,7 +3135,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." msgstr "" @@ -4455,7 +4455,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." msgstr "" @@ -4775,7 +4775,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" +msgid "Sign in to the UltiMaker platform" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 @@ -4790,7 +4790,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 @@ -4800,18 +4800,18 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" +msgid "Create a free UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" -"Ultimaker Cura collects anonymous data to improve print quality and user " +"UltiMaker Cura collects anonymous data to improve print quality and user " "experience, including:" msgstr "" @@ -4838,7 +4838,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" msgid "" -"Data collected by Ultimaker Cura will not contain any personal information." +"Data collected by UltiMaker Cura will not contain any personal information." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 @@ -4909,7 +4909,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" +msgid "Can't connect to your UltiMaker printer?" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 @@ -4931,13 +4931,13 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" -"Please follow these steps to set up Ultimaker Cura. This will only take a " +"Please follow these steps to set up UltiMaker Cura. This will only take a " "few moments." msgstr "" @@ -5033,7 +5033,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:216 msgctxt "" -"@action:inmenu Marketplace is a brand name of Ultimaker's, so don't " +"@action:inmenu Marketplace is a brand name of UltiMaker's, so don't " "translate." msgid "Add more materials from Marketplace" msgstr "" @@ -5635,7 +5635,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" @@ -5842,22 +5842,22 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." +msgid "Extend UltiMaker Cura with plugins and material profiles." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." +msgid "Become a 3D printing expert with UltiMaker e-learning." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" +msgid "UltiMaker support" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 @@ -5867,7 +5867,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." +msgid "Consult the UltiMaker Community." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 @@ -5882,7 +5882,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." +msgid "Visit the UltiMaker website." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 @@ -6191,12 +6191,12 @@ msgctxt "@text" msgid "" "- Add material profiles and plug-ins from the Marketplace\n" "- Back-up and sync your material profiles and plug-ins\n" -"- Share ideas and get help from 48,000+ users in the Ultimaker community" +"- Share ideas and get help from 48,000+ users in the UltiMaker community" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" +msgid "Create a free UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 @@ -6211,7 +6211,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" +msgid "UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 @@ -6254,7 +6254,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterSelector/MachineSelector.qml:51 msgctxt "@status" msgid "" -"This printer is not linked to your account. Please visit the Ultimaker " +"This printer is not linked to your account. Please visit the UltiMaker " "Digital Factory to establish a connection." msgstr "" @@ -6436,12 +6436,12 @@ msgstr "" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." +msgid "Manages network connections to UltiMaker networked printers." msgstr "" #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" +msgid "UltiMaker Network Connection" msgstr "" #: /3MFWriter/plugin.json @@ -6476,7 +6476,7 @@ msgstr "" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." +msgid "Provides support for writing UltiMaker Format Packages." msgstr "" #: /UFPWriter/plugin.json @@ -6529,13 +6529,13 @@ msgstr "" #: /UltimakerMachineActions/plugin.json msgctxt "description" msgid "" -"Provides machine actions for Ultimaker machines (such as bed leveling " +"Provides machine actions for UltiMaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." msgstr "" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" +msgid "UltiMaker machine actions" msgstr "" #: /GCodeGzReader/plugin.json @@ -6552,7 +6552,7 @@ msgstr "" msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " -"the Ultimaker website." +"the UltiMaker website." msgstr "" #: /Marketplace/plugin.json @@ -6905,7 +6905,7 @@ msgstr "" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." +msgid "Provides support for reading UltiMaker Format Packages." msgstr "" #: /UFPReader/plugin.json diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 53a5e1e55a..65346cc167 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "Es kann kein neuer Anmeldevorgang gestartet werden. Bitte überprüfen S #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Der Ultimaker-Konto-Server konnte nicht erreicht werden." +msgid "Unable to reach the UltiMaker account server." +msgstr "Der UltiMaker-Konto-Server konnte nicht erreicht werden." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -721,7 +721,7 @@ msgstr "Cura kann nicht starten" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

Oops, UltiMaker Cura has encountered something that doesn't seem right." "

\n" "

We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -731,15 +731,15 @@ msgid "" "

Please send us this Crash Report to fix the problem.\n" " " -msgstr "

Hoppla, bei Ultimaker Cura ist ein Problem aufgetreten.

\n

Beim Start ist ein nicht behebbarer Fehler aufgetreten. Er" +msgstr "

Hoppla, bei UltiMaker Cura ist ein Problem aufgetreten.

\n

Beim Start ist ein nicht behebbarer Fehler aufgetreten. Er" " wurde möglicherweise durch einige falsche Konfigurationsdateien verursacht. Wir empfehlen ein Backup und Reset Ihrer Konfiguration.

\n " "

Backups sind im Konfigurationsordner abgelegt.

\n

Senden Sie uns diesen Absturzbericht bitte, um das Problem zu beheben.

\n" " " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Absturzbericht an Ultimaker senden" +msgid "Send crash report to UltiMaker" +msgstr "Absturzbericht an UltiMaker senden" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -939,10 +939,10 @@ msgstr "Netzwerkfehler" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Ihr Ultimaker-Konto hat einen neuen Drucker erkannt" -msgstr[1] "Ihr Ultimaker-Konto hat neue Drucker erkannt" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "Ihr UltiMaker-Konto hat einen neuen Drucker erkannt" +msgstr[1] "Ihr UltiMaker-Konto hat neue Drucker erkannt" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -1096,9 +1096,9 @@ msgstr "Drucker entfernen" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "Sie versuchen, sich mit einem Drucker zu verbinden, auf dem Ultimaker Connect nicht läuft. Bitte aktualisieren Sie die Firmware des Druckers." +msgstr "Sie versuchen, sich mit einem Drucker zu verbinden, auf dem UltiMaker Connect nicht läuft. Bitte aktualisieren Sie die Firmware des Druckers." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1326,8 +1326,8 @@ msgstr "Kann nicht in UFP-Datei schreiben:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker Format Package" +msgid "UltiMaker Format Package" +msgstr "UltiMaker Format Package" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1451,8 +1451,8 @@ msgstr "Möchten Sie Material- und Softwarepakete mit Ihrem Konto synchronisiere #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Von Ihrem Ultimaker-Konto erkannte Änderungen" +msgid "Changes detected from your UltiMaker account" +msgstr "Von Ihrem UltiMaker-Konto erkannte Änderungen" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1614,8 +1614,8 @@ msgstr "Einen Fehler melden" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Einen Fehler im Issue Tracker von Ultimaker Cura melden." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Einen Fehler im Issue Tracker von UltiMaker Cura melden." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1763,8 +1763,8 @@ msgstr "Projektdatei {0} ist beschädigt: {1}!" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "Projektdatei {0} verwendet Profile, die nicht mit dieser Ultimaker Cura-Version kompatibel sind." +"unknown to this version of UltiMaker Cura." +msgstr "Projektdatei {0} verwendet Profile, die nicht mit dieser UltiMaker Cura-Version kompatibel sind." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2436,9 +2436,9 @@ msgstr "Damit Sie die Warteschlange aus der Ferne verwalten können, müssen Sie #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Webcam-Feeds für Cloud-Drucker können nicht in Ultimaker Cura angezeigt werden. Klicken Sie auf „Drucker verwalten“, um die Ultimaker Digital Factory zu" +msgstr "Webcam-Feeds für Cloud-Drucker können nicht in UltiMaker Cura angezeigt werden. Klicken Sie auf „Drucker verwalten“, um die Ultimaker Digital Factory zu" " besuchen und diese Webcam zu sehen." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2819,9 +2819,9 @@ msgstr "Weitere Informationen zur anonymen Datenerfassung" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura erfasst anonyme Daten, um die Druckqualität und Benutzererfahrung zu steigern. Nachfolgend ist ein Beispiel aller Daten, die geteilt werden:" +msgstr "UltiMaker Cura erfasst anonyme Daten, um die Druckqualität und Benutzererfahrung zu steigern. Nachfolgend ist ein Beispiel aller Daten, die geteilt werden:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2845,8 +2845,8 @@ msgstr "Cura-Projekt speichern" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Wählen Sie bitte alle Upgrades für dieses Ultimaker-Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Wählen Sie bitte alle Upgrades für dieses UltiMaker-Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2950,9 +2950,9 @@ msgstr "Plug-ins installieren" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Optimieren Sie Ihren Workflow und individualisieren Sie Ihr Erlebnis in Ultimaker Cura mit Plug-ins, die von der großartigen Community unserer Anwender" +msgstr "Optimieren Sie Ihren Workflow und individualisieren Sie Ihr Erlebnis in UltiMaker Cura mit Plug-ins, die von der großartigen Community unserer Anwender" " bereitgestellt werden." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 @@ -3014,9 +3014,9 @@ msgstr "Materialien installieren" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Wählen und installieren Sie Materialprofile, die für Ihre Ultimaker 3D-Drucker optimiert sind." +msgstr "Wählen und installieren Sie Materialprofile, die für Ihre UltiMaker 3D-Drucker optimiert sind." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3137,18 +3137,18 @@ msgstr "Weitere laden" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Durch Ultimaker verifiziertes Plug-in" +msgid "UltiMaker Verified Plug-in" +msgstr "Durch UltiMaker verifiziertes Plug-in" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Durch Ultimaker zertifiziertes Material" +msgid "UltiMaker Certified Material" +msgstr "Durch UltiMaker zertifiziertes Material" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Durch Ultimaker verifiziertes Paket" +msgid "UltiMaker Verified Package" +msgstr "Durch UltiMaker verifiziertes Paket" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3158,9 +3158,9 @@ msgstr "Pakete verwalten" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Verwalten Sie hier Ihre Ultimaker Cura Plug-ins und Ihre Materialprofile. Halten Sie Ihre Plug-ins auf dem neuesten Stand und sichern Sie Ihr Setup regelmäßig." +msgstr "Verwalten Sie hier Ihre UltiMaker Cura Plug-ins und Ihre Materialprofile. Halten Sie Ihre Plug-ins auf dem neuesten Stand und sichern Sie Ihr Setup regelmäßig." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4484,10 +4484,10 @@ msgstr "Privatsphäre" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "Sollen anonyme Daten über Ihren Druck an Ultimaker gesendet werden? Beachten Sie, dass keine Modelle, IP-Adressen oder andere personenbezogene Daten gesendet" +msgstr "Sollen anonyme Daten über Ihren Druck an UltiMaker gesendet werden? Beachten Sie, dass keine Modelle, IP-Adressen oder andere personenbezogene Daten gesendet" " oder gespeichert werden." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 @@ -4806,8 +4806,8 @@ msgstr "Störungen beheben" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Bei der Ultimaker-Plattform anmelden" +msgid "Sign in to the UltiMaker platform" +msgstr "Bei der UltiMaker-Plattform anmelden" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4821,8 +4821,8 @@ msgstr "Materialeinstellungen und Plug-ins sichern und synchronisieren" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Ideenaustausch mit und Hilfe von mehr als 48.000 Benutzern in der Ultimaker Community" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Ideenaustausch mit und Hilfe von mehr als 48.000 Benutzern in der UltiMaker Community" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4831,20 +4831,20 @@ msgstr "Überspringen" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Kostenloses Ultimaker-Konto erstellen" +msgid "Create a free UltiMaker Account" +msgstr "Kostenloses UltiMaker-Konto erstellen" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Helfen Sie uns, Ultimaker Cura zu verbessern" +msgid "Help us to improve UltiMaker Cura" +msgstr "Helfen Sie uns, UltiMaker Cura zu verbessern" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" -"Ultimaker Cura collects anonymous data to improve print quality and user " +"UltiMaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura erfasst anonyme Daten, um die Druckqualität und Benutzererfahrung zu steigern. Dazu gehören:" +msgstr "UltiMaker Cura erfasst anonyme Daten, um die Druckqualität und Benutzererfahrung zu steigern. Dazu gehören:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4869,8 +4869,8 @@ msgstr "Druckeinstellungen" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" msgid "" -"Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Die von Ultimaker Cura erfassten Daten enthalten keine personenbezogenen Daten." +"Data collected by UltiMaker Cura will not contain any personal information." +msgstr "Die von UltiMaker Cura erfassten Daten enthalten keine personenbezogenen Daten." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4940,8 +4940,8 @@ msgstr "Verbindung mit Drucker nicht möglich." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Sie können keine Verbindung zu Ihrem Ultimaker-Drucker herstellen?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Sie können keine Verbindung zu Ihrem UltiMaker-Drucker herstellen?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4962,15 +4962,15 @@ msgstr "Verbinden" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Willkommen bei Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Willkommen bei UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" -"Please follow these steps to set up Ultimaker Cura. This will only take a " +"Please follow these steps to set up UltiMaker Cura. This will only take a " "few moments." -msgstr "Befolgen Sie bitte diese Schritte für das Einrichten von\nUltimaker Cura. Dies dauert nur wenige Sekunden." +msgstr "Befolgen Sie bitte diese Schritte für das Einrichten von\nUltiMaker Cura. Dies dauert nur wenige Sekunden." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5064,7 +5064,7 @@ msgstr "Materialien werden verwaltet..." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:216 msgctxt "" -"@action:inmenu Marketplace is a brand name of Ultimaker's, so don't " +"@action:inmenu Marketplace is a brand name of UltiMaker's, so don't " "translate." msgid "Add more materials from Marketplace" msgstr "Weiteres Material aus Marketplace hinzufügen" @@ -5668,9 +5668,9 @@ msgstr "Komplettlösung für den 3D-Druck mit geschmolzenem Filament." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura wurde von Ultimaker B.V. in Zusammenarbeit mit der Community entwickelt.\nCura verwendet mit Stolz die folgenden Open Source-Projekte:" +msgstr "Cura wurde von UltiMaker B.V. in Zusammenarbeit mit der Community entwickelt.\nCura verwendet mit Stolz die folgenden Open Source-Projekte:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5875,23 +5875,23 @@ msgstr "Überwachen Sie Druckaufträge und drucken Sie sie aus Ihrem Druckprotok #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Erweitern Sie Ultimaker Cura durch Plugins und Materialprofile." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Erweitern Sie UltiMaker Cura durch Plugins und Materialprofile." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Werden Sie ein 3D-Druck-Experte mittels des E-Learning von Ultimaker." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Werden Sie ein 3D-Druck-Experte mittels des E-Learning von UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimaker Kundendienst" +msgid "UltiMaker support" +msgstr "UltiMaker Kundendienst" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Erfahren Sie, wie Sie mit Ultimaker Cura Ihre Arbeit beginnen können." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Erfahren Sie, wie Sie mit UltiMaker Cura Ihre Arbeit beginnen können." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5900,8 +5900,8 @@ msgstr "Eine Frage stellen" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Wenden Sie sich an die Ultimaker Community." +msgid "Consult the UltiMaker Community." +msgstr "Wenden Sie sich an die UltiMaker Community." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5915,8 +5915,8 @@ msgstr "Lassen Sie es die Entwickler wissen, falls etwas schief läuft." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Besuchen Sie die Ultimaker-Website." +msgid "Visit the UltiMaker website." +msgstr "Besuchen Sie die UltiMaker-Website." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6229,14 +6229,14 @@ msgctxt "@text" msgid "" "- Add material profiles and plug-ins from the Marketplace\n" "- Back-up and sync your material profiles and plug-ins\n" -"- Share ideas and get help from 48,000+ users in the Ultimaker community" +"- Share ideas and get help from 48,000+ users in the UltiMaker community" msgstr "- Materialprofile und Plug-ins aus dem Marketplace hinzufügen\n- Materialprofile und Plug-ins sichern und synchronisieren\n- Ideenaustausch mit und Hilfe" -" von mehr als 48.000 Benutzern in der Ultimaker Community" +" von mehr als 48.000 Benutzern in der UltiMaker Community" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Kostenloses Ultimaker-Konto erstellen" +msgid "Create a free UltiMaker account" +msgstr "Kostenloses UltiMaker-Konto erstellen" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6250,8 +6250,8 @@ msgstr "Letztes Update: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker‑Konto" +msgid "UltiMaker Account" +msgstr "UltiMaker‑Konto" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6293,7 +6293,7 @@ msgstr "Der Cloud-Drucker ist offline. Bitte prüfen Sie, ob der Drucker eingesc #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterSelector/MachineSelector.qml:51 msgctxt "@status" msgid "" -"This printer is not linked to your account. Please visit the Ultimaker " +"This printer is not linked to your account. Please visit the UltiMaker " "Digital Factory to establish a connection." msgstr "Der Drucker ist nicht mit Ihrem Konto verbunden. Bitte besuchen Sie die Ultimaker Digital Factory, um eine Verbindung herzustellen." @@ -6475,13 +6475,13 @@ msgstr "Nachbearbeitung" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Verwaltet Netzwerkverbindungen zu Ultimaker-Netzwerkdruckern." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Verwaltet Netzwerkverbindungen zu UltiMaker-Netzwerkdruckern." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker-Netzwerkverbindung" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker-Netzwerkverbindung" #: /3MFWriter/plugin.json msgctxt "description" @@ -6515,8 +6515,8 @@ msgstr "Slice-Informationen" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Bietet Unterstützung für das Schreiben von Ultimaker Format Packages." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Bietet Unterstützung für das Schreiben von UltiMaker Format Packages." #: /UFPWriter/plugin.json msgctxt "name" @@ -6533,7 +6533,7 @@ msgstr "Stellt eine Verbindung zur Digitalen Bibliothek her und ermöglicht es C #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Digitale Bibliothek von Ultimaker" +msgstr "Digitale Bibliothek von UltiMaker" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6568,14 +6568,14 @@ msgstr "Trimesh Reader" #: /UltimakerMachineActions/plugin.json msgctxt "description" msgid "" -"Provides machine actions for Ultimaker machines (such as bed leveling " +"Provides machine actions for UltiMaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Ermöglicht Maschinenabläufe für Ultimaker-Maschinen (z. B. Assistent für Bettnivellierung, Auswahl von Upgrades usw.)" +msgstr "Ermöglicht Maschinenabläufe für UltiMaker-Maschinen (z. B. Assistent für Bettnivellierung, Auswahl von Upgrades usw.)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker-Maschinenabläufe" +msgid "UltiMaker machine actions" +msgstr "UltiMaker-Maschinenabläufe" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6591,8 +6591,8 @@ msgstr "Reader für komprimierten G-Code" msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " -"the Ultimaker website." -msgstr "Verwaltet die Erweiterungen der Anwendung und ermöglicht das Durchsuchen von Erweiterungen auf der Ultimaker-Website." +"the UltiMaker website." +msgstr "Verwaltet die Erweiterungen der Anwendung und ermöglicht das Durchsuchen von Erweiterungen auf der UltiMaker-Website." #: /Marketplace/plugin.json msgctxt "name" @@ -6944,8 +6944,8 @@ msgstr "G-Code-Writer" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Bietet Unterstützung für das Lesen von Ultimaker Format Packages." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Bietet Unterstützung für das Lesen von UltiMaker Format Packages." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 943158ee41..beb7deed23 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "No se puede iniciar un nuevo proceso de inicio de sesión. Compruebe si #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "No se puede acceder al servidor de cuentas de Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "No se puede acceder al servidor de cuentas de UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -722,7 +722,7 @@ msgstr "Cura no puede iniciarse" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

Oops, UltiMaker Cura has encountered something that doesn't seem right." "

\n" "

We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -732,15 +732,15 @@ msgid "" "

Please send us this Crash Report to fix the problem.\n" " " -msgstr "

¡Vaya! Ultimaker Cura ha encontrado un error.

\n

Hemos detectado un error irreversible durante el inicio, posiblemente" +msgstr "

¡Vaya! UltiMaker Cura ha encontrado un error.

\n

Hemos detectado un error irreversible durante el inicio, posiblemente" " como consecuencia de varios archivos de configuración erróneos. Le recomendamos que realice una copia de seguridad y que restablezca los ajustes.

\n" "

Las copias de seguridad se encuentran en la carpeta de configuración.

\n

Envíenos el informe de errores" " para que podamos solucionar el problema.

\n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Enviar informe de errores a Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Enviar informe de errores a UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -940,10 +940,10 @@ msgstr "Error de red" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Se ha detectado una nueva impresora en su cuenta de Ultimaker" -msgstr[1] "Se han detectado nuevas impresoras en su cuenta de Ultimaker" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "Se ha detectado una nueva impresora en su cuenta de UltiMaker" +msgstr[1] "Se han detectado nuevas impresoras en su cuenta de UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -1096,9 +1096,9 @@ msgstr "Eliminar impresoras" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "Está intentando conectarse a una impresora que no está ejecutando Ultimaker Connect. Actualice la impresora al firmware más reciente." +msgstr "Está intentando conectarse a una impresora que no está ejecutando UltiMaker Connect. Actualice la impresora al firmware más reciente." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1326,8 +1326,8 @@ msgstr "No se puede escribir en el archivo UFP:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Paquete de formato Ultimaker" +msgid "UltiMaker Format Package" +msgstr "Paquete de formato UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1451,8 +1451,8 @@ msgstr "¿Desea sincronizar el material y los paquetes de software con su cuenta #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Se han detectado cambios desde su cuenta de Ultimaker" +msgid "Changes detected from your UltiMaker account" +msgstr "Se han detectado cambios desde su cuenta de UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1614,8 +1614,8 @@ msgstr "Informar del error" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Informar de un error en el rastreador de problemas de Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Informar de un error en el rastreador de problemas de UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1763,8 +1763,8 @@ msgstr "El archivo de proyecto {0} está dañado: msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "El archivo de proyecto {0} se ha creado con perfiles desconocidos para esta versión de Ultimaker Cura." +"unknown to this version of UltiMaker Cura." +msgstr "El archivo de proyecto {0} se ha creado con perfiles desconocidos para esta versión de UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2437,9 +2437,9 @@ msgstr "Actualice el firmware de la impresora para gestionar la cola de forma re #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Las transmisiones de la cámara web para impresoras en la nube no se pueden ver en Ultimaker Cura. Haga clic en \"Administrar impresora\" para ir a Ultimaker" +msgstr "Las transmisiones de la cámara web para impresoras en la nube no se pueden ver en UltiMaker Cura. Haga clic en \"Administrar impresora\" para ir a UltiMaker" " Digital Factory y ver esta cámara web." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2820,9 +2820,9 @@ msgstr "Más información sobre la recopilación de datos anónimos" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario. A continuación, hay un ejemplo de todos los datos" +msgstr "UltiMaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario. A continuación, hay un ejemplo de todos los datos" " que se comparten:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 @@ -2847,8 +2847,8 @@ msgstr "Guardar el proyecto de Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Seleccione cualquier actualización de Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Seleccione cualquier actualización de UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2952,9 +2952,9 @@ msgstr "Instalar complementos" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Optimice su flujo de trabajo y personalice su experiencia de Ultimaker Cura con complementos proporcionados por nuestra increíble comunidad de usuarios." +msgstr "Optimice su flujo de trabajo y personalice su experiencia de UltiMaker Cura con complementos proporcionados por nuestra increíble comunidad de usuarios." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3015,9 +3015,9 @@ msgstr "Instalar materiales" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Seleccione e instale perfiles de material optimizados para sus impresoras 3D Ultimaker." +msgstr "Seleccione e instale perfiles de material optimizados para sus impresoras 3D UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3138,18 +3138,18 @@ msgstr "Cargar más" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Complemento verificado por Ultimaker" +msgid "UltiMaker Verified Plug-in" +msgstr "Complemento verificado por UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Material certificado por Ultimaker" +msgid "UltiMaker Certified Material" +msgstr "Material certificado por UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Paquete verificado por Ultimaker" +msgid "UltiMaker Verified Package" +msgstr "Paquete verificado por UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3159,9 +3159,9 @@ msgstr "Gestionar paquetes" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Gestionar los complementos y los perfiles de materiales de Ultimaker Cura aquí. Asegúrese de mantener los complementos actualizados y hacer una copia de" +msgstr "Gestionar los complementos y los perfiles de materiales de UltiMaker Cura aquí. Asegúrese de mantener los complementos actualizados y hacer una copia de" " seguridad de su configuración regularmente." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4485,10 +4485,10 @@ msgstr "Privacidad" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "¿Deben enviarse datos anónimos sobre la impresión a Ultimaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información" +msgstr "¿Deben enviarse datos anónimos sobre la impresión a UltiMaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información" " de identificación personal." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 @@ -4807,8 +4807,8 @@ msgstr "Solución de problemas" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Inicie sesión en la plataforma Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Inicie sesión en la plataforma UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4822,8 +4822,8 @@ msgstr "Realice copias de seguridad y sincronice los ajustes y complementos de s #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Comparta ideas y obtenga ayuda de más de 48 000 usuarios de la comunidad Ultimaker" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Comparta ideas y obtenga ayuda de más de 48 000 usuarios de la comunidad UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4832,20 +4832,20 @@ msgstr "Omitir" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Cree una cuenta gratuita de Ultimaker" +msgid "Create a free UltiMaker Account" +msgstr "Cree una cuenta gratuita de UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Ayúdenos a mejorar Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Ayúdenos a mejorar UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" "Ultimaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario, entre otros:" +msgstr "UltiMaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario, entre otros:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4871,7 +4871,7 @@ msgstr "Ajustes de impresión" msgctxt "@text" msgid "" "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Los datos recopilados por Ultimaker Cura no contendrán información personal." +msgstr "Los datos recopilados por UltiMaker Cura no contendrán información personal." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4941,8 +4941,8 @@ msgstr "No se ha podido conectar al dispositivo." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "¿No puede conectarse a la impresora Ultimaker?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "¿No puede conectarse a la impresora UltiMaker?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4963,15 +4963,15 @@ msgstr "Conectar" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Le damos la bienvenida a Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Le damos la bienvenida a UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" "Please follow these steps to set up Ultimaker Cura. This will only take a " "few moments." -msgstr "Siga estos pasos para configurar\nUltimaker Cura. Solo le llevará unos minutos." +msgstr "Siga estos pasos para configurar\nUltiMaker Cura. Solo le llevará unos minutos." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5669,9 +5669,9 @@ msgstr "Solución completa para la impresión 3D de filamento fundido." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Ultimaker B.V. ha desarrollado Cura en cooperación con la comunidad.\nCura se enorgullece de utilizar los siguientes proyectos de código abierto:" +msgstr "UltiMaker B.V. ha desarrollado Cura en cooperación con la comunidad.\nCura se enorgullece de utilizar los siguientes proyectos de código abierto:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5876,23 +5876,23 @@ msgstr "Supervise los trabajos de impresión y vuelva a imprimir desde su histor #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Amplíe Ultimaker Cura con complementos y perfiles de materiales." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Amplíe UltiMaker Cura con complementos y perfiles de materiales." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Conviértase en un experto en impresión 3D con el aprendizaje electrónico de Ultimaker." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Conviértase en un experto en impresión 3D con el aprendizaje electrónico de UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Soporte técnico de Ultimaker" +msgid "UltiMaker support" +msgstr "Soporte técnico de UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Aprenda cómo empezar a utilizar Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Aprenda cómo empezar a utilizar UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5901,8 +5901,8 @@ msgstr "Haga una pregunta" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Consulte en la Comunidad Ultimaker." +msgid "Consult the UltiMaker Community." +msgstr "Consulte en la Comunidad UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5916,8 +5916,8 @@ msgstr "Informe a los desarrolladores de que algo no funciona bien." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Visite el sitio web de Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Visite el sitio web de UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6236,8 +6236,8 @@ msgstr "- Añada perfiles de materiales y complementos del Marketplace \n- Reali #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Cree una cuenta gratuita de Ultimaker" +msgid "Create a free UltiMaker account" +msgstr "Cree una cuenta gratuita de UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6251,8 +6251,8 @@ msgstr "Última actualización: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Cuenta de Ultimaker" +msgid "UltiMaker Account" +msgstr "Cuenta de UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6476,13 +6476,13 @@ msgstr "Posprocesamiento" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Gestiona las conexiones de red de las impresoras Ultimaker conectadas." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Gestiona las conexiones de red de las impresoras UltiMaker conectadas." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Conexión en red de Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Conexión en red de UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6516,8 +6516,8 @@ msgstr "Info de la segmentación" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Permite la escritura de paquetes de formato Ultimaker." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Permite la escritura de paquetes de formato UltiMaker." #: /UFPWriter/plugin.json msgctxt "name" @@ -6571,13 +6571,13 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Proporciona las acciones de la máquina de las máquinas Ultimaker (como un asistente para la nivelación de la plataforma, la selección de actualizaciones," +msgstr "Proporciona las acciones de la máquina de las máquinas UltiMaker (como un asistente para la nivelación de la plataforma, la selección de actualizaciones," " etc.)." #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Acciones de la máquina Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Acciones de la máquina UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6594,7 +6594,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Gestiona las extensiones de la aplicación y permite navegar por las extensiones desde el sitio web de Ultimaker." +msgstr "Gestiona las extensiones de la aplicación y permite navegar por las extensiones desde el sitio web de UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6946,8 +6946,8 @@ msgstr "Escritor de GCode" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Proporciona soporte para la lectura de paquetes de formato Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Proporciona soporte para la lectura de paquetes de formato UltiMaker." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 87856edcfb..71c3d49df7 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -1,6 +1,7 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # msgid "" msgstr "" @@ -423,7 +424,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." +msgid "Unable to reach the UltiMaker account server." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 @@ -695,7 +696,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" +msgid "Send crash report to UltiMaker" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 @@ -893,7 +894,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "" msgstr[1] "" @@ -1041,7 +1042,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 @@ -1265,7 +1266,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" +msgid "UltiMaker Format Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 @@ -1387,7 +1388,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" +msgid "Changes detected from your UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 @@ -1548,7 +1549,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." +msgid "Report a bug on UltiMaker Cura's issue tracker." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 @@ -1674,7 +1675,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 @@ -2314,7 +2315,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2680,7 +2681,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 @@ -2705,8 +2706,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Valitse tähän Ultimaker Original -laitteeseen tehdyt päivitykset" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Valitse tähän UltiMaker Original -laitteeseen tehdyt päivitykset" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2801,7 +2802,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 @@ -2860,7 +2861,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 @@ -2982,17 +2983,17 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" +msgid "UltiMaker Verified Plug-in" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" +msgid "UltiMaker Certified Material" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" +msgid "UltiMaker Verified Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 @@ -3002,7 +3003,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4267,8 +4268,8 @@ msgstr "Tietosuoja" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää Ultimakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta." +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää UltiMakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4581,7 +4582,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" +msgid "Sign in to the UltiMaker platform" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 @@ -4596,7 +4597,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 @@ -4606,17 +4607,17 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" +msgid "Create a free UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 @@ -4641,7 +4642,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." +msgid "Data collected by UltiMaker Cura will not contain any personal information." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 @@ -4712,7 +4713,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" +msgid "Can't connect to your UltiMaker printer?" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 @@ -4732,12 +4733,12 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 @@ -5420,7 +5421,7 @@ msgstr "Kokonaisvaltainen sulatettavan tulostuslangan 3D-tulostusratkaisu." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" "Cura-ohjelman on kehittänyt Ultimaker B.V. yhteistyössä käyttäjäyhteisön kanssa.\n" @@ -5629,22 +5630,22 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." +msgid "Extend UltiMaker Cura with plugins and material profiles." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." +msgid "Become a 3D printing expert with UltiMaker e-learning." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" +msgid "UltiMaker support" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 @@ -5654,7 +5655,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." +msgid "Consult the UltiMaker Community." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 @@ -5669,7 +5670,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." +msgid "Visit the UltiMaker website." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 @@ -5963,7 +5964,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" +msgid "Create a free UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 @@ -5978,7 +5979,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" +msgid "UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 @@ -6193,12 +6194,12 @@ msgstr "Jälkikäsittely" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." +msgid "Manages network connections to UltiMaker networked printers." msgstr "" #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" +msgid "UltiMaker Network Connection" msgstr "" #: /3MFWriter/plugin.json @@ -6233,7 +6234,7 @@ msgstr "Viipalointitiedot" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." +msgid "Provides support for writing UltiMaker Format Packages." msgstr "" #: /UFPWriter/plugin.json @@ -6283,13 +6284,13 @@ msgstr "" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." msgstr "" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker-laitteen toiminnot" +msgid "UltiMaker machine actions" +msgstr "UltiMaker-laitteen toiminnot" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6303,7 +6304,7 @@ msgstr "" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." msgstr "" #: /Marketplace/plugin.json @@ -6653,7 +6654,7 @@ msgstr "" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." +msgid "Provides support for reading UltiMaker Format Packages." msgstr "" #: /UFPReader/plugin.json @@ -6928,8 +6929,8 @@ msgstr "" #~ msgstr "Päivitä nykyinen" #~ msgctxt "@label" -#~ msgid "Please select any upgrades made to this Ultimaker 2." -#~ msgstr "Valitse tähän Ultimaker 2 -laitteeseen tehdyt päivitykset." +#~ msgid "Please select any upgrades made to this UltiMaker 2." +#~ msgstr "Valitse tähän UltiMaker 2 -laitteeseen tehdyt päivitykset." #~ msgctxt "@label" #~ msgid "Olsson Block" @@ -7321,16 +7322,16 @@ msgstr "" #~ msgstr "Alustan tarttuvuus" #~ msgctxt "@label" -#~ msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" -#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen?
Lue Ultimakerin vianmääritysoppaat" +#~ msgid "Need help improving your prints?
Read the UltiMaker Troubleshooting Guides" +#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen?
Lue UltiMakerin vianmääritysoppaat" #~ msgctxt "@title:window" #~ msgid "Engine Log" #~ msgstr "Moottorin loki" #~ msgctxt "@tooltip" -#~ msgid "Click to check the material compatibility on Ultimaker.com." -#~ msgstr "Napsauta ja tarkista materiaalin yhteensopivuus sivustolla Ultimaker.com." +#~ msgid "Click to check the material compatibility on UltiMaker.com." +#~ msgstr "Napsauta ja tarkista materiaalin yhteensopivuus sivustolla UltiMaker.com." #~ msgctxt "description" #~ msgid "Shows changes since latest checked version." @@ -7389,16 +7390,16 @@ msgstr "" #~ msgstr "Avaa Doodle3D Connect -verkkoliittymä" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers." -#~ msgstr "Tätä tulostinta ei ole määritetty Ultimaker 3 -tulostinryhmän isännäksi." +#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers." +#~ msgstr "Tätä tulostinta ei ole määritetty UltiMaker 3 -tulostinryhmän isännäksi." #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers." -#~ msgstr "Tämä tulostin on {count} tulostimen Ultimaker 3 -ryhmän isäntä." +#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers." +#~ msgstr "Tämä tulostin on {count} tulostimen UltiMaker 3 -ryhmän isäntä." #~ msgctxt "@label: arg 1 is group name" -#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "%1 ei ole määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi" +#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "%1 ei ole määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi" #~ msgctxt "@action:button" #~ msgid "View print jobs" @@ -7508,12 +7509,12 @@ msgstr "" #~ msgstr "Lisäosien selain" #~ msgctxt "@label" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@action:menu" #~ msgid "Browse plugins..." @@ -7532,8 +7533,8 @@ msgstr "" #~ msgstr "Toiminnon avulla voidaan vaihtaa laitteen asetuksia (esim. tulostustilavuus, suuttimen koko yms.)" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "Ultimaker 3 -tulostimien verkkoyhteyksien hallinta" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "UltiMaker 3 -tulostimien verkkoyhteyksien hallinta" #~ msgctxt "name" #~ msgid "SolidWorks Integration" @@ -7556,8 +7557,8 @@ msgstr "" #~ msgstr "Lisäosien selain" #~ msgctxt "description" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "Ultimaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "UltiMaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)" #~ msgctxt "@item:inlistbox" #~ msgid "GCode File" @@ -7659,12 +7660,12 @@ msgstr "" #~ msgid "Resuming print..." #~ msgstr "Tulostusta jatketaan..." -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi." +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi." #~ msgctxt "Count is number of printers." -#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers." -#~ msgstr "Tämä tulostin on {count} tulostimen yhdistetyn Ultimaker 3 -ryhmän isäntä." +#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers." +#~ msgstr "Tämä tulostin on {count} tulostimen yhdistetyn UltiMaker 3 -ryhmän isäntä." #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate." #~ msgstr "{printer_name} on tulostanut työn '{job_name}'. Nouda työ ja vahvista alustan tyhjennys." @@ -7673,8 +7674,8 @@ msgstr "" #~ msgstr "{printer_name} on varattu työn {job_name} tulostamiseen. Muuta tulostimen määritys vastaamaan työtä, jotta tulostus alkaa." #~ msgctxt "@info:status" -#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "Uuden tulostustyön lähetys ei onnistu: tätä 3D-tulostinta ei ole (vielä) määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi." +#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "Uuden tulostustyön lähetys ei onnistu: tätä 3D-tulostinta ei ole (vielä) määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi." #~ msgctxt "@info:status" #~ msgid "Unable to send print job to group {cluster_name}." @@ -7963,12 +7964,12 @@ msgstr "" #~ msgstr "OK" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi" +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi" #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers" -#~ msgstr "Tämä tulostin on %1 tulostimen yhdistetyn Ultimaker 3 -ryhmän isäntä" +#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers" +#~ msgstr "Tämä tulostin on %1 tulostimen yhdistetyn UltiMaker 3 -ryhmän isäntä" #~ msgctxt "@label" #~ msgid "Completed on: " @@ -8284,8 +8285,8 @@ msgstr "" #~ msgstr "Tukee irrotettavan aseman kytkemistä lennossa ja sille kirjoittamista." #~ msgctxt "@info:whatsthis" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "Ultimaker 3 -tulostimien verkkoyhteyksien hallinta" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "UltiMaker 3 -tulostimien verkkoyhteyksien hallinta" #~ msgctxt "@label" #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}" @@ -8448,12 +8449,12 @@ msgstr "" #~ msgstr "Tukee 3MF-tiedostojen kirjoittamista." #~ msgctxt "@label" -#~ msgid "Ultimaker machine actions" -#~ msgstr "Ultimaker-laitteen toiminnot" +#~ msgid "UltiMaker machine actions" +#~ msgstr "UltiMaker-laitteen toiminnot" #~ msgctxt "@info:whatsthis" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "Ultimaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "UltiMaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)" #~ msgctxt "@label" #~ msgid "Cura Profile Reader" @@ -8492,8 +8493,8 @@ msgstr "" #~ msgstr "Jos tulostinta ei ole luettelossa, lue verkkotulostuksen vianetsintäopas" #~ msgctxt "@item:inlistbox" -#~ msgid "Ultimaker" -#~ msgstr "Ultimaker" +#~ msgid "UltiMaker" +#~ msgstr "UltiMaker" #~ msgctxt "@label" #~ msgid "Support library for scientific computing " @@ -8642,8 +8643,8 @@ msgstr "" #~ msgstr "Ota tukirakenteet käyttöön. Nämä rakenteet tukevat mallin osia, joissa on merkittäviä ulokkeita." #~ msgctxt "@label" -#~ msgid "Need help improving your prints? Read the Ultimaker Troubleshooting Guides" -#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen? Lue Ultimakerin vianetsintäoppaat" +#~ msgid "Need help improving your prints? Read the UltiMaker Troubleshooting Guides" +#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen? Lue UltiMakerin vianetsintäoppaat" #~ msgctxt "@info:status" #~ msgid "Connected over the network to {0}. Please approve the access request on the printer." diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index ef78e258a2..d730ef796a 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -150,13 +150,13 @@ msgctxt "@label Don't translate the XML tag !" msgid "" "The file {0} already exists. Are you sure you want to " "overwrite it?" -msgstr "Le fichier {0} existe déjà. Êtes-vous sûr de vouloir le remplacer ?" +msgstr "Le fichier {0} existe déjà. Êtes-vous sûr de vouloir le remplacer?" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/ContainerManager.py:459 #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" -msgstr "URL de fichier invalide :" +msgstr "URL de fichier invalide:" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" @@ -166,7 +166,7 @@ msgstr "Non pris en charge" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/cura_empty_instance_containers.py:55 msgctxt "@info:No intent profile selected" msgid "Default" -msgstr "Default" +msgstr "Défaut" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/MachineManager.py:745 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 @@ -178,7 +178,7 @@ msgstr "Buse" msgctxt "@info:message Followed by a list of settings." msgid "" "Settings have been changed to match the current availability of extruders:" -msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles :" +msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles:" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/MachineManager.py:890 msgctxt "@info:title" @@ -212,7 +212,7 @@ msgctxt "@info:status Don't translate the XML tag !" msgid "" "Failed to export profile to {0}: Writer plugin reported " "failure." -msgstr "Échec de l'exportation du profil vers {0} : le plug-in du générateur a rapporté une erreur." +msgstr "Échec de l'exportation du profil vers {0}: le plugin du générateur a rapporté une erreur." #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/CuraContainerRegistry.py:171 #, python-brace-format @@ -229,7 +229,7 @@ msgstr "L'exportation a réussi" #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" -msgstr "Impossible d'importer le profil depuis {0} : {1}" +msgstr "Impossible d'importer le profil depuis {0}: {1}" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/CuraContainerRegistry.py:209 #, python-brace-format @@ -248,7 +248,7 @@ msgstr "Aucun profil personnalisé à importer dans le fichier {0}!" msgid "Failed to import profile from {0}:" -msgstr "Échec de l'importation du profil depuis le fichier {0} :" +msgstr "Échec de l'importation du profil depuis le fichier {0}:" #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/CuraContainerRegistry.py:252 #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/CuraContainerRegistry.py:262 @@ -309,7 +309,7 @@ msgctxt "@info:status" msgid "" "Quality type '{0}' is not compatible with the current active machine " "definition '{1}'." -msgstr "Le type de qualité « {0} » n'est pas compatible avec la définition actuelle de la machine active « {1} »." +msgstr "Le type de qualité '{0}' n'est pas compatible avec la définition actuelle de la machine active '{1}'." #: /Users/c.lamboo/ultimaker/Cura/cura/Settings/CuraContainerRegistry.py:488 #, python-brace-format @@ -318,8 +318,9 @@ msgid "" "Warning: The profile is not visible because its quality type '{0}' is not " "available for the current configuration. Switch to a material/nozzle " "combination that can use this quality type." -msgstr "Avertissement : le profil n'est pas visible car son type de qualité « {0} » n'est pas disponible pour la configuration actuelle. Passez à une combinaison" -" matériau/buse qui peut utiliser ce type de qualité." +msgstr "" +"Avertissement: le profil n'est pas visible car son type de qualité '{0}' n'est pas disponible pour la configuration actuelle. Passez à une combinaison " +"matériau/buse qui peut utiliser ce type de qualité." #: /Users/c.lamboo/ultimaker/Cura/cura/MultiplyObjectsJob.py:30 msgctxt "@info:status" @@ -443,8 +444,8 @@ msgstr "Impossible de lancer une nouvelle procédure de connexion. Vérifiez si #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Impossible d’atteindre le serveur du compte Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Impossible d’atteindre le serveur du compte UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -477,7 +478,7 @@ msgstr "Pas écrasé" #: /Users/c.lamboo/ultimaker/Cura/cura/Machines/Models/IntentSelectionModel.py:61 msgctxt "@label" msgid "Default" -msgstr "Default" +msgstr "Défaut" #: /Users/c.lamboo/ultimaker/Cura/cura/Machines/Models/IntentTranslations.py:14 #: /Users/c.lamboo/ultimaker/Cura/cura/Machines/Models/IntentCategoryModel.py:45 @@ -580,7 +581,7 @@ msgstr "Imprimantes préréglées" #, python-brace-format msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" -msgstr "Voulez-vous vraiment supprimer l'objet {0} ? Cette action est irréversible !" +msgstr "Voulez-vous vraiment supprimer l'objet {0}? Cette action est irréversible!" #: /Users/c.lamboo/ultimaker/Cura/cura/Machines/Models/MaterialManagementModel.py:232 msgctxt "@label" @@ -688,7 +689,7 @@ msgstr "Volume d'impression" #: /Users/c.lamboo/ultimaker/Cura/cura/Backups/Backup.py:115 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" -msgstr "Impossible de créer une archive à partir du répertoire de données de l'utilisateur : {}" +msgstr "Impossible de créer une archive à partir du répertoire de données de l'utilisateur: {}" #: /Users/c.lamboo/ultimaker/Cura/cura/Backups/Backup.py:122 #: /Users/c.lamboo/ultimaker/Cura/cura/Backups/Backup.py:159 @@ -711,7 +712,7 @@ msgstr "A essayé de restaurer une sauvegarde Cura supérieure à la version act #: /Users/c.lamboo/ultimaker/Cura/cura/Backups/Backup.py:158 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "L'erreur suivante s'est produite lors de la restauration d'une sauvegarde Cura :" +msgstr "L'erreur suivante s'est produite lors de la restauration d'une sauvegarde Cura:" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:107 msgctxt "@title:window" @@ -721,7 +722,7 @@ msgstr "Échec du démarrage de Cura" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

Oops, UltiMaker Cura has encountered something that doesn't seem right." "

\n" "

We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -731,15 +732,15 @@ msgid "" "

Please send us this Crash Report to fix the problem.\n" " " -msgstr "

Oups, un problème est survenu dans Ultimaker Cura.

\n

Une erreur irrécupérable est survenue lors du démarrage. Elle" +msgstr "

Oups, un problème est survenu dans UltiMaker Cura.

\n

Une erreur irrécupérable est survenue lors du démarrage. Elle" " peut avoir été causée par des fichiers de configuration incorrects. Nous vous suggérons de sauvegarder et de réinitialiser votre configuration.

\n " "

Les sauvegardes se trouvent dans le dossier de configuration.

\n

Veuillez nous envoyer ce rapport d'incident pour que nous" " puissions résoudre le problème.

\n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Envoyer le rapport de d'incident à Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Envoyer le rapport de d'incident à UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -820,25 +821,25 @@ msgstr "OpenGL" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "Non ancora inizializzato" +msgstr "Pas encore initialisé" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:267 #, python-brace-format msgctxt "@label OpenGL version" msgid "
  • OpenGL Version: {version}
    • " -msgstr "
  • Version OpenGL : {version}
    • " +msgstr "
  • Version OpenGL: {version}
    • " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:268 #, python-brace-format msgctxt "@label OpenGL vendor" msgid "
  • OpenGL Vendor: {vendor}
    • " -msgstr "
  • Revendeur OpenGL : {vendor}
    • " +msgstr "
  • Revendeur OpenGL: {vendor}
    • " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:269 #, python-brace-format msgctxt "@label OpenGL renderer" msgid "
  • OpenGL Renderer: {renderer}
    • " -msgstr "
  • Moteur de rendu OpenGL : {renderer}
    • " +msgstr "
  • Moteur de rendu OpenGL: {renderer}
    • " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:304 msgctxt "@title:groupbox" @@ -915,7 +916,7 @@ msgstr "Modifier le G-Code" #: /Users/c.lamboo/ultimaker/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 msgctxt "@info:status" msgid "There are no file formats available to write with!" -msgstr "Aucun format de fichier n'est disponible pour écriture !" +msgstr "Aucun format de fichier n'est disponible pour écriture!" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadQueueFullMessage.py:16 msgctxt "@info:status" @@ -939,10 +940,10 @@ msgstr "Erreur de réseau" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Nouvelle imprimante détectée à partir de votre compte Ultimaker" -msgstr[1] "Nouvelles imprimantes détectées à partir de votre compte Ultimaker" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "Nouvelle imprimante détectée à partir de votre compte UltiMaker" +msgstr[1] "Nouvelles imprimantes détectées à partir de votre compte UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -961,7 +962,7 @@ msgstr[1] "... et {0} autres" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:57 msgctxt "info:status" msgid "Printers added from Digital Factory:" -msgstr "Imprimantes ajoutées à partir de Digital Factory :" +msgstr "Imprimantes ajoutées à partir de Digital Factory:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py:15 msgctxt "@info:status" @@ -986,7 +987,7 @@ msgstr "Votre imprimante {printer_name} pourrait être connectée via le #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:26 msgctxt "@info:title" msgid "Are you ready for cloud printing?" -msgstr "Êtes-vous prêt pour l'impression dans le cloud ?" +msgstr "Êtes-vous prêt pour l'impression dans le cloud?" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:30 msgctxt "@action" @@ -1060,8 +1061,8 @@ msgstr "Configurer le groupe" msgctxt "info:status" msgid "This printer is not linked to the Digital Factory:" msgid_plural "These printers are not linked to the Digital Factory:" -msgstr[0] "Cette imprimante n'est pas associée à Digital Factory :" -msgstr[1] "Ces imprimantes ne sont pas associées à Digital Factory :" +msgstr[0] "Cette imprimante n'est pas associée à Digital Factory:" +msgstr[1] "Ces imprimantes ne sont pas associées à Digital Factory:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py:22 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:422 @@ -1095,9 +1096,9 @@ msgstr "Supprimer des imprimantes" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "Vous tentez de vous connecter à une imprimante qui n'exécute pas Ultimaker Connect. Veuillez mettre à jour l'imprimante avec le dernier micrologiciel." +msgstr "Vous tentez de vous connecter à une imprimante qui n'exécute pas UltiMaker Connect. Veuillez mettre à jour l'imprimante avec le dernier micrologiciel." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1178,12 +1179,12 @@ msgstr "Pour supprimer {printer_name} définitivement, visitez le site {digital_ #, python-brace-format msgctxt "@message {printer_name} is replaced with the name of the printer" msgid "Are you sure you want to remove {printer_name} temporarily?" -msgstr "Voulez-vous vraiment supprimer {printer_name} temporairement ?" +msgstr "Voulez-vous vraiment supprimer {printer_name} temporairement?" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:474 msgctxt "@title:window" msgid "Remove printers?" -msgstr "Supprimer des imprimantes ?" +msgstr "Supprimer des imprimantes?" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:477 #, python-brace-format @@ -1196,8 +1197,8 @@ msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be " "undone.\n" "Are you sure you want to continue?" -msgstr[0] "Vous êtes sur le point de supprimer {0} imprimante de Cura. Cette action est irréversible.\nVoulez-vous vraiment continuer ?" -msgstr[1] "Vous êtes sur le point de supprimer {0} imprimantes de Cura. Cette action est irréversible.\nVoulez-vous vraiment continuer ?" +msgstr[0] "Vous êtes sur le point de supprimer {0} imprimante de Cura. Cette action est irréversible.\nVoulez-vous vraiment continuer?" +msgstr[1] "Vous êtes sur le point de supprimer {0} imprimantes de Cura. Cette action est irréversible.\nVoulez-vous vraiment continuer?" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:484 msgctxt "@label" @@ -1205,7 +1206,7 @@ msgid "" "You are about to remove all printers from Cura. This action cannot be " "undone.\n" "Are you sure you want to continue?" -msgstr "Vous êtes sur le point de supprimer toutes les imprimantes de Cura. Cette action est irréversible.\nVoulez-vous vraiment continuer ?" +msgstr "Vous êtes sur le point de supprimer toutes les imprimantes de Cura. Cette action est irréversible.\nVoulez-vous vraiment continuer?" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:276 msgctxt "@action:button" @@ -1221,7 +1222,7 @@ msgstr "Suivre l'impression dans Ultimaker Digital Factory" #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" -msgstr "Code d'erreur inconnu lors du téléchargement d'une tâche d'impression : {0}" +msgstr "Code d'erreur inconnu lors du téléchargement d'une tâche d'impression: {0}" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -1241,7 +1242,7 @@ msgstr "Erreur d'écriture du fichier 3MF." #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:31 msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." -msgstr "Le plug-in 3MF Writer est corrompu." +msgstr "Le plugin 3MF Writer est corrompu." #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:37 msgctxt "@error" @@ -1320,13 +1321,13 @@ msgstr "Impossible de lire le fichier de données d'exemple." #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/UFPWriter.py:178 msgctxt "@info:error" msgid "Can't write to UFP file:" -msgstr "Impossible d'écrire dans le fichier UFP :" +msgstr "Impossible d'écrire dans le fichier UFP:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker Format Package" +msgid "UltiMaker Format Package" +msgstr "UltiMaker Format Package" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1440,18 +1441,18 @@ msgstr "Accepter" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77 msgctxt "@title:window" msgid "Plugin License Agreement" -msgstr "Plug-in d'accord de licence" +msgstr "Plugin d'accord de licence" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144 msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" -msgstr "Vous souhaitez synchroniser du matériel et des logiciels avec votre compte ?" +msgstr "Vous souhaitez synchroniser du matériel et des logiciels avec votre compte?" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Changements détectés à partir de votre compte Ultimaker" +msgid "Changes detected from your UltiMaker account" +msgstr "Changements détectés à partir de votre compte UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1476,7 +1477,7 @@ msgstr "Échec de téléchargement des plugins {}" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/LocalPackageList.py:28 msgctxt "@label" msgid "Installed Plugins" -msgstr "Plug-ins installés" +msgstr "Plugins installés" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/LocalPackageList.py:29 msgctxt "@label" @@ -1486,7 +1487,7 @@ msgstr "Matériaux installés" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/LocalPackageList.py:33 msgctxt "@label" msgid "Bundled Plugins" -msgstr "Plug-ins groupés" +msgstr "Plugins groupés" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/LocalPackageList.py:34 msgctxt "@label" @@ -1613,8 +1614,8 @@ msgstr "Notifier un bug" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Notifiez un bug sur l'outil de suivi des problèmes d'Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Notifiez un bug sur l'outil de suivi des problèmes d'UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1639,7 +1640,7 @@ msgctxt "@info:status" msgid "" "Unable to slice with the current settings. The following settings have " "errors: {0}" -msgstr "Impossible de couper avec les paramètres actuels. Les paramètres suivants contiennent des erreurs : {0}" +msgstr "Impossible de couper avec les paramètres actuels. Les paramètres suivants contiennent des erreurs: {0}" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 #, python-brace-format @@ -1647,7 +1648,7 @@ msgctxt "@info:status" msgid "" "Unable to slice due to some per-model settings. The following settings have " "errors on one or more models: {error_labels}" -msgstr "Impossible de couper en raison de certains paramètres par modèle. Les paramètres suivants contiennent des erreurs sur un ou plusieurs modèles : {error_labels}" +msgstr "Impossible de couper en raison de certains paramètres par modèle. Les paramètres suivants contiennent des erreurs sur un ou plusieurs modèles: {error_labels}" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 msgctxt "@info:status" @@ -1670,8 +1671,11 @@ msgid "" "- Fit within the build volume\n" "- Are assigned to an enabled extruder\n" "- Are not all set as modifier meshes" -msgstr "Veuillez vérifier les paramètres et si vos modèles :\n- S'intègrent dans le volume de fabrication\n- Sont affectés à un extrudeur activé\n- N sont pas" -" tous définis comme des mailles de modificateur" +msgstr "" +"Veuillez vérifier les paramètres et si vos modèles:\n" +"- S'intègrent dans le volume de fabrication\n" +"- Sont affectés à un extrudeur activé\n" +"- N sont pas tous définis comme des mailles de modificateur" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 @@ -1706,18 +1710,19 @@ msgid "" "The material used in this project relies on some material definitions not " "available in Cura, this might produce undesirable print results. We highly " "recommend installing the full material package from the Marketplace." -msgstr "Il materiale utilizzato in questo progetto si basa su alcune definizioni di materiale non disponibili in Cura; ciò potrebbe produrre risultati di stampa" -" indesiderati. Si consiglia vivamente di installare il pacchetto completo di materiali dal Marketplace." +msgstr "" +"Le matériau utilisé dans ce projet repose sur certaines définitions de matériaux non disponibles dans Cura, ce qui peut produire des résultats d’impression indésirables. Nous vous " +"recommandons vivement d’installer l’ensemble complet des matériaux depuis le Marketplace." #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "Profili del materiale non installati" +msgstr "Profils des matériaux non installés" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "Installa materiali" +msgstr "Installer les matériaux" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:545 #, python-brace-format @@ -1740,7 +1745,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "" "Project file {0} is suddenly inaccessible: {1}" "." -msgstr "Le fichier de projet {0} est soudainement inaccessible : {1}." +msgstr "Le fichier de projet {0} est soudainement inaccessible: {1}." #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 @@ -1755,15 +1760,15 @@ msgstr "Impossible d'ouvrir le fichier de projet" msgctxt "@info:error Don't translate the XML tags or !" msgid "" "Project file {0} is corrupt: {1}." -msgstr "Le fichier de projet {0} est corrompu : {1}." +msgstr "Le fichier de projet {0} est corrompu: {1}." #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "Le fichier de projet {0} a été réalisé en utilisant des profils inconnus de cette version d'Ultimaker Cura." +"unknown to this version of UltiMaker Cura." +msgstr "Le fichier de projet {0} a été réalisé en utilisant des profils inconnus de cette version d'UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -1791,9 +1796,11 @@ msgid "" "p>\n" "

    View print quality " "guide

    " -msgstr "

    Un ou plusieurs modèles 3D peuvent ne pas s'imprimer de manière optimale en raison de la taille du modèle et de la configuration matérielle :

    \n

    {model_names}

    \n

    Découvrez" -" comment optimiser la qualité et la fiabilité de l'impression.

    \n

    Consultez le guide de qualité" -" d'impression

    " +msgstr "" +"

    Un ou plusieurs modèles 3D peuvent ne pas s'imprimer de manière optimale en raison de la taille du modèle et de la configuration matérielle:

    \n" +"

    {model_names}

    \n" +"

    Découvrez comment optimiser la qualité et la fiabilité de l'impression.

    \n" +"

    Consultez le guide de qualité d'impression

    " #: /Users/c.lamboo/ultimaker/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 msgctxt "@item:inmenu" @@ -1819,7 +1826,7 @@ msgstr "Connecté via USB" msgctxt "@label" msgid "" "A USB print is in progress, closing Cura will stop this print. Are you sure?" -msgstr "Une impression USB est en cours, la fermeture de Cura arrêtera cette impression. Êtes-vous sûr ?" +msgstr "Une impression USB est en cours, la fermeture de Cura arrêtera cette impression. Êtes-vous sûr?" #: /Users/c.lamboo/ultimaker/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:135 msgctxt "@message" @@ -1926,8 +1933,9 @@ msgid "" "New features or bug-fixes may be available for your {machine_name}! If you " "haven't done so already, it is recommended to update the firmware on your " "printer to version {latest_version}." -msgstr "De nouvelles fonctionnalités ou des correctifs de bugs sont disponibles pour votre {machine_name} ! Si vous ne l'avez pas encore fait, il est recommandé" -" de mettre à jour le micrologiciel de votre imprimante avec la version {latest_version}." +msgstr "" +"De nouvelles fonctionnalités ou des correctifs de bugs sont disponibles pour votre {machine_name} ! Si vous ne l'avez pas encore fait, il est recommandé de mettre à jour le micrologiciel de " +"votre imprimante avec la version {latest_version}." #: /Users/c.lamboo/ultimaker/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:22 #, python-format @@ -2178,9 +2186,9 @@ msgid "" "to block more light coming through. For height maps lighter pixels signify " "higher terrain, so lighter pixels should correspond to thicker locations in " "the generated 3D model." -msgstr "Pour les lithophanies, les pixels foncés doivent correspondre à des emplacements plus épais afin d'empêcher la lumière de passer. Pour des cartes de hauteur," -" les pixels clairs signifient un terrain plus élevé, de sorte que les pixels clairs doivent correspondre à des emplacements plus épais dans le modèle 3D" -" généré." +msgstr "" +"Pour les lithophanies, les pixels foncés doivent correspondre à des emplacements plus épais afin d'empêcher la lumière de passer. Pour des cartes de hauteur, les pixels clairs signifient un " +"terrain plus élevé, de sorte que les pixels clairs doivent correspondre à des emplacements plus épais dans le modèle 3D généré." #: /Users/c.lamboo/ultimaker/Cura/plugins/ImageReader/ConfigUI.qml:205 msgctxt "@action:label" @@ -2202,8 +2210,8 @@ msgctxt "@info:tooltip" msgid "" "For lithophanes a simple logarithmic model for translucency is available. " "For height maps the pixel values correspond to heights linearly." -msgstr "Pour les lithophanes, un modèle logarithmique simple de la translucidité est disponible. Pour les cartes de hauteur, les valeurs des pixels correspondent" -" aux hauteurs de façon linéaire." +msgstr "" +"Pour les lithophanes, un modèle logarithmique simple de la translucidité est disponible. Pour les cartes de hauteur, les valeurs des pixels correspondent aux hauteurs de façon linéaire." #: /Users/c.lamboo/ultimaker/Cura/plugins/ImageReader/ConfigUI.qml:242 msgctxt "@action:label" @@ -2216,8 +2224,9 @@ msgid "" "The percentage of light penetrating a print with a thickness of 1 " "millimeter. Lowering this value increases the contrast in dark regions and " "decreases the contrast in light regions of the image." -msgstr "Le pourcentage de lumière pénétrant une impression avec une épaisseur de 1 millimètre. La diminution de cette valeur augmente le contraste dans les régions" -" sombres et diminue le contraste dans les régions claires de l'image." +msgstr "" +"Le pourcentage de lumière pénétrant une impression avec une épaisseur de 1 millimètre. La diminution de cette valeur augmente le contraste dans les régions sombres et diminue le contraste " +"dans les régions claires de l'image." #: /Users/c.lamboo/ultimaker/Cura/plugins/ImageReader/ConfigUI.qml:274 msgctxt "@action:label" @@ -2240,7 +2249,7 @@ msgstr "OK" #: /Users/c.lamboo/ultimaker/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:17 msgctxt "@title:window" msgid "Post Processing Plugin" -msgstr "Plug-in de post-traitement" +msgstr "Plugin de post-traitement" #: /Users/c.lamboo/ultimaker/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 msgctxt "@label" @@ -2437,10 +2446,10 @@ msgstr "Veuillez mettre à jour le Firmware de votre imprimante pour gérer la f #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Les flux de webcam des imprimantes cloud ne peuvent pas être visualisés depuis Ultimaker Cura. Cliquez sur « Gérer l'imprimante » pour visiter Ultimaker" -" Digital Factory et voir cette webcam." +msgstr "" +"Les flux de webcam des imprimantes cloud ne peuvent pas être visualisés depuis UltiMaker Cura. Cliquez sur « Gérer l'imprimante » pour visiter Ultimaker Digital Factory et voir cette webcam." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2507,7 +2516,7 @@ msgstr "Premier disponible" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml:117 msgctxt "@info" msgid "Monitor your printers from everywhere using Ultimaker Digital Factory" -msgstr "Surveillez vos imprimantes à distance grâce à Ultimaker Digital Factory" +msgstr "Surveillez vos imprimantes à distance avec Ultimaker Digital Factory" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml:129 msgctxt "@button" @@ -2527,9 +2536,9 @@ msgid "" "your printer to your WIFI network. If you don't connect Cura with your " "printer, you can still use a USB drive to transfer g-code files to your " "printer." -msgstr "Pour imprimer directement sur votre imprimante via le réseau, assurez-vous que votre imprimante est connectée au réseau via un câble Ethernet ou en connectant" -" votre imprimante à votre réseau Wi-Fi. Si vous ne connectez pas Cura avec votre imprimante, vous pouvez utiliser une clé USB pour transférer les fichiers" -" g-code sur votre imprimante." +msgstr "" +"Pour imprimer directement sur votre imprimante via le réseau, assurez-vous que votre imprimante est connectée au réseau via un câble Ethernet ou en connectant votre imprimante à votre réseau " +"Wi-Fi. Si vous ne connectez pas Cura avec votre imprimante, vous pouvez utiliser une clé USB pour transférer les fichiers g-code sur votre imprimante." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:51 msgctxt "@label" @@ -2732,7 +2741,7 @@ msgstr "Profils" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml:53 msgctxt "@backuplist:label" msgid "Plugins" -msgstr "Plug-ins" +msgstr "Plugins" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2821,10 +2830,10 @@ msgstr "Plus d'informations sur la collecte de données anonymes" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura recueille des données anonymes afin d'améliorer la qualité d'impression et l'expérience utilisateur. Voici un exemple de toutes les données" -" partagées :" +msgstr "" +"UltiMaker Cura recueille des données anonymes afin d'améliorer la qualité d'impression et l'expérience utilisateur. Voici un exemple de toutes les données partagées :" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2839,17 +2848,17 @@ msgstr "Autoriser l'envoi de données anonymes" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "Salva progetto Cura e stampa file" +msgstr "Sauvegarder le projet Cura et imprimer le fichier" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "Salva progetto Cura" +msgstr "Sauvegarder le projet Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Sélectionnez les mises à niveau disponibles pour cet Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Sélectionnez les mises à niveau disponibles pour cet UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2867,8 +2876,9 @@ msgid "" "To make sure your prints will come out great, you can now adjust your " "buildplate. When you click 'Move to Next Position' the nozzle will move to " "the different positions that can be adjusted." -msgstr "Pour obtenir des résultats d'impression optimaux, vous pouvez maintenant régler votre plateau. Quand vous cliquez sur 'Aller à la position suivante', la" -" buse se déplacera vers les différentes positions pouvant être réglées." +msgstr "" +"Pour obtenir des résultats d'impression optimaux, vous pouvez maintenant régler votre plateau. Quand vous cliquez sur 'Aller à la position suivante', la buse se déplacera vers les " +"différentes positions pouvant être réglées." #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:52 msgctxt "@label" @@ -2876,8 +2886,8 @@ msgid "" "For every position; insert a piece of paper under the nozzle and adjust the " "print build plate height. The print build plate height is right when the " "paper is slightly gripped by the tip of the nozzle." -msgstr "Pour chacune des positions ; glissez un bout de papier sous la buse et ajustez la hauteur du plateau. La hauteur du plateau est juste lorsque la pointe" -" de la buse gratte légèrement le papier." +msgstr "" +"Pour chacune des positions ; glissez un bout de papier sous la buse et ajustez la hauteur du plateau. La hauteur du plateau est juste lorsque la pointe de la buse gratte légèrement le papier." #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:67 msgctxt "@action:button" @@ -2892,7 +2902,7 @@ msgstr "Aller à la position suivante" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "Per mezzo di" +msgstr "Par" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 @@ -2948,14 +2958,14 @@ msgstr "Mise à jour" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:8 msgctxt "@header" msgid "Install Plugins" -msgstr "Installer les plug-ins" +msgstr "Installer les plugins" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Simplifiez votre flux de travail et personnalisez votre expérience Ultimaker Cura avec des plug-ins fournis par notre incroyable communauté d'utilisateurs." +msgstr "Simplifiez votre flux de travail et personnalisez votre expérience UltiMaker Cura avec des plugins fournis par notre incroyable communauté d'utilisateurs." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3000,7 +3010,7 @@ msgstr "Contrat de licence du plugin" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:47 msgctxt "@text" msgid "Please read and agree with the plugin licence." -msgstr "Veuillez lire et accepter la licence du plug-in." +msgstr "Veuillez lire et accepter la licence du plugin." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:70 msgctxt "@button" @@ -3016,9 +3026,9 @@ msgstr "Installer des matériaux" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Sélectionnez et installez des profils de matériaux optimisés pour vos imprimantes 3D Ultimaker." +msgstr "Sélectionnez et installez des profils de matériaux optimisés pour vos imprimantes 3D UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3075,7 +3085,7 @@ msgstr "Optimisé pour Air Manager" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:243 msgctxt "@button" msgid "Visit plug-in website" -msgstr "Visitez le site Web du plug-in" +msgstr "Visitez le site Web du plugin" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:243 msgctxt "@button" @@ -3139,18 +3149,18 @@ msgstr "Charger plus" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Plug-in Ultimaker vérifié" +msgid "UltiMaker Verified Plug-in" +msgstr "Plugin UltiMaker vérifié" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Matériau Ultimaker certifié" +msgid "UltiMaker Certified Material" +msgstr "Matériau UltiMaker certifié" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Package Ultimaker vérifié" +msgid "UltiMaker Verified Package" +msgstr "Package UltiMaker vérifié" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3162,12 +3172,12 @@ msgctxt "@text" msgid "" "Manage your Ultimaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Gérez vos plug-ins Ultimaker Cura et vos profils matériaux ici. Assurez-vous de maintenir vos plug-ins à jour et de sauvegarder régulièrement votre configuration." +msgstr "Gérez vos plugins UltiMaker Cura et vos profils matériaux ici. Assurez-vous de maintenir vos plugins à jour et de sauvegarder régulièrement votre configuration." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "Installa materiali mancanti" +msgstr "Installer les matériaux manquants" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Marketplace.qml:87 msgctxt "@title" @@ -3177,7 +3187,7 @@ msgstr "Chargement..." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Marketplace.qml:148 msgctxt "@button" msgid "Plugins" -msgstr "Plug-ins" +msgstr "Plugins" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Marketplace.qml:156 msgctxt "@button" @@ -3206,8 +3216,11 @@ msgid "" "- Check if the printer is turned on.\n" "- Check if the printer is connected to the network.\n" "- Check if you are signed in to discover cloud-connected printers." -msgstr "Assurez-vous que votre imprimante est connectée :\n- Vérifiez si l'imprimante est sous tension.\n- Vérifiez si l'imprimante est connectée au réseau.- Vérifiez" -" si vous êtes connecté pour découvrir les imprimantes connectées au cloud." +msgstr "" +"Assurez-vous que votre imprimante est connectée:\n" +"- Vérifiez si l'imprimante est sous tension.\n" +"- Vérifiez si l'imprimante est connectée au réseau.\n" +"- Vérifiez si vous êtes connecté pour découvrir les imprimantes connectées au cloud." #: /Users/c.lamboo/ultimaker/Cura/plugins/MonitorStage/MonitorMain.qml:113 msgctxt "@info" @@ -3359,7 +3372,8 @@ msgctxt "@label" msgid "" "The material used in this project is currently not installed in Cura.
    Install the material profile and reopen the project." -msgstr "Le matériau utilisé dans ce projet n'est actuellement pas installé dans Cura.
    Installez le profil du matériau et rouvrez le projet." +msgstr "" +"Le matériau utilisé dans ce projet n'est actuellement pas installé dans Cura.
    Installer le profil de matériau et rouvrir le projet." #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/WorkspaceDialog.qml:515 msgctxt "@action:button" @@ -3369,12 +3383,12 @@ msgstr "Ouvrir" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/WorkspaceDialog.qml:521 msgctxt "@action:button" msgid "Open project anyway" -msgstr "Apri il progetto comunque" +msgstr "Ouvrir tout de même le projet" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/WorkspaceDialog.qml:530 msgctxt "@action:button" msgid "Install missing material" -msgstr "Installa materiale mancante" +msgstr "Installer le matériel manquant" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:41 msgctxt "@label" @@ -3443,16 +3457,16 @@ msgid "" "Firmware is the piece of software running directly on your 3D printer. This " "firmware controls the step motors, regulates the temperature and ultimately " "makes your printer work." -msgstr "Le firmware est le logiciel fonctionnant directement dans votre imprimante 3D. Ce firmware contrôle les moteurs pas à pas, régule la température et surtout," -" fait que votre machine fonctionne." +msgstr "" +"Le firmware est le logiciel fonctionnant directement dans votre imprimante 3D. Ce firmware contrôle les moteurs pas à pas, régule la température et surtout, fait que votre machine fonctionne." #: /Users/c.lamboo/ultimaker/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:43 msgctxt "@label" msgid "" "The firmware shipping with new printers works, but new versions tend to have " "more features and improvements." -msgstr "Le firmware fourni avec les nouvelles imprimantes fonctionne, mais les nouvelles versions ont tendance à fournir davantage de fonctionnalités ainsi que" -" des améliorations." +msgstr "" +"Le firmware fourni avec les nouvelles imprimantes fonctionne, mais les nouvelles versions ont tendance à fournir davantage de fonctionnalités ainsi que des améliorations." #: /Users/c.lamboo/ultimaker/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:55 msgctxt "@action:button" @@ -3654,7 +3668,10 @@ msgid "" "This setting has a value that is different from the profile.\n" "\n" "Click to restore the value of the profile." -msgstr "Ce paramètre possède une valeur qui est différente du profil.\n\nCliquez pour restaurer la valeur du profil." +msgstr "" +"Ce paramètre possède une valeur qui est différente du profil.\n" +"\n" +"Cliquez pour restaurer la valeur du profil." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Settings/SettingItem.qml:334 msgctxt "@label" @@ -3663,7 +3680,10 @@ msgid "" "set.\n" "\n" "Click to restore the calculated value." -msgstr "Ce paramètre est normalement calculé mais il possède actuellement une valeur absolue définie.\n\nCliquez pour restaurer la valeur calculée." +msgstr "" +"Ce paramètre est normalement calculé mais il possède actuellement une valeur absolue définie.\n" +"\n" +"Cliquez pour restaurer la valeur calculée." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Settings/SettingView.qml:48 msgctxt "@label:textbox" @@ -3708,12 +3728,15 @@ msgid "" "value.\n" "\n" "Click to make these settings visible." -msgstr "Certains paramètres masqués utilisent des valeurs différentes de leur valeur normalement calculée.\n\nCliquez pour rendre ces paramètres visibles." +msgstr "" +"Certains paramètres masqués utilisent des valeurs différentes de leur valeur normalement calculée.\n" +"\n" +"Cliquez pour rendre ces paramètres visibles." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/MainWindow/MainWindowHeader.qml:135 msgctxt "@action:button" msgid "Marketplace" -msgstr "Marché en ligne" +msgstr "Marketplace" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Menus/SettingsMenu.qml:13 @@ -3865,8 +3888,8 @@ msgid "" "It seems like you don't have any compatible printers connected to Digital " "Factory. Make sure your printer is connected and it's running the latest " "firmware." -msgstr "Il semble que vous n'ayez aucune imprimante compatible connectée à Digital Factory. Assurez-vous que votre imprimante est connectée et qu'elle utilise" -" le dernier micrologiciel." +msgstr "" +"Il semble que vous n'ayez aucune imprimante compatible connectée à Digital Factory. Assurez-vous que votre imprimante est connectée et qu'elle utilise le dernier micrologiciel." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:585 msgctxt "@button" @@ -4156,12 +4179,12 @@ msgstr "Interface" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:215 msgctxt "@heading" msgid "-- incomplete --" -msgstr "--complet --" +msgstr "-- incomplet —-" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:261 msgctxt "@label" msgid "Currency:" -msgstr "Devise :" +msgstr "Devise:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "" @@ -4217,8 +4240,8 @@ msgctxt "@info:tooltip" msgid "" "Highlight missing or extraneous surfaces of the model using warning signs. " "The toolpaths will often be missing parts of the intended geometry." -msgstr "Surlignez les surfaces du modèle manquantes ou étrangères en utilisant les signes d'avertissement. Les Toolpaths seront souvent les parties manquantes" -" de la géométrie prévue." +msgstr "" +"Surlignez les surfaces du modèle manquantes ou étrangères en utilisant les signes d'avertissement. Les Toolpaths seront souvent les parties manquantes de la géométrie prévue." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:409 msgctxt "@option:check" @@ -4322,7 +4345,7 @@ msgstr "Quel type de rendu de la caméra doit-il être utilisé?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:569 msgctxt "@window:text" msgid "Camera rendering:" -msgstr "Rendu caméra :" +msgstr "Rendu caméra:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:576 msgid "Perspective" @@ -4359,7 +4382,7 @@ msgstr "Les objets doivent-ils être supprimés du plateau de fabrication avant #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:646 msgctxt "@option:check" msgid "Clear buildplate before loading model into the single instance" -msgstr "Supprimez les objets du plateau de fabrication avant de charger un modèle dans l'instance unique" +msgstr "Supprimer les objets du plateau avant de charger un modèle dans l'instance unique" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" @@ -4446,8 +4469,9 @@ msgid "" "When you have made changes to a profile and switched to a different one, a " "dialog will be shown asking whether you want to keep your modifications or " "not, or you can choose a default behaviour and never show that dialog again." -msgstr "Lorsque vous apportez des modifications à un profil puis passez à un autre profil, une boîte de dialogue apparaît, vous demandant si vous souhaitez conserver" -" les modifications. Vous pouvez aussi choisir une option par défaut, et le dialogue ne s'affichera plus." +msgstr "" +"Lorsque vous apportez des modifications à un profil puis passez à un autre profil, une boîte de dialogue apparaît, vous demandant si vous souhaitez conserver les modifications. Vous pouvez " +"aussi choisir une option par défaut, et le dialogue ne s'affichera plus." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:801 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 @@ -4489,8 +4513,9 @@ msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "Les données anonymes de votre impression doivent-elles être envoyées à Ultimaker ? Notez qu'aucun modèle, aucune adresse IP ni aucune autre information" -" permettant de vous identifier personnellement ne seront envoyés ou stockés." +msgstr "" +"Les données anonymes de votre impression doivent-elles être envoyées à Ultimaker ? Notez qu'aucun modèle, aucune adresse IP ni aucune autre information permettant de vous identifier " +"personnellement ne seront envoyés ou stockés." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4537,8 +4562,8 @@ msgctxt "@info:tooltip" msgid "" "Should an automatic check for new plugins be done every time Cura is " "started? It is highly recommended that you do not disable this!" -msgstr "Une vérification automatique des nouveaux plugins doit-elle être effectuée à chaque fois que Cura est lancé ? Il est fortement recommandé de ne pas désactiver" -" cette fonction !" +msgstr "" +"Une vérification automatique des nouveaux plugins doit-elle être effectuée à chaque fois que Cura est lancé ? Il est fortement recommandé de ne pas désactiver cette fonction !" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:962 msgctxt "@option:check" @@ -4808,23 +4833,23 @@ msgstr "Dépannage" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Connectez-vous à la plateforme Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Connectez-vous à la plateforme UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" msgid "Add material settings and plugins from the Marketplace" -msgstr "Ajoutez des paramètres de matériaux et des plug-ins depuis la Marketplace" +msgstr "Ajoutez des paramètres de matériaux et des plugins depuis la Marketplace" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:149 msgctxt "@text" msgid "Backup and sync your material settings and plugins" -msgstr "Sauvegardez et synchronisez vos paramètres de matériaux et vos plug-ins" +msgstr "Sauvegardez et synchronisez vos paramètres de matériaux et vos plugins" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Partagez vos idées et obtenez l'aide de plus de 48 000 utilisateurs de la communauté Ultimaker" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Partagez vos idées et obtenez l'aide de plus de 48,000 utilisateurs de la communauté UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4833,20 +4858,20 @@ msgstr "Ignorer" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Créez gratuitement un compte Ultimaker" +msgid "Create a free UltiMaker Account" +msgstr "Créez gratuitement un compte UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Aidez-nous à améliorer Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Aidez-nous à améliorer UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" "Ultimaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura recueille des données anonymes pour améliorer la qualité d'impression et l'expérience utilisateur, notamment :" +msgstr "UltiMaker Cura recueille des données anonymes pour améliorer la qualité d'impression et l'expérience utilisateur, notamment :" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4872,7 +4897,7 @@ msgstr "Paramètres d'impression" msgctxt "@text" msgid "" "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Les données recueillies par Ultimaker Cura ne contiendront aucun renseignement personnel." +msgstr "Les données recueillies par UltiMaker Cura ne contiendront aucun renseignement personnel." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4942,8 +4967,8 @@ msgstr "Impossible de se connecter à l'appareil." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Impossible de vous connecter à votre imprimante Ultimaker ?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Impossible de vous connecter à votre imprimante UltiMaker ?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4964,15 +4989,17 @@ msgstr "Se connecter" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Bienvenue dans Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Bienvenue dans UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" "Please follow these steps to set up Ultimaker Cura. This will only take a " "few moments." -msgstr "Veuillez suivre ces étapes pour configurer\nUltimaker Cura. Cela ne prendra que quelques instants." +msgstr "" +"Veuillez suivre ces étapes pour configurer\n" +"Ultimaker Cura. Cela ne prendra que quelques instants." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5164,7 +5191,7 @@ msgstr "Sélectionner tous les modèles" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:393 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" -msgstr "Supprimer les objets du plateau" +msgstr "Supprimer les modèles du plateau" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:403 msgctxt "@action:inmenu menubar:file" @@ -5414,7 +5441,7 @@ msgstr "Cette configuration n'est pas disponible car %1 n'est pas reconnu. Veuil #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml:138 msgctxt "@label" msgid "Marketplace" -msgstr "Marché en ligne" +msgstr "Marketplace" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:106 msgctxt "@tooltip" @@ -5519,7 +5546,7 @@ msgstr "Gérer la visibilité des paramètres..." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/ChoosePrinterDialog.qml:17 msgctxt "@title:window" msgid "Select Printer" -msgstr "Sélectionner une imprimante" +msgstr "Sélectionner l’imprimante" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/ChoosePrinterDialog.qml:54 msgctxt "@title:label" @@ -5543,8 +5570,9 @@ msgid "" "We have found one or more project file(s) within the files you have " "selected. You can open only one project file at a time. We suggest to only " "import models from those files. Would you like to proceed?" -msgstr "Nous avons trouvé au moins un fichier de projet parmi les fichiers que vous avez sélectionnés. Vous ne pouvez ouvrir qu'un seul fichier de projet à la" -" fois. Nous vous conseillons de n'importer que les modèles de ces fichiers. Souhaitez-vous continuer ?" +msgstr "" +"Nous avons trouvé au moins un fichier de projet parmi les fichiers que vous avez sélectionnés. Vous ne pouvez ouvrir qu'un seul fichier de projet à la fois. Nous vous conseillons de " +"n'importer que les modèles de ces fichiers. Souhaitez-vous continuer?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 msgctxt "@action:button" @@ -5589,8 +5617,10 @@ msgid "" "You have customized some profile settings. Would you like to Keep these " "changed settings after switching profiles? Alternatively, you can discard " "the changes to load the defaults from '%1'." -msgstr "Vous avez personnalisé certains paramètres de profil.\nSouhaitez-vous conserver ces paramètres modifiés après avoir changé de profil ?\nVous pouvez également" -" annuler les modifications pour charger les valeurs par défaut de '%1'." +msgstr "" +"Vous avez personnalisé certains paramètres de profil.\n" +"Souhaitez-vous conserver ces paramètres modifiés après avoir changé de profil ?\n" +"Vous pouvez également annuler les modifications pour charger les valeurs par défaut de '%1'." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:85 msgctxt "@title:column" @@ -5670,9 +5700,11 @@ msgstr "Solution complète pour l'impression 3D par dépôt de filament fondu." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura a été développé par Ultimaker B.V. en coopération avec la communauté Ultimaker.\nCura est fier d'utiliser les projets open source suivants :" +msgstr "" +"Cura a été développé par Ultimaker B.V. en coopération avec la communauté Ultimaker.\n" +"Cura est fier d'utiliser les projets open source suivants :" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5806,6 +5838,7 @@ msgid "Support library for scientific computing" msgstr "Prise en charge de la bibliothèque pour le calcul scientifique" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:171 +#, fuzzy msgctxt "@Label Description for application dependency" msgid "Python Error tracking library" msgstr "Bibliothèque de suivi des erreurs Python" @@ -5877,23 +5910,23 @@ msgstr "Surveillez les tâches d'impression et réimprimez à partir de votre hi #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Étendez Ultimaker Cura avec des plug-ins et des profils de matériaux." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Étendez UltiMaker Cura avec des plugins et des profils de matériaux." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Devenez un expert de l'impression 3D avec les cours de formation en ligne Ultimaker." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Devenez un expert de l'impression 3D avec les cours de formation en ligne UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Assistance ultimaker" +msgid "UltiMaker support" +msgstr "Assistance UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Découvrez comment utiliser Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Découvrez comment utiliser UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5902,8 +5935,8 @@ msgstr "Posez une question" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Consultez la communauté Ultimaker." +msgid "Consult the UltiMaker Community." +msgstr "Consultez la communauté UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5917,8 +5950,8 @@ msgstr "Informez les développeurs en cas de problème." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Visitez le site web Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Visitez le site web UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -5946,7 +5979,7 @@ msgstr "Le profil personnalisé %1 remplace certains paramètres." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "Alcune impostazioni sono state modificate." +msgstr "Certains paramètres ont été modifiés." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:78 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:254 @@ -5963,7 +5996,7 @@ msgstr "Remplissage graduel" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "Configurazione non supportata" +msgstr "Configuration non supportée" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." @@ -5975,7 +6008,7 @@ msgstr "Nessun profilo disponibile per la configurazione del materiale /%1 selez #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "Ulteriori informazioni" +msgstr "En savoir plus" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5987,13 +6020,13 @@ msgctxt "@label" msgid "" "Enable printing a brim or raft. This will add a flat area around or under " "your object which is easy to cut off afterwards." -msgstr "Activez l'impression d'une bordure ou plaquette (Brim/Raft). Cela ajoutera une zone plate autour de ou sous votre objet qui est facile à découper par la" -" suite." +msgstr "" +"Activez l'impression d'une bordure ou plaquette (Brim/Raft). Cela ajoutera une zone plate autour de ou sous votre objet qui est facile à découper par la suite." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:27 msgctxt "@label" msgid "Resolution" -msgstr "Risoluzione" +msgstr "Résolution" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:20 msgctxt "@label shown when we load a Gcode file" @@ -6037,7 +6070,10 @@ msgid "" "profile.\n" "\n" "Click to open the profile manager." -msgstr "Certaines valeurs de paramètre / forçage sont différentes des valeurs enregistrées dans le profil. \n\nCliquez pour ouvrir le gestionnaire de profils." +msgstr "" +"Certaines valeurs de paramètre / forçage sont différentes des valeurs enregistrées dans le profil. \n" +"\n" +"Cliquez pour ouvrir le gestionnaire de profils." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:158 msgctxt "@label:header" @@ -6059,8 +6095,8 @@ msgctxt "@tooltip" msgid "" "The target temperature of the heated bed. The bed will heat up or cool down " "towards this temperature. If this is 0, the bed heating is turned off." -msgstr "Température cible du plateau chauffant. Le plateau sera chauffé ou refroidi pour tendre vers cette température. Si la valeur est 0, le chauffage du plateau" -" sera éteint." +msgstr "" +"Température cible du plateau chauffant. Le plateau sera chauffé ou refroidi pour tendre vers cette température. Si la valeur est 0, le chauffage du plateau sera éteint." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:88 msgctxt "@tooltip" @@ -6090,8 +6126,9 @@ msgid "" "Heat the bed in advance before printing. You can continue adjusting your " "print while it is heating, and you won't have to wait for the bed to heat up " "when you're ready to print." -msgstr "Préchauffez le plateau avant l'impression. Vous pouvez continuer à ajuster votre impression pendant qu'il chauffe, et vous n'aurez pas à attendre que le" -" plateau chauffe lorsque vous serez prêt à lancer l'impression." +msgstr "" +"Préchauffez le plateau avant l'impression. Vous pouvez continuer à ajuster votre impression pendant qu'il chauffe, et vous n'aurez pas à attendre que le plateau chauffe lorsque vous serez " +"prêt à lancer l'impression." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:40 msgctxt "@label" @@ -6103,8 +6140,9 @@ msgctxt "@tooltip" msgid "" "The target temperature of the hotend. The hotend will heat up or cool down " "towards this temperature. If this is 0, the hotend heating is turned off." -msgstr "Température cible de l'extrémité chauffante. L'extrémité chauffante sera chauffée ou refroidie pour tendre vers cette température. Si la valeur est 0," -" le chauffage de l'extrémité chauffante sera coupé." +msgstr "" +"Température cible de l'extrémité chauffante. L'extrémité chauffante sera chauffée ou refroidie pour tendre vers cette température. Si la valeur est 0, le chauffage de l'extrémité chauffante " +"sera coupé." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:105 msgctxt "@tooltip" @@ -6122,8 +6160,9 @@ msgid "" "Heat the hotend in advance before printing. You can continue adjusting your " "print while it is heating, and you won't have to wait for the hotend to heat " "up when you're ready to print." -msgstr "Préchauffez l'extrémité chauffante avant l'impression. Vous pouvez continuer l'ajustement de votre impression pendant qu'elle chauffe, ce qui vous évitera" -" un temps d'attente lorsque vous serez prêt à lancer l'impression." +msgstr "" +"Préchauffez l'extrémité chauffante avant l'impression. Vous pouvez continuer l'ajustement de votre impression pendant qu'elle chauffe, ce qui vous évitera un temps d'attente lorsque vous " +"serez prêt à lancer l'impression." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:335 msgctxt "@tooltip" @@ -6175,7 +6214,7 @@ msgctxt "@tooltip of G-code command input" msgid "" "Send a custom G-code command to the connected printer. Press 'enter' to send " "the command." -msgstr "Envoyer une commande G-Code personnalisée à l'imprimante connectée. Appuyez sur « Entrée » pour envoyer la commande." +msgstr "Envoyer une commande G-Code personnalisée à l'imprimante connectée. Appuyez sur « Entrée » pour envoyer la commande." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Cura.qml:250 msgctxt "@label" @@ -6196,7 +6235,7 @@ msgstr "Fermeture de %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Cura.qml:597 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" -msgstr "Voulez-vous vraiment quitter %1 ?" +msgstr "Voulez-vous vraiment quitter %1?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Cura.qml:740 msgctxt "@window:title" @@ -6214,8 +6253,9 @@ msgid "" "We have found one or more G-Code files within the files you have selected. " "You can only open one G-Code file at a time. If you want to open a G-Code " "file, please just select only one." -msgstr "Nous avons trouvé au moins un fichier G-Code parmi les fichiers que vous avez sélectionné. Vous ne pouvez ouvrir qu'un seul fichier G-Code à la fois. Si" -" vous souhaitez ouvrir un fichier G-Code, veuillez ne sélectionner qu'un seul fichier de ce type." +msgstr "" +"Nous avons trouvé au moins un fichier G-Code parmi les fichiers que vous avez sélectionné. Vous ne pouvez ouvrir qu'un seul fichier G-Code à la fois. Si vous souhaitez ouvrir un fichier G-" +"Code, veuillez ne sélectionner qu'un seul fichier de ce type." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Cura.qml:829 msgctxt "@title:window" @@ -6233,13 +6273,15 @@ msgid "" "- Add material profiles and plug-ins from the Marketplace\n" "- Back-up and sync your material profiles and plug-ins\n" "- Share ideas and get help from 48,000+ users in the Ultimaker community" -msgstr "- Ajoutez des profils de matériaux et des plug-ins à partir de la Marketplace\n- Sauvegardez et synchronisez vos profils de matériaux et vos plug-ins\n-" -" Partagez vos idées et obtenez l'aide de plus de 48 000 utilisateurs de la communauté Ultimaker" +msgstr "" +"- Ajoutez des profils de matériaux et des plugins à partir de la Marketplace\n" +"- Sauvegardez et synchronisez vos profils de matériaux et vos plugins\n" +"- Partagez vos idées et obtenez l'aide de plus de 48,000 utilisateurs de la communauté Ultimaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Créez gratuitement un compte Ultimaker" +msgid "Create a free UltiMaker account" +msgstr "Créez gratuitement un compte UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6253,8 +6295,8 @@ msgstr "Dernière mise à jour : %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Compte Ultimaker" +msgid "UltiMaker Account" +msgstr "Compte UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6478,13 +6520,13 @@ msgstr "Post-traitement" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Gère les connexions réseau vers les imprimantes Ultimaker en réseau." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Gère les connexions réseau vers les imprimantes UltiMaker en réseau." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Connexion réseau Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Connexion réseau UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6518,8 +6560,8 @@ msgstr "Information sur le découpage" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Permet l'écriture de fichiers Ultimaker Format Package." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Permet l'écriture de fichiers UltiMaker Format Package." #: /UFPWriter/plugin.json msgctxt "name" @@ -6573,12 +6615,12 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Fournit les actions de la machine pour les machines Ultimaker (telles que l'assistant de calibration du plateau, sélection des mises à niveau, etc.)" +msgstr "Fournit les actions de la machine pour les machines UltiMaker (telles que l'assistant de calibration du plateau, sélection des mises à niveau, etc.)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Actions de la machine Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Actions de la machine UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6595,7 +6637,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Gère les extensions de l'application et permet de parcourir les extensions à partir du site Web Ultimaker." +msgstr "Gère les extensions de l'application et permet de parcourir les extensions à partir du site Web UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6947,8 +6989,8 @@ msgstr "Générateur de G-Code" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Fournit un support pour la lecture des paquets de format Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Fournit un support pour la lecture des paquets de format UltiMaker." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index 5f65321e2d..2170203de9 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -1,6 +1,7 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # msgid "" msgstr "" @@ -423,8 +424,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Az Ultimaker fiókkiszolgáló elérhetetlen." +msgid "Unable to reach the UltiMaker account server." +msgstr "Az UltiMaker fiókkiszolgáló elérhetetlen." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -700,8 +701,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Hibajelentés küldése az Ultimaker -nek" +msgid "Send crash report to UltiMaker" +msgstr "Hibajelentés küldése az UltiMaker -nek" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -901,7 +902,7 @@ msgstr "Hálózati hiba" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "" msgstr[1] "" @@ -1049,8 +1050,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "Olyan nyomtatóval próbál csatlakozni, amelyen nem fut az Ultimaker Connect. Kérjük, frissítse a nyomtatón a firmware-t." +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." +msgstr "Olyan nyomtatóval próbál csatlakozni, amelyen nem fut az UltiMaker Connect. Kérjük, frissítse a nyomtatón a firmware-t." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1273,8 +1274,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker formátumcsomag" +msgid "UltiMaker Format Package" +msgstr "UltiMaker formátumcsomag" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1395,7 +1396,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" +msgid "Changes detected from your UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 @@ -1556,7 +1557,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." +msgid "Report a bug on UltiMaker Cura's issue tracker." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 @@ -1682,7 +1683,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 @@ -2326,7 +2327,7 @@ msgstr "A távoli nyomtatásisor kezeléshez kérjük frissítse a firmware-t." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2692,8 +2693,8 @@ msgstr "További információ a névtelen adatgyűjtésről" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "Az Ultimaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javítása érdekében. Az alábbiakban található egy példa az összes megosztott adatra:" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgstr "Az UltiMaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javítása érdekében. Az alábbiakban található egy példa az összes megosztott adatra:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2717,8 +2718,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Kérjük, válassza ki az Ultimaker Original eredeti frissítéseit" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Kérjük, válassza ki az UltiMaker Original eredeti frissítéseit" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2813,7 +2814,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 @@ -2872,7 +2873,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 @@ -2994,17 +2995,17 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" +msgid "UltiMaker Verified Plug-in" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" +msgid "UltiMaker Certified Material" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" +msgid "UltiMaker Verified Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 @@ -3014,7 +3015,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4283,8 +4284,8 @@ msgstr "Magán" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "Elküldjük a nyomtatott adatokat név nélkül az Ultimaker-nek?Semmilyen személyes infromáció, IP cím vagy azonosító nem kerül elküldésre." +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "Elküldjük a nyomtatott adatokat név nélkül az UltiMaker-nek?Semmilyen személyes infromáció, IP cím vagy azonosító nem kerül elküldésre." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4597,7 +4598,7 @@ msgstr "Hibaelhárítás" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" +msgid "Sign in to the UltiMaker platform" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 @@ -4612,7 +4613,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 @@ -4622,18 +4623,18 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" +msgid "Create a free UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Segítsen nekünk az Ultimaker Cura fejlesztésében" +msgid "Help us to improve UltiMaker Cura" +msgstr "Segítsen nekünk az UltiMaker Cura fejlesztésében" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" -msgstr "Az Ultimaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javításának érdekében, ideértve:" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" +msgstr "Az UltiMaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javításának érdekében, ideértve:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4657,8 +4658,8 @@ msgstr "Nyomtatási beállítások" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Az Ultimaker Cura által gyűjtött adatok nem tartalmaznak személyes információt." +msgid "Data collected by UltiMaker Cura will not contain any personal information." +msgstr "Az UltiMaker Cura által gyűjtött adatok nem tartalmaznak személyes információt." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4728,7 +4729,7 @@ msgstr "Nem sikerült csatlakozni az eszközhöz." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" +msgid "Can't connect to your UltiMaker printer?" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 @@ -4748,12 +4749,12 @@ msgstr "Csatlakozás" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Üdvözöljük az Ultimaker Cura-ban" +msgid "Welcome to UltiMaker Cura" +msgstr "Üdvözöljük az UltiMaker Cura-ban" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 @@ -5436,9 +5437,9 @@ msgstr "Teljes körű megoldás az olvadószálas 3D-s nyomtatáshoz." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "A Cura-t az Ultimaker B.V fejlesztette ki a közösséggel együttműködésben. A Cura büszkén használja a következő nyílt forráskódú projekteket:" +msgstr "A Cura-t az UltiMaker B.V fejlesztette ki a közösséggel együttműködésben. A Cura büszkén használja a következő nyílt forráskódú projekteket:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5643,22 +5644,22 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." +msgid "Extend UltiMaker Cura with plugins and material profiles." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." +msgid "Become a 3D printing expert with UltiMaker e-learning." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" +msgid "UltiMaker support" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 @@ -5668,7 +5669,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." +msgid "Consult the UltiMaker Community." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 @@ -5683,7 +5684,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." +msgid "Visit the UltiMaker website." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 @@ -5977,7 +5978,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" +msgid "Create a free UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 @@ -5992,7 +5993,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" +msgid "UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 @@ -6207,13 +6208,13 @@ msgstr "Utólagos feldolgozás" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Kezeli a hálózati csatlakozásokat az Ultimaker hálózati nyomtatókhoz." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Kezeli a hálózati csatlakozásokat az UltiMaker hálózati nyomtatókhoz." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker hálózati kapcsolat" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker hálózati kapcsolat" #: /3MFWriter/plugin.json msgctxt "description" @@ -6247,8 +6248,8 @@ msgstr "Szeletelési infó" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Támogatást nyújt az Ultimaker formátumú csomagok írásához." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Támogatást nyújt az UltiMaker formátumú csomagok írásához." #: /UFPWriter/plugin.json msgctxt "name" @@ -6297,13 +6298,13 @@ msgstr "Trimesh olvasó" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." -msgstr "Gépi funkciók biztosítása az Ultimaker nyomtatók számára.(pl.: ágyszintezés varázsló, frissítések kiválasztása.)" +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgstr "Gépi funkciók biztosítása az UltiMaker nyomtatók számára.(pl.: ágyszintezés varázsló, frissítések kiválasztása.)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker gépi funkciók" +msgid "UltiMaker machine actions" +msgstr "UltiMaker gépi funkciók" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6317,7 +6318,7 @@ msgstr "Tömörített G-kód olvasó" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." msgstr "" #: /Marketplace/plugin.json @@ -6667,8 +6668,8 @@ msgstr "G-kódot író" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Támogatást nyújt az Ultimaker formátumú csomagok olvasásához." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Támogatást nyújt az UltiMaker formátumú csomagok olvasásához." #: /UFPReader/plugin.json msgctxt "name" @@ -7036,8 +7037,8 @@ msgstr "Előkészítés nézet" #~ msgstr "Szimulációs nézetet biztosít." #~ msgctxt "@info:status" -#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "Küldjön és felügyeljen nyomtatási feladatokat bárhonnan az Ultimaker fiókjával." +#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "Küldjön és felügyeljen nyomtatási feladatokat bárhonnan az UltiMaker fiókjával." #~ msgctxt "@info:title The %s gets replaced with the printer name." #~ msgid "New %s firmware available" @@ -7082,8 +7083,8 @@ msgstr "Előkészítés nézet" #~ "az Ultimaker Cura beállításához. Pár pillanat az egész." #~ msgctxt "@label" -#~ msgid "What's new in Ultimaker Cura" -#~ msgstr "Újdonságok az Ultimaker Cura-ban" +#~ msgid "What's new in UltiMaker Cura" +#~ msgstr "Újdonságok az UltiMaker Cura-ban" #~ msgctxt "@info:status" #~ msgid "The selected model was too small to load." @@ -7130,8 +7131,8 @@ msgstr "Előkészítés nézet" #~ msgstr "Csatlakozás felhőn keresztül" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Csatlakozás az Ultimaker felhőhöz" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Csatlakozás az UltiMaker felhőhöz" #~ msgctxt "@label" #~ msgid "You need to install the package before you can rate" @@ -7158,8 +7159,8 @@ msgstr "Előkészítés nézet" #~ msgstr "Szia %1" #~ msgctxt "@button" -#~ msgid "Ultimaker account" -#~ msgstr "Ultimaker fiók" +#~ msgid "UltiMaker account" +#~ msgstr "UltiMaker fiók" #~ msgctxt "@button" #~ msgid "Sign out" @@ -7343,8 +7344,8 @@ msgstr "Előkészítés nézet" #~ msgstr "Ellenőrző lista" #~ msgctxt "@label" -#~ msgid "Please select any upgrades made to this Ultimaker 2." -#~ msgstr "Kérjük, válassza ki az Ultimaker 2 frissítéseit." +#~ msgid "Please select any upgrades made to this UltiMaker 2." +#~ msgstr "Kérjük, válassza ki az UltiMaker 2 frissítéseit." #~ msgctxt "@label" #~ msgid "Olsson Block" @@ -7421,8 +7422,8 @@ msgstr "Előkészítés nézet" #~ "- Exklúzív hozzáférés a vezető nyomtató márkák nyomtatási profiljaikhoz" #~ msgctxt "@title:window" -#~ msgid "Ultimaker Cura" -#~ msgstr "Ultimaker Cura" +#~ msgid "UltiMaker Cura" +#~ msgstr "UltiMaker Cura" #~ msgctxt "@title:window" #~ msgid "Closing Cura" @@ -7441,20 +7442,20 @@ msgstr "Előkészítés nézet" #~ msgstr "Tárgyasztal" #~ msgctxt "@label" -#~ msgid "Ultimaker Cloud" -#~ msgstr "Ultimaker felhő" +#~ msgid "UltiMaker Cloud" +#~ msgstr "UltiMaker felhő" #~ msgctxt "@text" #~ msgid "The next generation 3D printing workflow" #~ msgstr "Következő generációs 3D nyomtatási munkafolyamat" #~ msgctxt "@text" -#~ msgid "- Send print jobs to Ultimaker printers outside your local network" -#~ msgstr "- Küldjön nyomtatási feladatokat az Ultimaker nyomtatóknak a helyi hálózaton kívülről" +#~ msgid "- Send print jobs to UltiMaker printers outside your local network" +#~ msgstr "- Küldjön nyomtatási feladatokat az UltiMaker nyomtatóknak a helyi hálózaton kívülről" #~ msgctxt "@text" -#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere" -#~ msgstr "- Tárolja az Ultimaker Cura beállításait a felhőben így azok bárhol használhatóak" +#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere" +#~ msgstr "- Tárolja az UltiMaker Cura beállításait a felhőben így azok bárhol használhatóak" #~ msgctxt "@text" #~ msgid "- Get exclusive access to print profiles from leading brands" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 9a8d4055d3..162dda5cf6 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "Impossibile avviare un nuovo processo di accesso. Verificare se è ancor #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Impossibile raggiungere il server account Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Impossibile raggiungere il server account UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -722,7 +722,7 @@ msgstr "Impossibile avviare Cura" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

    Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

    Oops, UltiMaker Cura has encountered something that doesn't seem right." "

    \n" "

    We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -732,15 +732,15 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    Oops, Ultimaker Cura ha rilevato qualcosa che non sembra corretto.

    \n

    Abbiamo riscontrato un errore irrecuperabile durante" +msgstr "

    Oops, UltiMaker Cura ha rilevato qualcosa che non sembra corretto.

    \n

    Abbiamo riscontrato un errore irrecuperabile durante" " l’avvio. È stato probabilmente causato da alcuni file di configurazione errati. Suggeriamo di effettuare il backup e ripristinare la configurazione.

    \n" "

    I backup sono contenuti nella cartella configurazione.

    \n

    Si prega di inviare questo Rapporto su crash" " per correggere il problema.

    \n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Inviare il rapporto su crash a Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Inviare il rapporto su crash a UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -940,10 +940,10 @@ msgstr "Errore di rete" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Nuova stampante rilevata dall'account Ultimaker" -msgstr[1] "Nuove stampanti rilevate dall'account Ultimaker" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "Nuova stampante rilevata dall'account UltiMaker" +msgstr[1] "Nuove stampanti rilevate dall'account UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -1096,9 +1096,9 @@ msgstr "Rimuovere le stampanti" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "Si sta tentando di connettersi a una stampante che non esegue Ultimaker Connect. Aggiornare la stampante con il firmware più recente." +msgstr "Si sta tentando di connettersi a una stampante che non esegue UltiMaker Connect. Aggiornare la stampante con il firmware più recente." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1326,8 +1326,8 @@ msgstr "Impossibile scrivere nel file UFP:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Pacchetto formato Ultimaker" +msgid "UltiMaker Format Package" +msgstr "Pacchetto formato UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1451,8 +1451,8 @@ msgstr "Desiderate sincronizzare pacchetti materiale e software con il vostro ac #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Modifiche rilevate dal tuo account Ultimaker" +msgid "Changes detected from your UltiMaker account" +msgstr "Modifiche rilevate dal tuo account UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1614,8 +1614,8 @@ msgstr "Segnala un errore" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Segnalare un errore nel registro problemi di Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Segnalare un errore nel registro problemi di UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1763,8 +1763,8 @@ msgstr "Il file di progetto {0} è danneggiato: {1 msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "Il file di progetto {0} è realizzato con profili sconosciuti a questa versione di Ultimaker Cura." +"unknown to this version of UltiMaker Cura." +msgstr "Il file di progetto {0} è realizzato con profili sconosciuti a questa versione di UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2438,9 +2438,9 @@ msgstr "Aggiornare il firmware della stampante per gestire la coda da remoto." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Impossibile visualizzare feed della Webcam per stampanti cloud da Ultimaker Cura. Fare clic su \"Gestione stampanti\" per visitare Ultimaker Digital Factory" +msgstr "Impossibile visualizzare feed della Webcam per stampanti cloud da UltiMaker Cura. Fare clic su \"Gestione stampanti\" per visitare Ultimaker Digital Factory" " e visualizzare questa Webcam." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2822,9 +2822,9 @@ msgstr "Maggiori informazioni sulla raccolta di dati anonimi" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura acquisisce dati anonimi per migliorare la qualità di stampa e l'esperienza dell'utente. Di seguito è riportato un esempio dei dati condivisi:" +msgstr "UltiMaker Cura acquisisce dati anonimi per migliorare la qualità di stampa e l'esperienza dell'utente. Di seguito è riportato un esempio dei dati condivisi:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2848,8 +2848,8 @@ msgstr "Salva progetto Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Seleziona qualsiasi aggiornamento realizzato per questa Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Seleziona qualsiasi aggiornamento realizzato per questa UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2953,9 +2953,9 @@ msgstr "Installa plugin" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Semplifica il flusso di lavoro e personalizza l'esperienza Ultimaker Cura experience con plugin forniti dalla nostra eccezionale comunità di utenti." +msgstr "Semplifica il flusso di lavoro e personalizza l'esperienza UltiMaker Cura experience con plugin forniti dalla nostra eccezionale comunità di utenti." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3016,9 +3016,9 @@ msgstr "Installa materiali" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Selezionare e installare i profili dei materiali ottimizzati per le stampanti 3D Ultimaker." +msgstr "Selezionare e installare i profili dei materiali ottimizzati per le stampanti 3D UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3139,18 +3139,18 @@ msgstr "Carica altro" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Plug-in verificato Ultimaker" +msgid "UltiMaker Verified Plug-in" +msgstr "Plug-in verificato UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Materiale certificato Ultimaker" +msgid "UltiMaker Certified Material" +msgstr "Materiale certificato UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Pacchetto verificato Ultimaker" +msgid "UltiMaker Verified Package" +msgstr "Pacchetto verificato UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3160,9 +3160,9 @@ msgstr "Gestisci pacchetti" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Gestisci i plugin Ultimaker Cura e i profili del materiale qui. Accertarsi di mantenere i plugin aggiornati e di eseguire regolarmente il backup dell'impostazione." +msgstr "Gestisci i plugin UltiMaker Cura e i profili del materiale qui. Accertarsi di mantenere i plugin aggiornati e di eseguire regolarmente il backup dell'impostazione." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4484,10 +4484,10 @@ msgstr "Privacy" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "I dati anonimi sulla stampa devono essere inviati a Ultimaker? Nota, non sono trasmessi o memorizzati modelli, indirizzi IP o altre informazioni personali." +msgstr "I dati anonimi sulla stampa devono essere inviati a UltiMaker? Nota, non sono trasmessi o memorizzati modelli, indirizzi IP o altre informazioni personali." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4804,8 +4804,8 @@ msgstr "Ricerca e riparazione dei guasti" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Accedi alla piattaforma Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Accedi alla piattaforma UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4819,8 +4819,8 @@ msgstr "Esegui il backup e la sincronizzazione delle impostazioni materiale e de #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Condividi idee e ottieni supporto da più di 48.000 utenti nella community di Ultimaker" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Condividi idee e ottieni supporto da più di 48.000 utenti nella community di UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4829,20 +4829,20 @@ msgstr "Salta" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Crea un account Ultimaker gratuito" +msgid "Create a free UltiMaker Account" +msgstr "Crea un account UltiMaker gratuito" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Aiutaci a migliorare Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Aiutaci a migliorare UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" -"Ultimaker Cura collects anonymous data to improve print quality and user " +"UltiMaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura acquisisce dati anonimi per migliorare la qualità di stampa e l'esperienza dell'utente, tra cui:" +msgstr "UltiMaker Cura acquisisce dati anonimi per migliorare la qualità di stampa e l'esperienza dell'utente, tra cui:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4867,8 +4867,8 @@ msgstr "Impostazioni di stampa" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" msgid "" -"Data collected by Ultimaker Cura will not contain any personal information." -msgstr "I dati acquisiti da Ultimaker Cura non conterranno alcuna informazione personale." +"Data collected by UltiMaker Cura will not contain any personal information." +msgstr "I dati acquisiti da UltiMaker Cura non conterranno alcuna informazione personale." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4938,8 +4938,8 @@ msgstr "Impossibile connettersi al dispositivo." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Non è possibile effettuare la connessione alla stampante Ultimaker?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Non è possibile effettuare la connessione alla stampante UltiMaker?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4960,15 +4960,15 @@ msgstr "Collega" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Benvenuto in Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Benvenuto in UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" -"Please follow these steps to set up Ultimaker Cura. This will only take a " +"Please follow these steps to set up UltiMaker Cura. This will only take a " "few moments." -msgstr "Segui questa procedura per configurare\nUltimaker Cura. Questa operazione richiederà solo pochi istanti." +msgstr "Segui questa procedura per configurare\nUltiMaker Cura. Questa operazione richiederà solo pochi istanti." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5666,9 +5666,9 @@ msgstr "Soluzione end-to-end per la stampa 3D con filamento fuso." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura è stato sviluppato da Ultimaker B.V. in cooperazione con la comunità.\nCura è orgogliosa di utilizzare i seguenti progetti open source:" +msgstr "Cura è stato sviluppato da UltiMaker B.V. in cooperazione con la comunità.\nCura è orgogliosa di utilizzare i seguenti progetti open source:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5873,23 +5873,23 @@ msgstr "Monitora i processi di stampa dalla cronologia di stampa." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Estendi Ultimaker Cura con plugin e profili del materiale." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Estendi UltiMaker Cura con plugin e profili del materiale." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Diventa un esperto di stampa 3D con e-learning Ultimaker." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Diventa un esperto di stampa 3D con e-learning UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Supporto Ultimaker" +msgid "UltiMaker support" +msgstr "Supporto UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Scopri come iniziare a utilizzare Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Scopri come iniziare a utilizzare UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5898,8 +5898,8 @@ msgstr "Fai una domanda" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Consulta la community di Ultimaker." +msgid "Consult the UltiMaker Community." +msgstr "Consulta la community di UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5913,8 +5913,8 @@ msgstr "Informa gli sviluppatori che si è verificato un errore." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Visita il sito Web Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Visita il sito Web UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6232,8 +6232,8 @@ msgstr "- Aggiungi profili materiale e plugin dal Marketplace\n- Esegui il backu #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Crea un account Ultimaker gratuito" +msgid "Create a free UltiMaker account" +msgstr "Crea un account UltiMaker gratuito" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6247,8 +6247,8 @@ msgstr "Ultimo aggiornamento: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Account Ultimaker" +msgid "UltiMaker Account" +msgstr "Account UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6472,13 +6472,13 @@ msgstr "Post-elaborazione" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Gestisce le connessioni di rete alle stampanti Ultimaker in rete." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Gestisce le connessioni di rete alle stampanti UltiMaker in rete." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Connessione di rete Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Connessione di rete UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6512,8 +6512,8 @@ msgstr "Informazioni su sezionamento" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Fornisce il supporto per la scrittura di pacchetti formato Ultimaker." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Fornisce il supporto per la scrittura di pacchetti formato UltiMaker." #: /UFPWriter/plugin.json msgctxt "name" @@ -6567,12 +6567,12 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Fornisce azioni macchina per le macchine Ultimaker (come la procedura guidata di livellamento del piano di stampa, la selezione degli aggiornamenti, ecc.)" +msgstr "Fornisce azioni macchina per le macchine UltiMaker (come la procedura guidata di livellamento del piano di stampa, la selezione degli aggiornamenti, ecc.)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Azioni della macchina Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Azioni della macchina UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6589,7 +6589,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Gestisce le estensioni per l'applicazione e consente di ricercare le estensioni nel sito Web Ultimaker." +msgstr "Gestisce le estensioni per l'applicazione e consente di ricercare le estensioni nel sito Web UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6941,8 +6941,8 @@ msgstr "Writer codice G" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Fornisce il supporto per la lettura di pacchetti formato Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Fornisce il supporto per la lettura di pacchetti formato UltiMaker." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 6bea632653..0380e5cdac 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -442,8 +442,8 @@ msgstr "新しいサインインプロセスを開始できません。別のサ #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Ultimaker アカウントサーバーに到達できません。" +msgid "Unable to reach the UltiMaker account server." +msgstr "UltiMaker アカウントサーバーに到達できません。" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -718,7 +718,7 @@ msgstr "Curaを開始できません" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

    Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

    Oops, UltiMaker Cura has encountered something that doesn't seem right." "

    \n" "

    We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -728,13 +728,13 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    申し訳ありません。Ultimaker Cura で何らかの不具合が生じています。

    \n

    開始時に回復不能のエラーが発生しました。不適切なファイル設定が原因の可能性があります。バックアップを実行してからリセットしてください。

    \n" +msgstr "

    申し訳ありません。UltiMaker Cura で何らかの不具合が生じています。

    \n

    開始時に回復不能のエラーが発生しました。不適切なファイル設定が原因の可能性があります。バックアップを実行してからリセットしてください。

    \n" "

    バックアップは、設定フォルダに保存されます。

    \n

    問題解決のために、このクラッシュ報告をお送りください。

    \n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "クラッシュ報告をUltimakerに送信する" +msgid "Send crash report to UltiMaker" +msgstr "クラッシュ報告をUltiMakerに送信する" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -933,9 +933,9 @@ msgstr "ネットワークエラー" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Ultimakerアカウントから新しいプリンターが検出されました" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "UltiMakerアカウントから新しいプリンターが検出されました" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -1085,9 +1085,9 @@ msgstr "プリンターを取り除く" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "Ultimaker Connectを実行していないプリンターに接続しようとしています。プリンターを最新のファームウェアに更新してください。" +msgstr "UltiMaker Connectを実行していないプリンターに接続しようとしています。プリンターを最新のファームウェアに更新してください。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1314,8 +1314,8 @@ msgstr "UFPファイルに書き込めません：" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimakerフォーマットパッケージ" +msgid "UltiMaker Format Package" +msgstr "UltiMakerフォーマットパッケージ" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1438,8 +1438,8 @@ msgstr "材料パッケージとソフトウェアパッケージをアカウン #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Ultimakerアカウントから変更が検出されました" +msgid "Changes detected from your UltiMaker account" +msgstr "UltiMakerアカウントから変更が検出されました" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1601,8 +1601,8 @@ msgstr "バグを報告" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Ultimaker Curaの問題追跡ツールでバグを報告してください。" +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "UltiMaker Curaの問題追跡ツールでバグを報告してください。" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1747,8 +1747,8 @@ msgstr "プロジェクトファイル{0}は破損してい msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "プロジェクトファイル{0}はこのバージョンのUltimaker Curaでは認識できないプロファイルを使用して作成されています。" +"unknown to this version of UltiMaker Cura." +msgstr "プロジェクトファイル{0}はこのバージョンのUltiMaker Curaでは認識できないプロファイルを使用して作成されています。" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -1776,7 +1776,7 @@ msgid "" "p>\n" "

    View print quality " "guide

    " -msgstr "

    モデルのサイズまたは材料の設定によっては、適切に印刷しない3Dモデルがあります。:

    \n

    {model_names}

    \n

    可能な限り最高の品質および信頼性を得る方法をご覧ください。

    \n

    印字品質ガイドを見る

    " +msgstr "

    モデルのサイズまたは材料の設定によっては、適切に印刷しない3Dモデルがあります。:

    \n

    {model_names}

    \n

    可能な限り最高の品質および信頼性を得る方法をご覧ください。

    \n

    印字品質ガイドを見る

    " #: /Users/c.lamboo/ultimaker/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 msgctxt "@item:inmenu" @@ -2413,9 +2413,9 @@ msgstr "キューをリモートで管理するには、プリンターのファ #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "クラウドプリンターのウェブカムフィードをUltimaker Curaから見ることができません。「プリンター管理」をクリックして、Ultimaker Digital Factoryにアクセスし、このウェブカムを見ます。" +msgstr "クラウドプリンターのウェブカムフィードをUltiMaker Curaから見ることができません。「プリンター管理」をクリックして、Ultimaker Digital Factoryにアクセスし、このウェブカムを見ます。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2794,9 +2794,9 @@ msgstr "匿名データの収集に関する詳細" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために匿名データを収集します。以下は、共有されるすべてのデータの例です：" +msgstr "UltiMaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために匿名データを収集します。以下は、共有されるすべてのデータの例です：" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2820,8 +2820,8 @@ msgstr "Curaプロジェクトを保存する" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "このUltimaker Originalに施されたアップグレートを選択する" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "このUltiMaker Originalに施されたアップグレートを選択する" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2923,9 +2923,9 @@ msgstr "プラグインのインストール" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、Ultimaker Cura体験をカスタマイズすることができます。" +msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、UltiMaker Cura体験をカスタマイズすることができます。" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -2986,9 +2986,9 @@ msgstr "材料のインストール" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Ultimaker 3Dプリンターに最適な材料プロファイルを選択してインストールします。" +msgstr "UltiMaker 3Dプリンターに最適な材料プロファイルを選択してインストールします。" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3109,18 +3109,18 @@ msgstr "さらに読み込む" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Ultimaker検証済みプラグイン" +msgid "UltiMaker Verified Plug-in" +msgstr "UltiMaker検証済みプラグイン" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Ultimaker認定材料" +msgid "UltiMaker Certified Material" +msgstr "UltiMaker認定材料" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Ultimaker検証済みパッケージ" +msgid "UltiMaker Verified Package" +msgstr "UltiMaker検証済みパッケージ" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3130,9 +3130,9 @@ msgstr "パッケージの管理" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Ultimaker Curaのプラグインと材料プロファイルはここで管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。" +msgstr "UltiMaker Curaのプラグインと材料プロファイルはここで管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4447,10 +4447,10 @@ msgstr "プライバシー" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "プリンターの不明なデータをUltimakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。" +msgstr "プリンターの不明なデータをUltiMakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4766,8 +4766,8 @@ msgstr "トラブルシューティング" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Ultimakerのプラットフォームにサインイン" +msgid "Sign in to the UltiMaker platform" +msgstr "UltiMakerのプラットフォームにサインイン" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4781,8 +4781,8 @@ msgstr "材料設定とプラグインのバックアップと同期" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Ultimakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "UltiMakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4791,20 +4791,20 @@ msgstr "スキップ" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "無料のUltimakerアカウントを作成" +msgid "Create a free UltiMaker Account" +msgstr "無料のUltiMakerアカウントを作成" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Ultimaker Cura の改善にご協力ください" +msgid "Help us to improve UltiMaker Cura" +msgstr "UltiMaker Cura の改善にご協力ください" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" -"Ultimaker Cura collects anonymous data to improve print quality and user " +"UltiMaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために以下の匿名データを収集します:" +msgstr "UltiMaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために以下の匿名データを収集します:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4829,8 +4829,8 @@ msgstr "プリント設定" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" msgid "" -"Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Ultimaker Cura が収集したデータには個人データは含まれません。" +"Data collected by UltiMaker Cura will not contain any personal information." +msgstr "UltiMaker Cura が収集したデータには個人データは含まれません。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4900,8 +4900,8 @@ msgstr "デバイスに接続できません。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Ultimakerプリンターに接続できませんか？" +msgid "Can't connect to your UltiMaker printer?" +msgstr "UltiMakerプリンターに接続できませんか？" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4922,15 +4922,15 @@ msgstr "接続" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Ultimaker Cura にようこそ" +msgid "Welcome to UltiMaker Cura" +msgstr "UltiMaker Cura にようこそ" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" -"Please follow these steps to set up Ultimaker Cura. This will only take a " +"Please follow these steps to set up UltiMaker Cura. This will only take a " "few moments." -msgstr "以下の手順で\nUltimaker Cura を設定してください。数秒で完了します。" +msgstr "以下の手順で\nUltiMaker Cura を設定してください。数秒で完了します。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5024,7 +5024,7 @@ msgstr "フィラメントを管理する..." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:216 msgctxt "" -"@action:inmenu Marketplace is a brand name of Ultimaker's, so don't " +"@action:inmenu Marketplace is a brand name of UltiMaker's, so don't " "translate." msgid "Add more materials from Marketplace" msgstr "マーケットプレイスから材料を追加" @@ -5623,9 +5623,9 @@ msgstr "熱溶解積層型3Dプリンティングのエンドtoエンドソリ #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "CuraはUltimakerB.Vのコミュニティの協力によって開発され、Curaはオープンソースで使えることを誇りに思います:" +msgstr "CuraはUltiMakerB.Vのコミュニティの協力によって開発され、Curaはオープンソースで使えることを誇りに思います:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5830,23 +5830,23 @@ msgstr "プリントジョブをモニタリングしてプリント履歴から #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Ultimaker Curaをプラグインと材料プロファイルで拡張します。" +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "UltiMaker Curaをプラグインと材料プロファイルで拡張します。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Ultimaker eラーニングで3Dプリンティングのエキスパートになります。" +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "UltiMaker eラーニングで3Dプリンティングのエキスパートになります。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimakerのサポート" +msgid "UltiMaker support" +msgstr "UltiMakerのサポート" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Ultimaker Curaの使用を開始する方法を確認します。" +msgid "Learn how to get started with UltiMaker Cura." +msgstr "UltiMaker Curaの使用を開始する方法を確認します。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5855,8 +5855,8 @@ msgstr "質問をする" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Ultimaker Communityをご参照ください。" +msgid "Consult the UltiMaker Community." +msgstr "UltiMaker Communityをご参照ください。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5870,8 +5870,8 @@ msgstr "問題が発生していることを開発者にお知らせください #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Ultimakerウェブサイトをご確認ください。" +msgid "Visit the UltiMaker website." +msgstr "UltiMakerウェブサイトをご確認ください。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6180,12 +6180,12 @@ msgid "" "- Add material profiles and plug-ins from the Marketplace\n" "- Back-up and sync your material profiles and plug-ins\n" "- Share ideas and get help from 48,000+ users in the Ultimaker community" -msgstr "- マーケットプレースから材料プロファイルとプラグインを追加\n- 材料プロファイルとプラグインのバックアップと同期\n- Ultimakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" +msgstr "- マーケットプレースから材料プロファイルとプラグインを追加\n- 材料プロファイルとプラグインのバックアップと同期\n- UltiMakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "無料のUltimakerアカウントを作成" +msgid "Create a free UltiMaker account" +msgstr "無料のUltiMakerアカウントを作成" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6199,8 +6199,8 @@ msgstr "最終更新：%1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimakerアカウント" +msgid "UltiMaker Account" +msgstr "UltiMakerアカウント" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6424,13 +6424,13 @@ msgstr "後処理" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Ultimakerのネットワーク接属できるプリンターのネットワーク接続を管理します。" +msgid "Manages network connections to UltiMaker networked printers." +msgstr "UltiMakerのネットワーク接属できるプリンターのネットワーク接続を管理します。" #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimakerネットワーク接続" +msgid "UltiMaker Network Connection" +msgstr "UltiMakerネットワーク接続" #: /3MFWriter/plugin.json msgctxt "description" @@ -6464,8 +6464,8 @@ msgstr "スライスインフォメーション" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Ultimakerフォーマットパッケージへの書き込みをサポートします。" +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "UltiMakerフォーマットパッケージへの書き込みをサポートします。" #: /UFPWriter/plugin.json msgctxt "name" @@ -6519,11 +6519,11 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Ultimakerのプリンターのアクションを供給する（ベッドレベリングウィザード、アップグレードの選択、他）" +msgstr "UltiMakerのプリンターのアクションを供給する（ベッドレベリングウィザード、アップグレードの選択、他）" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" +msgid "UltiMaker machine actions" msgstr "Ultimkerプリンターのアクション" #: /GCodeGzReader/plugin.json @@ -6541,7 +6541,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "アプリケーションの拡張機能を管理し、Ultimakerウェブサイトから拡張機能を参照できるようにします。" +msgstr "アプリケーションの拡張機能を管理し、UltiMakerウェブサイトから拡張機能を参照できるようにします。" #: /Marketplace/plugin.json msgctxt "name" @@ -6893,8 +6893,8 @@ msgstr "G-codeライター" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Ultimakerフォーマットパッケージの読み込みをサポートします。" +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "UltiMakerフォーマットパッケージの読み込みをサポートします。" #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 96dff02c38..432da63c3b 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -442,8 +442,8 @@ msgstr "새 로그인 작업을 시작할 수 없습니다. 다른 로그인 작 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Ultimaker 계정 서버에 도달할 수 없음." +msgid "Unable to reach the UltiMaker account server." +msgstr "UltiMaker 계정 서버에 도달할 수 없음." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -718,7 +718,7 @@ msgstr "큐라를 시작할 수 없습니다" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

    Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

    Oops, UltiMaker Cura has encountered something that doesn't seem right." "

    \n" "

    We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -728,14 +728,14 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    죄송합니다, Ultimaker Cura가 정상적이지 않습니다. </ p> </ b>\n                    

    시작할 때 복구 할 수없는 오류가 발생했습니다. 이 오류는 잘못된 구성 파일로 인해 발생할 수 있습니다." +msgstr "

    죄송합니다, UltiMaker Cura가 정상적이지 않습니다. </ p> </ b>\n                    

    시작할 때 복구 할 수없는 오류가 발생했습니다. 이 오류는 잘못된 구성 파일로 인해 발생할 수 있습니다." " 설정을 백업하고 재설정하는 것이 좋습니다. </ p>\n                    

    백업은 설정 폴더에서 찾을 수 있습니다. </ p>\n                    

    문제를 해결하기 위해이 오류 보고서를 보내주십시오." " </ p>\n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "충돌 보고서를 Ultimaker에 보내기" +msgid "Send crash report to UltiMaker" +msgstr "충돌 보고서를 UltiMaker에 보내기" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -934,9 +934,9 @@ msgstr "네트워크 오류" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Ultimaker 계정에서 새 프린터가 감지되었습니다" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "UltiMaker 계정에서 새 프린터가 감지되었습니다" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -1086,9 +1086,9 @@ msgstr "프린터 제거" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "Ultimaker Connect를 실행하지 않는 프린터에 연결하려 합니다. 프린터를 최신 펌웨어로 업데이트해 주십시오." +msgstr "UltiMaker Connect를 실행하지 않는 프린터에 연결하려 합니다. 프린터를 최신 펌웨어로 업데이트해 주십시오." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1315,8 +1315,8 @@ msgstr "UFP 파일에 쓸 수 없음:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker 포맷 패키지" +msgid "UltiMaker Format Package" +msgstr "UltiMaker 포맷 패키지" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1439,8 +1439,8 @@ msgstr "귀하의 계정으로 재료와 소프트웨어 패키지를 동기화 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Ultimaker 계정에서 변경 사항이 감지되었습니다" +msgid "Changes detected from your UltiMaker account" +msgstr "UltiMaker 계정에서 변경 사항이 감지되었습니다" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1602,8 +1602,8 @@ msgstr "버그 보고" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Report a bug on Ultimaker Cura's issue tracker." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Report a bug on UltiMaker Cura's issue tracker." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1748,8 +1748,8 @@ msgstr "프로젝트 파일 {0}이 손상됨: {1}< msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "프로젝트 파일 {0}이(가) 이 버전의 Ultimaker Cura에서 확인할 수 없는 프로파일을 사용하였습니다." +"unknown to this version of UltiMaker Cura." +msgstr "프로젝트 파일 {0}이(가) 이 버전의 UltiMaker Cura에서 확인할 수 없는 프로파일을 사용하였습니다." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -1777,7 +1777,7 @@ msgid "" "p>\n" "

    View print quality " "guide

    " -msgstr "

    하나 이상의 3D 모델이 모델 크기 및 재료 구성으로 인해 최적의 상태로 인쇄되지 않을 수 있습니다.

    \n

    {model_names}

    \n

    인쇄 품질 및 안정성을 최고로 높이는 방법을 알아보십시오.

    \n

    인쇄" +msgstr "

    하나 이상의 3D 모델이 모델 크기 및 재료 구성으로 인해 최적의 상태로 인쇄되지 않을 수 있습니다.

    \n

    {model_names}

    \n

    인쇄 품질 및 안정성을 최고로 높이는 방법을 알아보십시오.

    \n

    인쇄" " 품질 가이드 보기

    " #: /Users/c.lamboo/ultimaker/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 @@ -2415,9 +2415,9 @@ msgstr "대기열을 원격으로 관리하려면 프린터 펌웨어를 업데 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "클라우드 프린터용 Webcam 피드는 Ultimaker Cura에서 볼 수 없습니다. '프린터 관리'를 클릭하여 Ultimaker Digital Factory를 방문하고 이 웹캠을 확인하십시오." +msgstr "클라우드 프린터용 Webcam 피드는 UltiMaker Cura에서 볼 수 없습니다. '프린터 관리'를 클릭하여 Ultimaker Digital Factory를 방문하고 이 웹캠을 확인하십시오." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2796,9 +2796,9 @@ msgstr "익명 데이터 수집에 대한 추가 정보" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 익명 데이터를 수집합니다. 공유되는 모든 데이터의 예는 다음과 같습니다:" +msgstr "UltiMaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 익명 데이터를 수집합니다. 공유되는 모든 데이터의 예는 다음과 같습니다:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2822,8 +2822,8 @@ msgstr "Cura 프로젝트 저장하기" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "이 Ultimaker Original에 업그레이드 할 항목을 선택하십시오" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "이 UltiMaker Original에 업그레이드 할 항목을 선택하십시오" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2925,9 +2925,9 @@ msgstr "플러그인 설치" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "당사의 놀라운 사용자 커뮤니티에서 기여한 플러그인으로 워크 플로를 간소화하고 Ultimaker Cura 경험을 맞춤화하세요." +msgstr "당사의 놀라운 사용자 커뮤니티에서 기여한 플러그인으로 워크 플로를 간소화하고 UltiMaker Cura 경험을 맞춤화하세요." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -2988,9 +2988,9 @@ msgstr "재료 설치" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Ultimaker 3D 프린터에 최적화된 재료 프로파일을 선택하고 설치하십시오." +msgstr "UltiMaker 3D 프린터에 최적화된 재료 프로파일을 선택하고 설치하십시오." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3111,18 +3111,18 @@ msgstr "더 많이 로드" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Ultimaker 검증된 플러그인" +msgid "UltiMaker Verified Plug-in" +msgstr "UltiMaker 검증된 플러그인" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Ultimaker 인증된 재료" +msgid "UltiMaker Certified Material" +msgstr "UltiMaker 인증된 재료" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Ultimaker 검증된 패키지" +msgid "UltiMaker Verified Package" +msgstr "UltiMaker 검증된 패키지" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3132,9 +3132,9 @@ msgstr "패키지 관리" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "여기서 Ultimaker Cura 플러그인 및 재료 프로파일을 관리하십시오. 플러그인을 최신 상태로 유지하고 설정을 정기적으로 백업하십시오." +msgstr "여기서 UltiMaker Cura 플러그인 및 재료 프로파일을 관리하십시오. 플러그인을 최신 상태로 유지하고 설정을 정기적으로 백업하십시오." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4449,10 +4449,10 @@ msgstr "보안" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "프린터에 대한 익명의 데이터를 Ultimaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다." +msgstr "프린터에 대한 익명의 데이터를 UltiMaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4768,8 +4768,8 @@ msgstr "문제 해결" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Ultimaker 플랫폼에 로그인" +msgid "Sign in to the UltiMaker platform" +msgstr "UltiMaker 플랫폼에 로그인" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4783,8 +4783,8 @@ msgstr "재료 설정과 플러그인 백업 및 동기화" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Ultimaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "UltiMaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4793,20 +4793,20 @@ msgstr "건너뛰기" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Ultimaker 계정 무료 생성" +msgid "Create a free UltiMaker Account" +msgstr "UltiMaker 계정 무료 생성" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Ultimaker Cura를 개선하는 데 도움을 주십시오" +msgid "Help us to improve UltiMaker Cura" +msgstr "UltiMaker Cura를 개선하는 데 도움을 주십시오" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" -"Ultimaker Cura collects anonymous data to improve print quality and user " +"UltiMaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 다음과 같은 익명 데이터를 수집합니다:" +msgstr "UltiMaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 다음과 같은 익명 데이터를 수집합니다:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4831,8 +4831,8 @@ msgstr "인쇄 설정" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" msgid "" -"Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Ultimaker Cura가 수집하는 데이터에는 개인 정보가 포함되어 있지 않습니다." +"Data collected by UltiMaker Cura will not contain any personal information." +msgstr "UltiMaker Cura가 수집하는 데이터에는 개인 정보가 포함되어 있지 않습니다." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4902,8 +4902,8 @@ msgstr "장치에 연결할 수 없습니다." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Ultimaker 프린터로 연결할 수 없습니까?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "UltiMaker 프린터로 연결할 수 없습니까?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4924,15 +4924,15 @@ msgstr "연결" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Ultimaker Cura에 오신 것을 환영합니다" +msgid "Welcome to UltiMaker Cura" +msgstr "UltiMaker Cura에 오신 것을 환영합니다" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" -"Please follow these steps to set up Ultimaker Cura. This will only take a " +"Please follow these steps to set up UltiMaker Cura. This will only take a " "few moments." -msgstr "Ultimaker Cura를 설정하려면 다음 단계로 이동하세요. 오래 걸리지 않습니다." +msgstr "UltiMaker Cura를 설정하려면 다음 단계로 이동하세요. 오래 걸리지 않습니다." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5026,7 +5026,7 @@ msgstr "재료 관리..." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:216 msgctxt "" -"@action:inmenu Marketplace is a brand name of Ultimaker's, so don't " +"@action:inmenu Marketplace is a brand name of UltiMaker's, so don't " "translate." msgid "Add more materials from Marketplace" msgstr "마켓플레이스에서 더 많은 재료 추가" @@ -5625,9 +5625,9 @@ msgstr "3D 프린팅을 위한 엔드 투 엔트 솔루션." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura는 커뮤니티와 공동으로 Ultimaker B.V.에 의해 개발되었습니다.\nCura는 다음의 오픈 소스 프로젝트를 사용합니다:" +msgstr "Cura는 커뮤니티와 공동으로 UltiMaker B.V.에 의해 개발되었습니다.\nCura는 다음의 오픈 소스 프로젝트를 사용합니다:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5832,23 +5832,23 @@ msgstr "프린트 작업을 모니터링하고 프린트 기록에서 다시 프 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "플러그인 및 재료 프로파일을 사용하여 Ultimaker Cura를 확장하십시오." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "플러그인 및 재료 프로파일을 사용하여 UltiMaker Cura를 확장하십시오." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Ultimaker e-러닝을 통해 3D 프린팅 전문가로 거듭나십시오." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "UltiMaker e-러닝을 통해 3D 프린팅 전문가로 거듭나십시오." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimaker support" +msgid "UltiMaker support" +msgstr "UltiMaker support" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Ultimaker Cura로 시작하는 방법을 알아보십시오." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "UltiMaker Cura로 시작하는 방법을 알아보십시오." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5857,8 +5857,8 @@ msgstr "질문하기" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Ultimaker 커뮤니티에 문의하십시오." +msgid "Consult the UltiMaker Community." +msgstr "UltiMaker 커뮤니티에 문의하십시오." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5872,8 +5872,8 @@ msgstr "개발자에게 문제를 알려주십시오." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Ultimaker 웹 사이트를 방문하십시오." +msgid "Visit the UltiMaker website." +msgstr "UltiMaker 웹 사이트를 방문하십시오." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6181,13 +6181,13 @@ msgctxt "@text" msgid "" "- Add material profiles and plug-ins from the Marketplace\n" "- Back-up and sync your material profiles and plug-ins\n" -"- Share ideas and get help from 48,000+ users in the Ultimaker community" -msgstr "- 재료 설정 및 Marketplace 플러그인 추가\n- 재료 설정과 플러그인 백업 및 동기화\n- Ultimaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기" +"- Share ideas and get help from 48,000+ users in the UltiMaker community" +msgstr "- 재료 설정 및 Marketplace 플러그인 추가\n- 재료 설정과 플러그인 백업 및 동기화\n- UltiMaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Ultimaker 계정 무료 생성" +msgid "Create a free UltiMaker account" +msgstr "UltiMaker 계정 무료 생성" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6201,8 +6201,8 @@ msgstr "마지막 업데이트: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker 계정" +msgid "UltiMaker Account" +msgstr "UltiMaker 계정" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6244,7 +6244,7 @@ msgstr "클라우드 프린터가 오프라인 상태입니다. 프린터가 켜 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterSelector/MachineSelector.qml:51 msgctxt "@status" msgid "" -"This printer is not linked to your account. Please visit the Ultimaker " +"This printer is not linked to your account. Please visit the UltiMaker " "Digital Factory to establish a connection." msgstr "해당 프린터가 사용자의 계정에 연결되어 있지 않습니다. Ultimaker Digital Factory에 방문하여 연결을 설정하십시오." @@ -6426,13 +6426,13 @@ msgstr "후처리" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Ultimaker 네트워크 연결 프린터에 대한 네트워크 연결을 관리합니다." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "UltiMaker 네트워크 연결 프린터에 대한 네트워크 연결을 관리합니다." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker 네트워크 연결" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker 네트워크 연결" #: /3MFWriter/plugin.json msgctxt "description" @@ -6466,8 +6466,8 @@ msgstr "슬라이스 정보" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Ultimaker 포맷 패키지 작성을 지원합니다." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "UltiMaker 포맷 패키지 작성을 지원합니다." #: /UFPWriter/plugin.json msgctxt "name" @@ -6484,7 +6484,7 @@ msgstr "디지털 라이브러리와 연결하여 Cura에서 디지털 라이브 #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Ultimaker 디지털 라이브러리" +msgstr "UltiMaker 디지털 라이브러리" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6519,14 +6519,14 @@ msgstr "Trimesh 리더" #: /UltimakerMachineActions/plugin.json msgctxt "description" msgid "" -"Provides machine actions for Ultimaker machines (such as bed leveling " +"Provides machine actions for UltiMaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Ultimaker 기계에 대한 기계 작동 제공(예 : 침대 수평 조정 마법사, 업그레이드 선택 등)" +msgstr "UltiMaker 기계에 대한 기계 작동 제공(예 : 침대 수평 조정 마법사, 업그레이드 선택 등)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker 기기 동작" +msgid "UltiMaker machine actions" +msgstr "UltiMaker 기기 동작" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6542,8 +6542,8 @@ msgstr "압축 된 G 코드 리더기" msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " -"the Ultimaker website." -msgstr "응용 프로그램의 확장을 관리하고 Ultimaker 웹 사이트에서 확장을 검색할 수 있습니다." +"the UltiMaker website." +msgstr "응용 프로그램의 확장을 관리하고 UltiMaker 웹 사이트에서 확장을 검색할 수 있습니다." #: /Marketplace/plugin.json msgctxt "name" @@ -6895,8 +6895,8 @@ msgstr "GCode 작성자" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Ultimaker 포맷 패키지 읽기를 지원합니다." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "UltiMaker 포맷 패키지 읽기를 지원합니다." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index c015cf77d5..b681e5cd06 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "Er kan geen nieuw aanmeldingsproces worden gestart. Controleer of een an #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Kan de Ultimaker-accountserver niet bereiken." +msgid "Unable to reach the UltiMaker account server." +msgstr "Kan de UltiMaker-accountserver niet bereiken." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -719,7 +719,7 @@ msgstr "Cura kan niet worden gestart" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113 msgctxt "@label crash message" msgid "" -"

    Oops, Ultimaker Cura has encountered something that doesn't seem right." +"

    Oops, UltiMaker Cura has encountered something that doesn't seem right." "

    \n" "

    We encountered an unrecoverable error during start " "up. It was possibly caused by some incorrect configuration files. We suggest " @@ -729,15 +729,15 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    Oeps, Ultimaker Cura heeft een probleem gedetecteerd.

    \n

    Tijdens het opstarten is een onherstelbare fout opgetreden." +msgstr "

    Oeps, UltiMaker Cura heeft een probleem gedetecteerd.

    \n

    Tijdens het opstarten is een onherstelbare fout opgetreden." " Deze fout is mogelijk veroorzaakt door enkele onjuiste configuratiebestanden. Het wordt aanbevolen een back-up te maken en de standaardinstelling van" " uw configuratie te herstellen.

    \n

    Back-ups bevinden zich in de configuratiemap.

    \n

    Stuur ons dit crashrapport" " om het probleem op te lossen.

    \n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Het crashrapport naar Ultimaker verzenden" +msgid "Send crash report to UltiMaker" +msgstr "Het crashrapport naar UltiMaker verzenden" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -937,10 +937,10 @@ msgstr "Netwerkfout" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" -msgid_plural "New printers detected from your Ultimaker account" -msgstr[0] "Nieuwe printer gedetecteerd van uw Ultimaker-account" -msgstr[1] "Nieuwe printers gedetecteerd van uw Ultimaker-account" +msgid "New printer detected from your UltiMaker account" +msgid_plural "New printers detected from your UltiMaker account" +msgstr[0] "Nieuwe printer gedetecteerd van uw UltiMaker-account" +msgstr[1] "Nieuwe printers gedetecteerd van uw UltiMaker-account" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29 #, python-brace-format @@ -1093,9 +1093,9 @@ msgstr "Printers verwijderen" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "" -"You are attempting to connect to a printer that is not running Ultimaker " +"You are attempting to connect to a printer that is not running UltiMaker " "Connect. Please update the printer to the latest firmware." -msgstr "U probeert verbinding te maken met een printer waarop Ultimaker Connect niet wordt uitgevoerd. Werk de printer bij naar de nieuwste firmware." +msgstr "U probeert verbinding te maken met een printer waarop UltiMaker Connect niet wordt uitgevoerd. Werk de printer bij naar de nieuwste firmware." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1323,8 +1323,8 @@ msgstr "Kan niet naar UFP-bestand schrijven:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker Format Package" +msgid "UltiMaker Format Package" +msgstr "UltiMaker Format Package" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1448,8 +1448,8 @@ msgstr "Wilt u materiaal- en softwarepackages synchroniseren met uw account?" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Wijzigingen gedetecteerd van uw Ultimaker-account" +msgid "Changes detected from your UltiMaker account" +msgstr "Wijzigingen gedetecteerd van uw UltiMaker-account" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1611,8 +1611,8 @@ msgstr "Een fout melden" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Meld een fout via de issue tracker van Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Meld een fout via de issue tracker van UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1760,8 +1760,8 @@ msgstr "Projectbestand {0} is corrupt: {1}!" msgid "" "Project file {0} is made using profiles that are " -"unknown to this version of Ultimaker Cura." -msgstr "Projectbestand {0} wordt gemaakt met behulp van profielen die onbekend zijn bij deze versie van Ultimaker Cura." +"unknown to this version of UltiMaker Cura." +msgstr "Projectbestand {0} wordt gemaakt met behulp van profielen die onbekend zijn bij deze versie van UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2433,9 +2433,9 @@ msgstr "Werk de firmware van uw printer bij om de wachtrij op afstand te beheren #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Vanuit Ultimaker Cura kunt u de webcamfeeds voor cloudprinters niet bekijken. Klik op 'Printer beheren' om Ultimaker Digital Factory te bezoeken en deze" +msgstr "Vanuit UltiMaker Cura kunt u de webcamfeeds voor cloudprinters niet bekijken. Klik op 'Printer beheren' om Ultimaker Digital Factory te bezoeken en deze" " webcam te bekijken." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2817,9 +2817,9 @@ msgstr "Meer informatie over anonieme gegevensverzameling" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" msgid "" -"Ultimaker Cura collects anonymous data in order to improve the print quality " +"UltiMaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren. Hieronder ziet u een voorbeeld van alle gegevens die" +msgstr "UltiMaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren. Hieronder ziet u een voorbeeld van alle gegevens die" " worden gedeeld:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 @@ -2844,8 +2844,8 @@ msgstr "Cura-project opslaan" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Selecteer eventuele upgrades die op deze Ultimaker Original zijn uitgevoerd" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Selecteer eventuele upgrades die op deze UltiMaker Original zijn uitgevoerd" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2949,9 +2949,9 @@ msgstr "Plugins installeren" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" msgid "" -"Streamline your workflow and customize your Ultimaker Cura experience with " +"Streamline your workflow and customize your UltiMaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Stroomlijn uw workflow en pas uw Ultimaker Cura-ervaring aan de eisen aan met plugins die zijn geleverd door onze fantastische gebruikersgemeenschap." +msgstr "Stroomlijn uw workflow en pas uw UltiMaker Cura-ervaring aan de eisen aan met plugins die zijn geleverd door onze fantastische gebruikersgemeenschap." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3012,9 +3012,9 @@ msgstr "Materialen installeren" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" msgid "" -"Select and install material profiles optimised for your Ultimaker 3D " +"Select and install material profiles optimised for your UltiMaker 3D " "printers." -msgstr "Selecteer en installeer materiaalprofielen die zijn geoptimaliseerd voor uw Ultimaker 3D-printers." +msgstr "Selecteer en installeer materiaalprofielen die zijn geoptimaliseerd voor uw UltiMaker 3D-printers." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3135,18 +3135,18 @@ msgstr "Meer laden" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Geverifieerde Ultimaker-plug-in" +msgid "UltiMaker Verified Plug-in" +msgstr "Geverifieerde UltiMaker-plug-in" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Gecertificeerd Ultimaker-materiaal" +msgid "UltiMaker Certified Material" +msgstr "Gecertificeerd UltiMaker-materiaal" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Geverifieerd Ultimaker-pakket" +msgid "UltiMaker Verified Package" +msgstr "Geverifieerd UltiMaker-pakket" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3156,9 +3156,9 @@ msgstr "Pakketten beheren" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" msgid "" -"Manage your Ultimaker Cura plugins and material profiles here. Make sure to " +"Manage your UltiMaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Beheer hier uw Ultimaker Cura-plug-ins en materiaalprofielen. Zorg ervoor dat uw plug-ins up-to-date blijven en maak regelmatig een back-up van uw instellingen." +msgstr "Beheer hier uw UltiMaker Cura-plug-ins en materiaalprofielen. Zorg ervoor dat uw plug-ins up-to-date blijven en maak regelmatig een back-up van uw instellingen." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4482,10 +4482,10 @@ msgstr "Privacy" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" msgid "" -"Should anonymous data about your print be sent to Ultimaker? Note, no " +"Should anonymous data about your print be sent to UltiMaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "Mogen anonieme gegevens over uw print naar Ultimaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare" +msgstr "Mogen anonieme gegevens over uw print naar UltiMaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare" " gegevens verzonden of opgeslagen." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 @@ -4804,8 +4804,8 @@ msgstr "Probleemoplossing" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Meld u aan op het Ultimaker-platform" +msgid "Sign in to the UltiMaker platform" +msgstr "Meld u aan op het UltiMaker-platform" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4819,8 +4819,8 @@ msgstr "Maak een back-up van uw materiaalinstellingen en plug-ins en synchronise #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Deel ideeën met 48,000+ gebruikers in de Ultimaker Community of vraag hen om ondersteuning" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Deel ideeën met 48,000+ gebruikers in de UltiMaker Community of vraag hen om ondersteuning" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4829,20 +4829,20 @@ msgstr "Overslaan" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Maak een gratis Ultimaker-account aan" +msgid "Create a free UltiMaker Account" +msgstr "Maak een gratis UltiMaker-account aan" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Help ons Ultimaker Cura te verbeteren" +msgid "Help us to improve UltiMaker Cura" +msgstr "Help ons UltiMaker Cura te verbeteren" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" "Ultimaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren, waaronder:" +msgstr "UltiMaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren, waaronder:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4868,7 +4868,7 @@ msgstr "Instellingen voor printen" msgctxt "@text" msgid "" "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "De gegevens die Ultimaker Cura verzamelt, bevatten geen persoonlijke informatie." +msgstr "De gegevens die UltiMaker Cura verzamelt, bevatten geen persoonlijke informatie." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4938,8 +4938,8 @@ msgstr "Kan geen verbinding maken met het apparaat." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Kunt u geen verbinding maken met uw Ultimaker-printer?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Kunt u geen verbinding maken met uw UltiMaker-printer?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4960,15 +4960,15 @@ msgstr "Verbinding maken" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Welkom bij Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Welkom bij UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" "Please follow these steps to set up Ultimaker Cura. This will only take a " "few moments." -msgstr "Volg deze stappen voor het instellen van\nUltimaker Cura. Dit duurt slechts even." +msgstr "Volg deze stappen voor het instellen van\nUltiMaker Cura. Dit duurt slechts even." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5666,9 +5666,9 @@ msgstr "End-to-end-oplossing voor fused filament 3D-printen." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura is ontwikkeld door Ultimaker B.V. in samenwerking met de community.\nCura maakt met trots gebruik van de volgende opensourceprojecten:" +msgstr "Cura is ontwikkeld door UltiMaker B.V. in samenwerking met de community.\nCura maakt met trots gebruik van de volgende opensourceprojecten:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5873,23 +5873,23 @@ msgstr "Volg printtaken en print opnieuw vanuit uw printgeschiedenis." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Breid Ultimaker Cura uit met plug-ins en materiaalprofielen." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Breid UltiMaker Cura uit met plug-ins en materiaalprofielen." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Word een 3D-printexpert met Ultimaker e-learning." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Word een 3D-printexpert met UltiMaker e-learning." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ondersteuning van Ultimaker" +msgid "UltiMaker support" +msgstr "Ondersteuning van UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Leer hoe u aan de slag gaat met Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Leer hoe u aan de slag gaat met UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5898,8 +5898,8 @@ msgstr "Stel een vraag" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Consulteer de Ultimaker Community." +msgid "Consult the UltiMaker Community." +msgstr "Consulteer de UltiMaker Community." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5913,8 +5913,8 @@ msgstr "Laat ontwikkelaars weten dat er iets misgaat." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Bezoek de Ultimaker-website." +msgid "Visit the UltiMaker website." +msgstr "Bezoek de UltiMaker-website." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6234,8 +6234,8 @@ msgstr "- Voeg materiaalprofielen en plug-ins toe uit de Marktplaats\n- Maak bac #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Maak een gratis Ultimaker-account aan" +msgid "Create a free UltiMaker account" +msgstr "Maak een gratis UltiMaker-account aan" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6249,8 +6249,8 @@ msgstr "Laatste update: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker-account" +msgid "UltiMaker Account" +msgstr "UltiMaker-account" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6474,13 +6474,13 @@ msgstr "Nabewerking" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Hiermee beheert u netwerkverbindingen naar Ultimaker-netwerkprinters." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Hiermee beheert u netwerkverbindingen naar UltiMaker-netwerkprinters." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker-netwerkverbinding" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker-netwerkverbinding" #: /3MFWriter/plugin.json msgctxt "description" @@ -6514,8 +6514,8 @@ msgstr "Slice-informatie" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Deze optie biedt ondersteuning voor het schrijven van Ultimaker Format Packages." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Deze optie biedt ondersteuning voor het schrijven van UltiMaker Format Packages." #: /UFPWriter/plugin.json msgctxt "name" @@ -6569,12 +6569,12 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Biedt machineacties voor Ultimaker-machines (zoals wizard voor bedkalibratie, selecteren van upgrades, enz.)" +msgstr "Biedt machineacties voor UltiMaker-machines (zoals wizard voor bedkalibratie, selecteren van upgrades, enz.)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Acties Ultimaker-machines" +msgid "UltiMaker machine actions" +msgstr "Acties UltiMaker-machines" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6591,7 +6591,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Beheert extensies voor de toepassing en staat browsingextensies toe van de Ultimaker-website." +msgstr "Beheert extensies voor de toepassing en staat browsingextensies toe van de UltiMaker-website." #: /Marketplace/plugin.json msgctxt "name" @@ -6943,8 +6943,8 @@ msgstr "G-code-schrijver" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Deze optie biedt ondersteuning voor het lezen van Ultimaker Format Packages." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Deze optie biedt ondersteuning voor het lezen van UltiMaker Format Packages." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 4de3b45113..a7f128a4c3 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -1,6 +1,7 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # msgid "" msgstr "" @@ -424,8 +425,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Nie można uzyskać dostępu do serwera kont Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Nie można uzyskać dostępu do serwera kont UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -701,8 +702,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Wyślij raport błędu do Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Wyślij raport błędu do UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -902,7 +903,7 @@ msgstr "Błąd sieci" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "" msgstr[1] "" @@ -1050,8 +1051,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "Próbujesz połączyć się z drukarką, na której nie działa Ultimaker Connect. Zaktualizuj drukarkę do najnowszej wersji firmware." +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." +msgstr "Próbujesz połączyć się z drukarką, na której nie działa UltiMaker Connect. Zaktualizuj drukarkę do najnowszej wersji firmware." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1274,8 +1275,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Pakiet Formatu Ultimaker" +msgid "UltiMaker Format Package" +msgstr "Pakiet Formatu UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1396,7 +1397,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" +msgid "Changes detected from your UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 @@ -1557,7 +1558,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." +msgid "Report a bug on UltiMaker Cura's issue tracker." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 @@ -1683,7 +1684,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 @@ -2327,7 +2328,7 @@ msgstr "Zaktualizuj oprogramowanie drukarki, aby zdalnie zarządzać kolejką." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2693,8 +2694,8 @@ msgstr "Wiećej informacji o zbieraniu anonimowych danych" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkowania. Poniżej znajduje się przykład wszystkich udostępnianych danych:" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgstr "UltiMaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkowania. Poniżej znajduje się przykład wszystkich udostępnianych danych:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2718,8 +2719,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Proszę wybrać ulepszenia wykonane w tym Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Proszę wybrać ulepszenia wykonane w tym UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2814,7 +2815,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 @@ -2873,7 +2874,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 @@ -2995,17 +2996,17 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" +msgid "UltiMaker Verified Plug-in" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" +msgid "UltiMaker Certified Material" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" +msgid "UltiMaker Verified Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 @@ -3015,7 +3016,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4284,8 +4285,8 @@ msgstr "Prywatność" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do Ultimaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane." +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do UltiMaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4598,7 +4599,7 @@ msgstr "Rozwiązywanie problemów" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" +msgid "Sign in to the UltiMaker platform" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 @@ -4613,7 +4614,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 @@ -4623,18 +4624,18 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" +msgid "Create a free UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Pomóż nam ulepszyć Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Pomóż nam ulepszyć UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" -msgstr "Ultimaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkownika, w tym:" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" +msgstr "UltiMaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkownika, w tym:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4658,8 +4659,8 @@ msgstr "Ustawienia druku" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Dane zebrane przez Ultimaker Cura nie będą zawierać żadnych prywatnych danych osobowych." +msgid "Data collected by UltiMaker Cura will not contain any personal information." +msgstr "Dane zebrane przez UltiMaker Cura nie będą zawierać żadnych prywatnych danych osobowych." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4729,7 +4730,7 @@ msgstr "Nie można połączyć się z urządzeniem." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" +msgid "Can't connect to your UltiMaker printer?" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 @@ -4749,12 +4750,12 @@ msgstr "Połącz" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Witaj w Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Witaj w UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 @@ -5437,7 +5438,7 @@ msgstr "Kompletne rozwiązanie do druku przestrzennego." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" "Cura jest rozwijana przez firmę Ultimaker B.V. we współpracy ze społecznością.\n" @@ -5646,22 +5647,22 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." +msgid "Extend UltiMaker Cura with plugins and material profiles." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." +msgid "Become a 3D printing expert with UltiMaker e-learning." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" +msgid "UltiMaker support" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 @@ -5671,7 +5672,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." +msgid "Consult the UltiMaker Community." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 @@ -5686,7 +5687,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." +msgid "Visit the UltiMaker website." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 @@ -5980,7 +5981,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" +msgid "Create a free UltiMaker account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 @@ -5995,7 +5996,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" +msgid "UltiMaker Account" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 @@ -6210,13 +6211,13 @@ msgstr "Post Processing" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Zarządza połączeniami z sieciowymi drukarkami Ultimaker." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Zarządza połączeniami z sieciowymi drukarkami UltiMaker." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Połączenie sieciowe Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Połączenie sieciowe UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6250,8 +6251,8 @@ msgstr "Informacje o cięciu" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Zapewnia wsparcie dla zapisywania Pakietów Formatów Ultimaker." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Zapewnia wsparcie dla zapisywania Pakietów Formatów UltiMaker." #: /UFPWriter/plugin.json msgctxt "name" @@ -6300,13 +6301,13 @@ msgstr "Czytnik siatki trójkątów" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." -msgstr "Zapewnia czynności maszyny dla urządzeń Ultimaker (na przykład kreator poziomowania stołu, wybór ulepszeń itp.)." +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgstr "Zapewnia czynności maszyny dla urządzeń UltiMaker (na przykład kreator poziomowania stołu, wybór ulepszeń itp.)." #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Czynności maszyny Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Czynności maszyny UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6320,7 +6321,7 @@ msgstr "Czytnik Skompresowanego G-code" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." msgstr "" #: /Marketplace/plugin.json @@ -6670,8 +6671,8 @@ msgstr "Zapisywacz G-code" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Zapewnia obsługę odczytu pakietów formatu Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Zapewnia obsługę odczytu pakietów formatu UltiMaker." #: /UFPReader/plugin.json msgctxt "name" @@ -7045,8 +7046,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Zapewnia widok Symulacji." #~ msgctxt "@info:status" -#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "Wyślij i nadzoruj zadania druku z każdego miejsca, używając konta Ultimaker." +#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "Wyślij i nadzoruj zadania druku z każdego miejsca, używając konta UltiMaker." #~ msgctxt "@info:title The %s gets replaced with the printer name." #~ msgid "New %s firmware available" @@ -7091,8 +7092,8 @@ msgstr "Etap Przygotowania" #~ "Ultimaker Cura. To zajmie tylko kilka chwil." #~ msgctxt "@label" -#~ msgid "What's new in Ultimaker Cura" -#~ msgstr "Co nowego w Ultimaker Cura" +#~ msgid "What's new in UltiMaker Cura" +#~ msgstr "Co nowego w UltiMaker Cura" #~ msgctxt "@info:status" #~ msgid "The selected model was too small to load." @@ -7139,8 +7140,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Połączony z Chmurą" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Połacz z Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Połacz z UltiMaker Cloud" #~ msgctxt "@label" #~ msgid "You need to login first before you can rate" @@ -7171,8 +7172,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Cześć %1" #~ msgctxt "@button" -#~ msgid "Ultimaker account" -#~ msgstr "Konto Ultimaker" +#~ msgid "UltiMaker account" +#~ msgstr "Konto UltiMaker" #~ msgctxt "@button" #~ msgid "Sign out" @@ -7251,20 +7252,20 @@ msgstr "Etap Przygotowania" #~ msgstr "Język:" #~ msgctxt "@label" -#~ msgid "Ultimaker Cloud" -#~ msgstr "Chmura Ultimaker" +#~ msgid "UltiMaker Cloud" +#~ msgstr "Chmura UltiMaker" #~ msgctxt "@text" #~ msgid "The next generation 3D printing workflow" #~ msgstr "Nowa generacja systemu drukowania 3D" #~ msgctxt "@text" -#~ msgid "- Send print jobs to Ultimaker printers outside your local network" -#~ msgstr "- Wysyłaj zadania druku do drukarek Ultimaker poza siecią lokalną" +#~ msgid "- Send print jobs to UltiMaker printers outside your local network" +#~ msgstr "- Wysyłaj zadania druku do drukarek UltiMaker poza siecią lokalną" #~ msgctxt "@text" -#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere" -#~ msgstr "- Przechowuj ustawienia Ultimaker Cura w chmurze, aby używać w każdym miejscu" +#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere" +#~ msgstr "- Przechowuj ustawienia UltiMaker Cura w chmurze, aby używać w każdym miejscu" #~ msgctxt "@text" #~ msgid "- Get exclusive access to print profiles from leading brands" @@ -7347,8 +7348,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Pokaż Wszystkie Ustawienia" #~ msgctxt "@title:window" -#~ msgid "Ultimaker Cura" -#~ msgstr "Cura Ultimaker" +#~ msgid "UltiMaker Cura" +#~ msgstr "Cura UltiMaker" #~ msgctxt "@title:window" #~ msgid "About Cura" @@ -7431,8 +7432,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Lista kontrolna" #~ msgctxt "@label" -#~ msgid "Please select any upgrades made to this Ultimaker 2." -#~ msgstr "Proszę wybrać ulepszenia w tym Ultimaker 2." +#~ msgid "Please select any upgrades made to this UltiMaker 2." +#~ msgstr "Proszę wybrać ulepszenia w tym UltiMaker 2." #~ msgctxt "@label" #~ msgid "Olsson Block" @@ -7555,8 +7556,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Nie można uruchomić nowego zadania drukowania." #~ msgctxt "@label" -#~ msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." -#~ msgstr "Wystąpił problem z konfiguracją twojego Ultimaker'a, przez który nie można rozpocząć wydruku. Proszę rozwiąż te problemy przed kontynuowaniem." +#~ msgid "There is an issue with the configuration of your UltiMaker, which makes it impossible to start the print. Please resolve this issues before continuing." +#~ msgstr "Wystąpił problem z konfiguracją twojego UltiMaker'a, przez który nie można rozpocząć wydruku. Proszę rozwiąż te problemy przed kontynuowaniem." #~ msgctxt "@window:title" #~ msgid "Mismatched configuration" @@ -7647,20 +7648,20 @@ msgstr "Etap Przygotowania" #~ msgstr "Wystąpił błąd połączenia z chmurą." #~ msgctxt "@info:status" -#~ msgid "Uploading via Ultimaker Cloud" -#~ msgstr "Przesyłanie z Ultimaker Cloud" +#~ msgid "Uploading via UltiMaker Cloud" +#~ msgstr "Przesyłanie z UltiMaker Cloud" #~ msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Połącz z Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Połącz z UltiMaker Cloud" #~ msgctxt "@action" #~ msgid "Don't ask me again for this printer." #~ msgstr "Nie pytaj więcej dla tej drukarki." #~ msgctxt "@info:status" -#~ msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "Możesz teraz wysłać i nadzorować zadania druku z każdego miejsca, używając konta Ultimaker." +#~ msgid "You can now send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "Możesz teraz wysłać i nadzorować zadania druku z każdego miejsca, używając konta UltiMaker." #~ msgctxt "@info:status" #~ msgid "Connected!" @@ -7699,8 +7700,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Przewodnik po ustawieniach Cura" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers." -#~ msgstr "Zarządza ustawieniami połączenia sieciowego z drukarkami Ultimaker 3." +#~ msgid "Manages network connections to UltiMaker 3 printers." +#~ msgstr "Zarządza ustawieniami połączenia sieciowego z drukarkami UltiMaker 3." #~ msgctxt "name" #~ msgid "UM3 Network Connection" @@ -7803,8 +7804,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Wysyłanie danych do zdalnego klastra" #~ msgctxt "@info:status" -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Połącz z Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Połącz z UltiMaker Cloud" #~ msgctxt "@info" #~ msgid "Cura collects anonymized usage statistics." @@ -7939,20 +7940,20 @@ msgstr "Etap Przygotowania" #~ msgstr "Wybierz drukarkę połączoną z siecią, aby nadzorować." #~ msgctxt "@info" -#~ msgid "Please connect your Ultimaker printer to your local network." -#~ msgstr "Połącz drukarkę Ultimaker z twoją siecią lokalną." +#~ msgid "Please connect your UltiMaker printer to your local network." +#~ msgstr "Połącz drukarkę UltiMaker z twoją siecią lokalną." #~ msgctxt "@text:window" -#~ msgid "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." -#~ msgstr "Cura wysyła anonimowe dane do Ultimaker w celu polepszenia jakości wydruków oraz interakcji z użytkownikiem. Poniżej podano przykład wszystkich danych, jakie mogą być przesyłane." +#~ msgid "Cura sends anonymous data to UltiMaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." +#~ msgstr "Cura wysyła anonimowe dane do UltiMaker w celu polepszenia jakości wydruków oraz interakcji z użytkownikiem. Poniżej podano przykład wszystkich danych, jakie mogą być przesyłane." #~ msgctxt "@text:window" #~ msgid "I don't want to send this data" #~ msgstr "Nie chcę wysyłać danych" #~ msgctxt "@text:window" -#~ msgid "Allow sending this data to Ultimaker and help us improve Cura" -#~ msgstr "Pozwól wysłać te dane do Ultimakera i pomóż nam ulepszyć Curę" +#~ msgid "Allow sending this data to UltiMaker and help us improve Cura" +#~ msgstr "Pozwól wysłać te dane do UltiMakera i pomóż nam ulepszyć Curę" #~ msgctxt "@label" #~ msgid "No print selected" @@ -8134,8 +8135,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Nie chcę przesyłać tych danych" #~ msgctxt "@text:window" -#~ msgid "Allow sending these data to Ultimaker and help us improve Cura" -#~ msgstr "Zezwól na przesyłanie tych danych do Ultimaker i pomóż nam ulepszać Cura" +#~ msgid "Allow sending these data to UltiMaker and help us improve Cura" +#~ msgstr "Zezwól na przesyłanie tych danych do UltiMaker i pomóż nam ulepszać Cura" #~ msgctxt "@label" #~ msgid "Printer type:" @@ -8330,7 +8331,7 @@ msgstr "Etap Przygotowania" #~ msgstr "Popraw przycz. modelu" #~ msgctxt "@label" -#~ msgid "Need help improving your prints?
    Read the Ultimaker Troubleshooting Guides" +#~ msgid "Need help improving your prints?
    Read the UltiMaker Troubleshooting Guides" #~ msgstr "Potrzebujesz pomocy w ulepszaniu wydruków?
    Przeczytaj instrukcje dotyczące rozwiązywania problemów" #~ msgctxt "@title:window" @@ -8350,8 +8351,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Sprawdź kompatybilność" #~ msgctxt "@tooltip" -#~ msgid "Click to check the material compatibility on Ultimaker.com." -#~ msgstr "Kliknij, aby sprawdzić zgodność materiału na Ultimaker.com." +#~ msgid "Click to check the material compatibility on UltiMaker.com." +#~ msgstr "Kliknij, aby sprawdzić zgodność materiału na UltiMaker.com." #~ msgctxt "description" #~ msgid "Shows changes since latest checked version." @@ -8466,16 +8467,16 @@ msgstr "Etap Przygotowania" #~ "Powrócono do \"{}\"." #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers." -#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą drukarek Ultimaker 3." +#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers." +#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą drukarek UltiMaker 3." #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers." -#~ msgstr "Ta drukarka jest gospodarzem grupy %1 drukarek Ultimaker 3." +#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers." +#~ msgstr "Ta drukarka jest gospodarzem grupy %1 drukarek UltiMaker 3." #~ msgctxt "@label: arg 1 is group name" -#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "%1 nie została ustawiona do hostowania grupy podłączonych drukarek Ultimaker 3" +#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "%1 nie została ustawiona do hostowania grupy podłączonych drukarek UltiMaker 3" #~ msgctxt "@label link to connect manager" #~ msgid "Add/Remove printers" @@ -8736,12 +8737,12 @@ msgstr "Etap Przygotowania" #~ msgstr "Przeglądarka wtyczek" #~ msgctxt "@label" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@title:window" #~ msgid "SolidWorks: Export wizard" @@ -8892,8 +8893,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Zapewnia możliwość zmiany ustawień maszyny (tj. obszaru roboczego, rozmiaru dyszy itd.)" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "Zarządza połączeniem sieciowym z drukarką Ultimaker 3" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "Zarządza połączeniem sieciowym z drukarką UltiMaker 3" #~ msgctxt "description" #~ msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations." @@ -8932,8 +8933,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Pyta użytkownika czy zgadza się z naszą licencją" #~ msgctxt "description" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "Zapewnia czynności maszyny dla maszyn Ultimaker (tj. poziomowanie stołu, wybór ulepszeń, itd.)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "Zapewnia czynności maszyny dla maszyn UltiMaker (tj. poziomowanie stołu, wybór ulepszeń, itd.)" #~ msgctxt "@item:inlistbox" #~ msgid "GCode File" @@ -9039,12 +9040,12 @@ msgstr "Etap Przygotowania" #~ msgid "Resuming print..." #~ msgstr "Wznawianie drukowania ..." -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą podłączonych drukarek Ultimaker 3." +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą podłączonych drukarek UltiMaker 3." #~ msgctxt "Count is number of printers." -#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers." -#~ msgstr "Ta drukarka jest gospodarzem grupy {count} podłączonych drukarek Ultimaker 3." +#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers." +#~ msgstr "Ta drukarka jest gospodarzem grupy {count} podłączonych drukarek UltiMaker 3." #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate." #~ msgstr "{printer_name} skończyła drukowanie '{job_name}'. Proszę zabrać wydruk i potwierdzić oczyszczenie platformy roboczej." @@ -9053,8 +9054,8 @@ msgstr "Etap Przygotowania" #~ msgstr "{printer_name} jest zarezerwowana do druku '{job_name}'. Proszę zmień konfigurację drukarki, żeby pasowała do zadania dla niej, aby rozpocząć drukowanie." #~ msgctxt "@info:status" -#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "Nie można wysłać nowego zadania: ta drukarka 3D nie jest (jeszcze) ustawiona jako gospodarz grupy podłączonych drukarek Ultimaker 3." +#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "Nie można wysłać nowego zadania: ta drukarka 3D nie jest (jeszcze) ustawiona jako gospodarz grupy podłączonych drukarek UltiMaker 3." #~ msgctxt "@info:status" #~ msgid "Unable to send print job to group {cluster_name}." @@ -9179,12 +9180,12 @@ msgstr "Etap Przygotowania" #~ msgstr "Nieznany kod błędu: %1" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@label Printer status" #~ msgid "Unknown" @@ -9459,12 +9460,12 @@ msgstr "Etap Przygotowania" #~ msgstr "Ok" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy podłączonych drukarek Ultimaker 3" +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy podłączonych drukarek UltiMaker 3" #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers" -#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy %1 podłączonych drukarek Ultimaker 3" +#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers" +#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy %1 podłączonych drukarek UltiMaker 3" #~ msgctxt "@label" #~ msgid "Completed on: " @@ -9780,8 +9781,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Zapewnia podłączanie wymiennego dysku i zapisywania na bieżąco." #~ msgctxt "@info:whatsthis" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "Zarządza połączeniami sieciowymi z drukarkami Ultimaker 3" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "Zarządza połączeniami sieciowymi z drukarkami UltiMaker 3" #~ msgctxt "@label" #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}" @@ -9944,12 +9945,12 @@ msgstr "Etap Przygotowania" #~ msgstr "Zapewnia obsługę pisania plików 3MF." #~ msgctxt "@label" -#~ msgid "Ultimaker machine actions" -#~ msgstr "Działania maszyny Ultimaker" +#~ msgid "UltiMaker machine actions" +#~ msgstr "Działania maszyny UltiMaker" #~ msgctxt "@info:whatsthis" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "Zapewnia działania maszyny Ultimaker (takie jak kreator poziomowania stołu, wybierania ulepszeń itd.)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "Zapewnia działania maszyny UltiMaker (takie jak kreator poziomowania stołu, wybierania ulepszeń itd.)" #~ msgctxt "@label" #~ msgid "Cura Profile Reader" @@ -9988,8 +9989,8 @@ msgstr "Etap Przygotowania" #~ msgstr "Jeśli drukarka nie ma na liście, przeczytaj przewodnik o rozwiązywaniu problemów z drukowaniem sieciowym" #~ msgctxt "@item:inlistbox" -#~ msgid "Ultimaker" -#~ msgstr "Ultimaker" +#~ msgid "UltiMaker" +#~ msgstr "UltiMaker" #~ msgctxt "@label" #~ msgid "Support library for scientific computing " diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index ae77341568..1a925b1d99 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -1,6 +1,7 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # msgid "" msgstr "" @@ -398,8 +399,8 @@ msgstr "Não foi possível iniciar processo de sign-in. Verifique se outra tenta #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Não foi possível contactar o servidor de contas da Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Não foi possível contactar o servidor de contas da UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -651,8 +652,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Enviar relatório de falha à Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Enviar relatório de falha à UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -850,7 +851,7 @@ msgstr "Erro de rede" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "Nova impressora detectada na sua conta Ultimaker" msgstr[1] "Novas impressoras detectadas na sua conta Ultimaker" @@ -998,8 +999,8 @@ msgstr "Remover impressoras" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "Você está tentando conectar a uma impressora que não está rodando Ultimaker Connect. Por favor atualiza a impressora para o firmware mais recente." +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." +msgstr "Você está tentando conectar a uma impressora que não está rodando UltiMaker Connect. Por favor atualiza a impressora para o firmware mais recente." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1218,8 +1219,8 @@ msgstr "Não foi possível escrever no arquivo UFP:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Pacote de Formato da Ultimaker" +msgid "UltiMaker Format Package" +msgstr "Pacote de Formato da UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1333,8 +1334,8 @@ msgstr "Você quer sincronizar os pacotes de material e software com sua conta?" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Alterações detectadas de sua conta Ultimaker" +msgid "Changes detected from your UltiMaker account" +msgstr "Alterações detectadas de sua conta UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1492,8 +1493,8 @@ msgstr "Relatar um bug" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Relatar um bug no issue tracker do Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Relatar um bug no issue tracker do UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1613,8 +1614,8 @@ msgstr "Arquivo de projeto {0} está corrompido: { #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." -msgstr "O arquivo de projeto {0} foi feito usando perfis que são desconhecidos para esta versão do Ultimaker Cura." +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." +msgstr "O arquivo de projeto {0} foi feito usando perfis que são desconhecidos para esta versão do UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2237,8 +2238,8 @@ msgstr "Por favor atualize o firmware de sua impressora parar gerir a fila remot #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Fontes de webcam para impressoras de nuvem não podem ser vistas pelo Ultimaker Cura. Clique em \"Gerenciar impressora\" para visitar a Ultimaker Digital Factory e visualizar esta webcam." +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgstr "Fontes de webcam para impressoras de nuvem não podem ser vistas pelo UltiMaker Cura. Clique em \"Gerenciar impressora\" para visitar a Ultimaker Digital Factory e visualizar esta webcam." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2588,8 +2589,8 @@ msgstr "Mais informações em coleção anônima de dados" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "O Ultimaker Cura coleta dados anônimos para poder aprimorar a qualidade de impressão e experiência do usuário. Abaixo segue um exemplo de todos os dados que são compartilhados:" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgstr "O UltiMaker Cura coleta dados anônimos para poder aprimorar a qualidade de impressão e experiência do usuário. Abaixo segue um exemplo de todos os dados que são compartilhados:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2613,8 +2614,8 @@ msgstr "Salvar o projeto Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Por favor selecionar quaisquer atualizações feitas nesta Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Por favor selecionar quaisquer atualizações feitas nesta UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2708,8 +2709,8 @@ msgstr "Instalar Complementos" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." -msgstr "Simplifique seu fluxo de trabalho e personalize sua experiência do Ultimaker Cura com complementos contribuídos por nossa fantástica comunidade de usuários." +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." +msgstr "Simplifique seu fluxo de trabalho e personalize sua experiência do UltiMaker Cura com complementos contribuídos por nossa fantástica comunidade de usuários." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -2764,8 +2765,8 @@ msgstr "Instalar Materiais" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." -msgstr "Selecione e instale perfis de material otimizados para suas impressoras 3D Ultimaker." +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." +msgstr "Selecione e instale perfis de material otimizados para suas impressoras 3D UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -2884,18 +2885,18 @@ msgstr "Carregar mais" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Complemento Verificado Ultimaker" +msgid "UltiMaker Verified Plug-in" +msgstr "Complemento Verificado UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Material Certificado Ultimaker" +msgid "UltiMaker Certified Material" +msgstr "Material Certificado UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Pacote Verificado Ultimaker" +msgid "UltiMaker Verified Package" +msgstr "Pacote Verificado UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -2904,7 +2905,7 @@ msgstr "Gerir pacotes" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." msgstr "Gerencie seu complementos e perfis de materiais do Cura aqui. Se assegure de manter seus complementos atualizados e fazer backup de sua configuração regularmente." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4135,8 +4136,8 @@ msgstr "Privacidade" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "Dados anônimos sobre sua impressão podem ser enviados para a Ultimaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados." +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "Dados anônimos sobre sua impressão podem ser enviados para a UltiMaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4442,8 +4443,8 @@ msgstr "Resolução de problemas" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Entre na plataforma Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Entre na plataforma UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4457,8 +4458,8 @@ msgstr "Fazer backup e sincronizar seus ajustes de materiais e plugins" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Compartilhe ideias e consiga ajuda de mais de 48.000 usuários da Comunidade Ultimaker" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Compartilhe ideias e consiga ajuda de mais de 48.000 usuários da Comunidade UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4467,18 +4468,18 @@ msgstr "Pular" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Criar uma conta Ultimaker gratuita" +msgid "Create a free UltiMaker Account" +msgstr "Criar uma conta UltiMaker gratuita" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Nos ajude a melhor o Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Nos ajude a melhor o UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" -msgstr "O Ultimaker Cura coleta dados anônimos para melhor a qualidade de impressão e experiência do usuário, incluindo:" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" +msgstr "O UltiMaker Cura coleta dados anônimos para melhor a qualidade de impressão e experiência do usuário, incluindo:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4502,8 +4503,8 @@ msgstr "Ajustes de impressão" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Dados coletados pelo Ultimaker Cura não conterão nenhuma informação pessoal." +msgid "Data collected by UltiMaker Cura will not contain any personal information." +msgstr "Dados coletados pelo UltiMaker Cura não conterão nenhuma informação pessoal." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4572,8 +4573,8 @@ msgstr "Não foi possível conectar ao dispositivo." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Não consegue conectar à sua impressora Ultimaker?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Não consegue conectar à sua impressora UltiMaker?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4592,13 +4593,13 @@ msgstr "Conectar" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Bem-vindo ao Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Bem-vindo ao UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." -msgstr "Por favor siga estes passos para configurar o Ultimaker Cura. Isto tomará apenas alguns momentos." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." +msgstr "Por favor siga estes passos para configurar o UltiMaker Cura. Isto tomará apenas alguns momentos." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5279,7 +5280,7 @@ msgstr "Solução completa para impressão 3D com filamento fundido." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" "Cura é desenvolvido pela Ultimaker B.V. em cooperação com a comunidade.\n" @@ -5487,23 +5488,23 @@ msgstr "Monitora trabalhos de impressão e reimprime a partir do histórico." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Estende o Ultimaker Cura com complementos e perfis de material." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Estende o UltiMaker Cura com complementos e perfis de material." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Torne-se um especialista em impressão 3D com Ultimaker e-learning." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Torne-se um especialista em impressão 3D com UltiMaker e-learning." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Suporte Ultimaker" +msgid "UltiMaker support" +msgstr "Suporte UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Saiba como começar com o Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Saiba como começar com o UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5512,8 +5513,8 @@ msgstr "Fazer uma pergunta" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Consultar a Comunidade Ultimaker." +msgid "Consult the UltiMaker Community." +msgstr "Consultar a Comunidade UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5527,8 +5528,8 @@ msgstr "Deixe os desenvolvedores saberem que algo está errado." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Visita o website da Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Visita o website da UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -5819,8 +5820,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Criar uma conta Ultimaker gratuita" +msgid "Create a free UltiMaker account" +msgstr "Criar uma conta UltiMaker gratuita" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -5834,8 +5835,8 @@ msgstr "Última atualização: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Conta na Ultimaker" +msgid "UltiMaker Account" +msgstr "Conta na UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6049,13 +6050,13 @@ msgstr "Pós-processamento" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Administra conexões de rede a impressora Ultimaker conectadas." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Administra conexões de rede a impressora UltiMaker conectadas." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Conexão de Rede Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Conexão de Rede UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6089,8 +6090,8 @@ msgstr "Informação de fatiamento" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Provê suporte para a escrita de Ultimaker Format Packages (Pacotes de Formato da Ultimaker)." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Provê suporte para a escrita de UltiMaker Format Packages (Pacotes de Formato da Ultimaker)." #: /UFPWriter/plugin.json msgctxt "name" @@ -6105,7 +6106,7 @@ msgstr "Conecta-se à Digital Library, permitindo ao Cura abrir arquivos dela e #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Digital Library da Ultimaker" +msgstr "Digital Library da UltiMaker" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6139,13 +6140,13 @@ msgstr "Leitor Trimesh" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." -msgstr "Provê ações de máquina para impressoras da Ultimaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)." +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgstr "Provê ações de máquina para impressoras da UltiMaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)." #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ações de máquina Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Ações de máquina UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6159,8 +6160,8 @@ msgstr "Leitor de G-Code Comprimido" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." -msgstr "Gerencia extensões à aplicação e permite navegar extensões do sítio web da Ultimaker." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." +msgstr "Gerencia extensões à aplicação e permite navegar extensões do sítio web da UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6509,8 +6510,8 @@ msgstr "Gerador de G-Code" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Provê suporte a leitura de Pacotes de Formato Ultimaker (UFP)." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Provê suporte a leitura de Pacotes de Formato UltiMaker (UFP)." #: /UFPReader/plugin.json msgctxt "name" @@ -6825,8 +6826,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Email" #~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" -#~ msgstr "Por favor se logue para adquirir complementos e materiais verificados para o Ultimaker Cura Enterprise" +#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +#~ msgstr "Por favor se logue para adquirir complementos e materiais verificados para o UltiMaker Cura Enterprise" #~ msgctxt "@label" #~ msgid "Version" @@ -6983,16 +6984,16 @@ msgstr "Estágio de Preparação" #~ msgstr "Provê a Visão Simulada." #~ msgctxt "@info:status" -#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "Envia e monitora trabalhos de impressão de qualquer lugar usando sua conta Ultimaker." +#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "Envia e monitora trabalhos de impressão de qualquer lugar usando sua conta UltiMaker." #~ msgctxt "@info:status Ultimaker Cloud should not be translated." #~ msgid "Connect to Ultimaker Digital Factory" #~ msgstr "Conectar à Ultimaker Digital Factory" #~ msgctxt "@info" -#~ msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." -#~ msgstr "Feeds de webcam para impressoras de nuvem não podem ser vistos pelo Ultimaker Cura." +#~ msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." +#~ msgstr "Feeds de webcam para impressoras de nuvem não podem ser vistos pelo UltiMaker Cura." #~ msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" #~ msgid "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, it is recommended to update the firmware on your printer to version {latest_version}." @@ -7059,8 +7060,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Finalizar" #~ msgctxt "@label" -#~ msgid "Ultimaker Account" -#~ msgstr "Conta da Ultimaker" +#~ msgid "UltiMaker Account" +#~ msgstr "Conta da UltiMaker" #~ msgctxt "@text" #~ msgid "Your key to connected 3D printing" @@ -7075,8 +7076,8 @@ msgstr "Estágio de Preparação" #~ msgstr "- Flexibilize-se ao sincronizar sua configuração e a acessar de qualquer lugar" #~ msgctxt "@text" -#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -#~ msgstr "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras Ultimaker" +#~ msgid "- Increase efficiency with a remote workflow on UltiMaker printers" +#~ msgstr "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras UltiMaker" #~ msgctxt "@text" #~ msgid "" @@ -7087,8 +7088,8 @@ msgstr "Estágio de Preparação" #~ "o Ultimaker Cura. Isto tomará apenas alguns momentos." #~ msgctxt "@label" -#~ msgid "What's new in Ultimaker Cura" -#~ msgstr "O que há de novo no Ultimaker Cura" +#~ msgid "What's new in UltiMaker Cura" +#~ msgstr "O que há de novo no UltiMaker Cura" #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" @@ -7120,11 +7121,11 @@ msgstr "Estágio de Preparação" #~ msgctxt "info:status" #~ msgid "
      {}
    To establish a connection, please visit the Ultimaker Digital Factory." -#~ msgstr "
      {}
    Para estabelecer uma conexão, por favor visite a Ultimaker Digital Factory." +#~ msgstr "
      {}
    Para estabelecer uma conexão, por favor visite a Ultimaker Digital Factory." #~ msgctxt "@label ({} is printer name)" #~ msgid "{} will be removed until the next account sync.
    To remove {} permanently, visit Ultimaker Digital Factory.

    Are you sure you want to remove {} temporarily?" -#~ msgstr "{} será removida até a próxima sincronização de conta.
    Para remover {} permanentemente, visite a Ultimaker Digital Factory.

    Tem certeza que deseja remover {} temporariamente?" +#~ msgstr "{} será removida até a próxima sincronização de conta.
    Para remover {} permanentemente, visite a Ultimaker Digital Factory.

    Tem certeza que deseja remover {} temporariamente?" #~ msgctxt "@label" #~ msgid "" @@ -7199,8 +7200,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Conectado por Nuvem" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Conectar à Nuvem Ultimaker" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Conectar à Nuvem UltiMaker" #~ msgctxt "@label" #~ msgid "You need to login first before you can rate" @@ -7227,16 +7228,16 @@ msgstr "Estágio de Preparação" #~ msgstr "Autor" #~ msgctxt "@description" -#~ msgid "Get plugins and materials verified by Ultimaker" -#~ msgstr "Obter complementos e materiais verificados pela Ultimaker" +#~ msgid "Get plugins and materials verified by UltiMaker" +#~ msgstr "Obter complementos e materiais verificados pela UltiMaker" #~ msgctxt "@label The argument is a username." #~ msgid "Hi %1" #~ msgstr "Oi, %1" #~ msgctxt "@button" -#~ msgid "Ultimaker account" -#~ msgstr "Conta da Ultimaker" +#~ msgid "UltiMaker account" +#~ msgstr "Conta da UltiMaker" #~ msgctxt "@button" #~ msgid "Sign out" @@ -7331,20 +7332,20 @@ msgstr "Estágio de Preparação" #~ msgstr "Idioma:" #~ msgctxt "@label" -#~ msgid "Ultimaker Cloud" -#~ msgstr "Ultimaker Cloud" +#~ msgid "UltiMaker Cloud" +#~ msgstr "UltiMaker Cloud" #~ msgctxt "@text" #~ msgid "The next generation 3D printing workflow" #~ msgstr "O fluxo de trabalho da nova geração de impressão 3D" #~ msgctxt "@text" -#~ msgid "- Send print jobs to Ultimaker printers outside your local network" -#~ msgstr "- Enviar trabalhos de impressão a impressoras Ultimaker fora da sua rede local" +#~ msgid "- Send print jobs to UltiMaker printers outside your local network" +#~ msgstr "- Enviar trabalhos de impressão a impressoras UltiMaker fora da sua rede local" #~ msgctxt "@text" -#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere" -#~ msgstr "- Armazenar seus ajustes do Ultimaker Cura na nuvem para uso em qualquer local" +#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere" +#~ msgstr "- Armazenar seus ajustes do UltiMaker Cura na nuvem para uso em qualquer local" #~ msgctxt "@text" #~ msgid "- Get exclusive access to print profiles from leading brands" @@ -7431,8 +7432,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Mostrar Todos Os Ajustes" #~ msgctxt "@title:window" -#~ msgid "Ultimaker Cura" -#~ msgstr "Ultimaker Cura" +#~ msgid "UltiMaker Cura" +#~ msgstr "UltiMaker Cura" #~ msgctxt "@title:window" #~ msgid "About Cura" @@ -7515,8 +7516,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Lista de verificação" #~ msgctxt "@label" -#~ msgid "Please select any upgrades made to this Ultimaker 2." -#~ msgstr "Por favor selecione quaisquer atualizações feitas nesta Ultimaker 2." +#~ msgid "Please select any upgrades made to this UltiMaker 2." +#~ msgstr "Por favor selecione quaisquer atualizações feitas nesta UltiMaker 2." #~ msgctxt "@label" #~ msgid "Olsson Block" @@ -7639,8 +7640,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Não foi possível iniciar novo trabalho de impressão." #~ msgctxt "@label" -#~ msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." -#~ msgstr "Há um problema com a configuração de sua Ultimaker, o que torna impossível iniciar a impressão. Por favor resolva este problema antes de continuar." +#~ msgid "There is an issue with the configuration of your UltiMaker, which makes it impossible to start the print. Please resolve this issues before continuing." +#~ msgstr "Há um problema com a configuração de sua UltiMaker, o que torna impossível iniciar a impressão. Por favor resolva este problema antes de continuar." #~ msgctxt "@window:title" #~ msgid "Mismatched configuration" @@ -7731,20 +7732,20 @@ msgstr "Estágio de Preparação" #~ msgstr "Houve um erro ao conectar à nuvem." #~ msgctxt "@info:status" -#~ msgid "Uploading via Ultimaker Cloud" -#~ msgstr "Transferindo via Ultimaker Cloud" +#~ msgid "Uploading via UltiMaker Cloud" +#~ msgstr "Transferindo via UltiMaker Cloud" #~ msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Conectar à Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Conectar à UltiMaker Cloud" #~ msgctxt "@action" #~ msgid "Don't ask me again for this printer." #~ msgstr "Não me pergunte novamente para esta impressora." #~ msgctxt "@info:status" -#~ msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "Você agora pode enviar e monitorar trabalhoas de impressão de qualquer lugar usando sua conta Ultimaker." +#~ msgid "You can now send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "Você agora pode enviar e monitorar trabalhoas de impressão de qualquer lugar usando sua conta UltiMaker." #~ msgctxt "@info:status" #~ msgid "Connected!" @@ -7790,8 +7791,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Ortogonal" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers." -#~ msgstr "Gerencia conexões de rede a impressoras Ultimaker 3." +#~ msgid "Manages network connections to UltiMaker 3 printers." +#~ msgstr "Gerencia conexões de rede a impressoras UltiMaker 3." #~ msgctxt "name" #~ msgid "UM3 Network Connection" @@ -7895,8 +7896,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Enviando dados ao cluster remoto" #~ msgctxt "@info:status" -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "Conectar à Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "Conectar à UltiMaker Cloud" #~ msgctxt "@info" #~ msgid "Cura collects anonymized usage statistics." @@ -8031,20 +8032,20 @@ msgstr "Estágio de Preparação" #~ msgstr "Por favor selecione uma impressora conectada à rede para monitorar." #~ msgctxt "@info" -#~ msgid "Please connect your Ultimaker printer to your local network." -#~ msgstr "Por favor conecte sua impressora Ultimaker à sua rede local." +#~ msgid "Please connect your UltiMaker printer to your local network." +#~ msgstr "Por favor conecte sua impressora UltiMaker à sua rede local." #~ msgctxt "@text:window" -#~ msgid "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." -#~ msgstr "O Cura envia dados anonimamente para a Ultimaker de modo a aprimorar a qualidade de impressão e experiência de usuário. Abaixo há um exemplo de todos os dados que são enviados." +#~ msgid "Cura sends anonymous data to UltiMaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." +#~ msgstr "O Cura envia dados anonimamente para a UltiMaker de modo a aprimorar a qualidade de impressão e experiência de usuário. Abaixo há um exemplo de todos os dados que são enviados." #~ msgctxt "@text:window" #~ msgid "I don't want to send this data" #~ msgstr "Não desejo enviar estes dados" #~ msgctxt "@text:window" -#~ msgid "Allow sending this data to Ultimaker and help us improve Cura" -#~ msgstr "Permitir enviar estes dados à Ultimaker para ajudar a melhorar o Cura" +#~ msgid "Allow sending this data to UltiMaker and help us improve Cura" +#~ msgstr "Permitir enviar estes dados à UltiMaker para ajudar a melhorar o Cura" #~ msgctxt "@label" #~ msgid "No print selected" @@ -8246,8 +8247,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Eu não quero enviar estes dados" #~ msgctxt "@text:window" -#~ msgid "Allow sending these data to Ultimaker and help us improve Cura" -#~ msgstr "Permite o envio destes dados para a Ultimaker e nos auxilia a aprimorar o Cura" +#~ msgid "Allow sending these data to UltiMaker and help us improve Cura" +#~ msgstr "Permite o envio destes dados para a UltiMaker e nos auxilia a aprimorar o Cura" #~ msgctxt "@label" #~ msgid "Printer type:" @@ -8442,8 +8443,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Aderência à Mesa de Impressão" #~ msgctxt "@label" -#~ msgid "Need help improving your prints?
    Read the Ultimaker Troubleshooting Guides" -#~ msgstr "Precisa de ajuda para melhorar sua impressões?
    Leia os Guias de Resolução de Problema da Ultimaker" +#~ msgid "Need help improving your prints?
    Read the UltiMaker Troubleshooting Guides" +#~ msgstr "Precisa de ajuda para melhorar sua impressões?
    Leia os Guias de Resolução de Problema da UltiMaker" #~ msgctxt "@title:window" #~ msgid "Engine Log" @@ -8462,8 +8463,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Verificar compatibilidade" #~ msgctxt "@tooltip" -#~ msgid "Click to check the material compatibility on Ultimaker.com." -#~ msgstr "Clique para verificar a compatibilidade do material em Ultimaker.com." +#~ msgid "Click to check the material compatibility on UltiMaker.com." +#~ msgstr "Clique para verificar a compatibilidade do material em UltiMaker.com." #~ msgctxt "description" #~ msgid "Shows changes since latest checked version." @@ -8582,16 +8583,16 @@ msgstr "Estágio de Preparação" #~ msgstr "Contato" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers." -#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras Ultimaker 3." +#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers." +#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras UltiMaker 3." #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers." -#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras Ultimaker 3." +#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers." +#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras UltiMaker 3." #~ msgctxt "@label: arg 1 is group name" -#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "%1 não está configurada para hospedar um grupo de impressora Ultimaker 3 conectadas" +#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "%1 não está configurada para hospedar um grupo de impressora UltiMaker 3 conectadas" #~ msgctxt "@label link to connect manager" #~ msgid "Add/Remove printers" @@ -8857,12 +8858,12 @@ msgstr "Estágio de Preparação" #~ msgstr "Navegador de complementos" #~ msgctxt "@label" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@title:window" #~ msgid "SolidWorks: Export wizard" @@ -9013,8 +9014,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Provê um modo de alterar as configurações da máquina (tais como volume de impressão, tamanho de bico, etc)" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "Gerencia conexões de rede a impressoras Ultimaker 3" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "Gerencia conexões de rede a impressoras UltiMaker 3" #~ msgctxt "description" #~ msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations." @@ -9053,8 +9054,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Pergunta ao usuário uma única vez sobre concordância com a licença" #~ msgctxt "description" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "Provê ações de máquina para Ultimaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "Provê ações de máquina para UltiMaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc)" #~ msgctxt "@item:inlistbox" #~ msgid "GCode File" @@ -9160,12 +9161,12 @@ msgstr "Estágio de Preparação" #~ msgid "Resuming print..." #~ msgstr "Continuando impressão..." -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras Ultimaker 3 conectadas." +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras UltiMaker 3 conectadas." #~ msgctxt "Count is number of printers." -#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers." -#~ msgstr "Esta impressora hospeda um grupo de {count} impressoras Ultimaker 3 conectadas." +#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers." +#~ msgstr "Esta impressora hospeda um grupo de {count} impressoras UltiMaker 3 conectadas." #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate." #~ msgstr "{printer_name} acabou de imprimir '{job_name}'. Por favor colete a impressão e confirme esvaziamento da mesa." @@ -9174,8 +9175,8 @@ msgstr "Estágio de Preparação" #~ msgstr "{printer_name} está reservada para imprimir '{job_name}'. Por favor altere a configuração da impressora para combinar com este trabalho para que ela comece a imprimir." #~ msgctxt "@info:status" -#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "Incapaz de enviar novo trabalho de impressão: esta impressora 3D (ainda) não está configurada para hospedar um grupo de impressoras Ultimaker 3 conectadas." +#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "Incapaz de enviar novo trabalho de impressão: esta impressora 3D (ainda) não está configurada para hospedar um grupo de impressoras UltiMaker 3 conectadas." #~ msgctxt "@info:status" #~ msgid "Unable to send print job to group {cluster_name}." @@ -9300,12 +9301,12 @@ msgstr "Estágio de Preparação" #~ msgstr "Código de erro desconhecido: %1" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@label Printer status" #~ msgid "Unknown" @@ -9580,12 +9581,12 @@ msgstr "Estágio de Preparação" #~ msgstr "Ok" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras Ultimaker 3 conectadas." +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras UltiMaker 3 conectadas." #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers" -#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras Ultimaker 3 conectadas" +#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers" +#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras UltiMaker 3 conectadas" #~ msgctxt "@label" #~ msgid "Completed on: " @@ -9901,8 +9902,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Provê suporte a conexão a quente e gravação em unidade removível." #~ msgctxt "@info:whatsthis" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "Gerencia as conexões de rede em impressoras Ultimaker 3" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "Gerencia as conexões de rede em impressoras UltiMaker 3" #~ msgctxt "@label" #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}" @@ -10065,12 +10066,12 @@ msgstr "Estágio de Preparação" #~ msgstr "Provê suporte para escrever arquivos 3MF." #~ msgctxt "@label" -#~ msgid "Ultimaker machine actions" -#~ msgstr "Ações de máquina Ultimaker" +#~ msgid "UltiMaker machine actions" +#~ msgstr "Ações de máquina UltiMaker" #~ msgctxt "@info:whatsthis" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "Provê ações de máquina para impressoras Ultimaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "Provê ações de máquina para impressoras UltiMaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)" #~ msgctxt "@label" #~ msgid "Cura Profile Reader" @@ -10109,8 +10110,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Se a sua impressora não está listada, leia o guia de resolução de problemas em impressão de rede" #~ msgctxt "@item:inlistbox" -#~ msgid "Ultimaker" -#~ msgstr "Ultimaker" +#~ msgid "UltiMaker" +#~ msgstr "UltiMaker" #~ msgctxt "@label" #~ msgid "Support library for scientific computing " @@ -10259,8 +10260,8 @@ msgstr "Estágio de Preparação" #~ msgstr "Habilitar estruturas de suporte. Estas estruturas apóiam partes do modelo que tenham seções pendentes." #~ msgctxt "@label" -#~ msgid "Need help improving your prints? Read the Ultimaker Troubleshooting Guides" -#~ msgstr "Precisa de ajuda para melhorar suas impressões? Leia o Guia de Solução de Problemas da Ultimaker." +#~ msgid "Need help improving your prints? Read the UltiMaker Troubleshooting Guides" +#~ msgstr "Precisa de ajuda para melhorar suas impressões? Leia o Guia de Solução de Problemas da UltiMaker." #~ msgctxt "@info:status" #~ msgid "Connected over the network to {0}. Please approve the access request on the printer." diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index c44a6a62ba..69341486e2 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "Não é possível iniciar um novo processo de início de sessão. Verifi #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Não é possível aceder ao servidor da conta Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Não é possível aceder ao servidor da conta UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -733,15 +733,15 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    Ups, o Ultimaker Cura encontrou um possível problema.

    \n

    Foi encontrado um erro irrecuperável durante o arranque da" +msgstr "

    Ups, o UltiMaker Cura encontrou um possível problema.

    \n

    Foi encontrado um erro irrecuperável durante o arranque da" " aplicação. Este pode ter sido causado por alguns ficheiros de configuração incorrectos. Sugerimos que faça um backup e reponha a sua configuração.

    \n" "

    Os backups estão localizados na pasta de configuração.

    \n

    Por favor envie-nos este Relatório de Falhas" " para podermos resolver o problema.

    \n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Enviar relatório de falhas para a Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Enviar relatório de falhas para a UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -941,7 +941,7 @@ msgstr "Erro de rede" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "Nova impressora detetada a partir da sua conta Ultimaker" msgstr[1] "Novas impressoras detetadas a partir da sua conta Ultimaker" @@ -1099,7 +1099,7 @@ msgctxt "@info:status" msgid "" "You are attempting to connect to a printer that is not running Ultimaker " "Connect. Please update the printer to the latest firmware." -msgstr "Está a tentar ligar a uma impressora que não tem o Ultimaker Connect. Atualize a impressora para o firmware mais recente." +msgstr "Está a tentar ligar a uma impressora que não tem o UltiMaker Connect. Atualize a impressora para o firmware mais recente." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1327,8 +1327,8 @@ msgstr "Não é possível escrever no ficheiro UFP:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Arquivo Ultimaker Format" +msgid "UltiMaker Format Package" +msgstr "Arquivo UltiMaker Format" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1452,8 +1452,8 @@ msgstr "Pretende sincronizar o material e os pacotes de software com a sua conta #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Foram detetadas alterações da sua conta Ultimaker" +msgid "Changes detected from your UltiMaker account" +msgstr "Foram detetadas alterações da sua conta UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1615,8 +1615,8 @@ msgstr "Reportar um erro" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Reportar um erro no registo de problemas do Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Reportar um erro no registo de problemas do UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1765,7 +1765,7 @@ msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " "unknown to this version of Ultimaker Cura." -msgstr "O ficheiro de projeto {0} foi criado utilizando perfis que são desconhecidos para esta versão do Ultimaker Cura." +msgstr "O ficheiro de projeto {0} foi criado utilizando perfis que são desconhecidos para esta versão do UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2438,9 +2438,9 @@ msgstr "Atualize o firmware da impressora para gerir a fila remotamente." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Não é possível visualizar os feeds das câmaras das impressoras na cloud a partir do Ultimaker Cura. Clique em \"Gerir impressora\" para visitar o Ultimaker" +msgstr "Não é possível visualizar os feeds das câmaras das impressoras na cloud a partir do UltiMaker Cura. Clique em \"Gerir impressora\" para visitar o UltiMaker" " Digital Factory e ver esta câmara." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2824,7 +2824,7 @@ msgctxt "@text:window" msgid "" "Ultimaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "O Ultimaker Cura recolhe dados anónimos para melhorar a qualidade da impressão e a experiência do utilizador. Segue-se um exemplo de todos os dados partilhados:" +msgstr "O UltiMaker Cura recolhe dados anónimos para melhorar a qualidade da impressão e a experiência do utilizador. Segue-se um exemplo de todos os dados partilhados:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2848,8 +2848,8 @@ msgstr "Guardar projeto Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Selecione quaisquer atualizações realizadas a esta Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Selecione quaisquer atualizações realizadas a esta UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2955,7 +2955,7 @@ msgctxt "@text" msgid "" "Streamline your workflow and customize your Ultimaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Simplifique o seu fluxo de trabalho e personalize a sua utilização do Ultimaker Cura com plug-ins criados pela nossa incrível comunidade de utilizadores." +msgstr "Simplifique o seu fluxo de trabalho e personalize a sua utilização do UltiMaker Cura com plug-ins criados pela nossa incrível comunidade de utilizadores." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3018,7 +3018,7 @@ msgctxt "@text" msgid "" "Select and install material profiles optimised for your Ultimaker 3D " "printers." -msgstr "Selecione e instale perfis de materiais otimizados para as impressoras 3D Ultimaker." +msgstr "Selecione e instale perfis de materiais otimizados para as impressoras 3D UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3139,18 +3139,18 @@ msgstr "Carregar mais" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Plug-in Aprovado pela Ultimaker" +msgid "UltiMaker Verified Plug-in" +msgstr "Plug-in Aprovado pela UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Material Certificado pela Ultimaker" +msgid "UltiMaker Certified Material" +msgstr "Material Certificado pela UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Pacote Aprovado pela Ultimaker" +msgid "UltiMaker Verified Package" +msgstr "Pacote Aprovado pela UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3162,7 +3162,7 @@ msgctxt "@text" msgid "" "Manage your Ultimaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Faça aqui a gestão dos plug-ins e perfis de materiais do Ultimaker Cura. Certifique-se de que mantém os plug-ins atualizados e que efetua regularmente" +msgstr "Faça aqui a gestão dos plug-ins e perfis de materiais do UltiMaker Cura. Certifique-se de que mantém os plug-ins atualizados e que efetua regularmente" " uma cópia de segurança da sua configuração." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4489,7 +4489,7 @@ msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "Podem alguns dados anónimos sobre a impressão ser enviados para a Ultimaker? Não são enviadas, nem armazenadas, quaisquer informações pessoais, incluindo" +msgstr "Podem alguns dados anónimos sobre a impressão ser enviados para a UltiMaker? Não são enviadas, nem armazenadas, quaisquer informações pessoais, incluindo" " modelos, endereços IP ou outro tipo de identificação pessoal." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 @@ -4807,8 +4807,8 @@ msgstr "Resolução de problemas" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Inicie a sessão na plataforma Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Inicie a sessão na plataforma UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4822,8 +4822,8 @@ msgstr "Efetue uma cópia de segurança e sincronize as definições de materiai #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Partilhe ideias e obtenha ajuda dos mais de 48.000 utilizadores da Comunidade Ultimaker" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Partilhe ideias e obtenha ajuda dos mais de 48.000 utilizadores da Comunidade UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4832,20 +4832,20 @@ msgstr "Ignorar" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Crie uma Conta Ultimaker gratuita" +msgid "Create a free UltiMaker Account" +msgstr "Crie uma Conta UltiMaker gratuita" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Ajude-nos a melhorar o Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Ajude-nos a melhorar o UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" "Ultimaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "O Ultimaker Cura recolhe dados anónimos para melhorar a qualidade da impressão e a experiência do utilizador, incluindo:" +msgstr "O UltiMaker Cura recolhe dados anónimos para melhorar a qualidade da impressão e a experiência do utilizador, incluindo:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4871,7 +4871,7 @@ msgstr "Definições de impressão" msgctxt "@text" msgid "" "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Os dados recolhidos pelo Ultimaker Cura não conterão quaisquer informações pessoais." +msgstr "Os dados recolhidos pelo UltiMaker Cura não conterão quaisquer informações pessoais." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4941,8 +4941,8 @@ msgstr "Não foi possível ligar ao dispositivo." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Não se consegue ligar a uma impressora Ultimaker?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Não se consegue ligar a uma impressora UltiMaker?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4963,15 +4963,15 @@ msgstr "Ligar" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Bem-vindo ao Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Bem-vindo ao UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" "Please follow these steps to set up Ultimaker Cura. This will only take a " "few moments." -msgstr "Siga estes passos para configurar o Ultimaker Cura. Este processo irá demorar apenas alguns momentos." +msgstr "Siga estes passos para configurar o UltiMaker Cura. Este processo irá demorar apenas alguns momentos." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5669,9 +5669,9 @@ msgstr "A Solução completa para a impressão 3D por filamento fundido." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "O Cura foi desenvolvido pela Ultimaker B.V. em colaboração com a comunidade.\nO Cura tem o prazer de utilizar os seguintes projetos open source:" +msgstr "O Cura foi desenvolvido pela UltiMaker B.V. em colaboração com a comunidade.\nO Cura tem o prazer de utilizar os seguintes projetos open source:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5876,23 +5876,23 @@ msgstr "Monitorize os trabalhos de impressão e volte a imprimir a partir do his #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Tire mais partido do Ultimaker Cura com plug-ins e perfis de materiais." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Tire mais partido do UltiMaker Cura com plug-ins e perfis de materiais." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Torne-se um perito em impressão 3D com os cursos de e-learning da Ultimaker." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Torne-se um perito em impressão 3D com os cursos de e-learning da UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Suporte da Ultimaker" +msgid "UltiMaker support" +msgstr "Suporte da UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Saiba como começar a utilizar o Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Saiba como começar a utilizar o UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5901,8 +5901,8 @@ msgstr "Faça uma pergunta" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Consulte a Comunidade Ultimaker." +msgid "Consult the UltiMaker Community." +msgstr "Consulte a Comunidade UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5916,8 +5916,8 @@ msgstr "Informe os programadores quando houver algum problema." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Visite o site da Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Visite o site da UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6237,8 +6237,8 @@ msgstr "- Adicione definições de materiais e plug-ins do Marketplace\n- Efetue #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Crie uma conta Ultimaker gratuita" +msgid "Create a free UltiMaker account" +msgstr "Crie uma conta UltiMaker gratuita" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6252,8 +6252,8 @@ msgstr "Atualização mais recente: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Conta Ultimaker" +msgid "UltiMaker Account" +msgstr "Conta UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6477,13 +6477,13 @@ msgstr "Pós-Processamento" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Gere as ligações de rede com as impressoras em rede Ultimaker." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Gere as ligações de rede com as impressoras em rede UltiMaker." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ligação de rede Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Ligação de rede UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6517,8 +6517,8 @@ msgstr "Informações do seccionamento" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Permite a gravação de arquivos Ultimaker Format." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Permite a gravação de arquivos UltiMaker Format." #: /UFPWriter/plugin.json msgctxt "name" @@ -6535,7 +6535,7 @@ msgstr "Liga à Biblioteca Digital, permitindo ao Cura abrir ficheiros da Biblio #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Biblioteca Digital Ultimaker" +msgstr "Biblioteca Digital UltiMaker" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6572,12 +6572,12 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Disponibiliza funções especificas para as máquinas Ultimaker (tais como, o assistente de nivelamento da base, seleção de atualizações, etc.)." +msgstr "Disponibiliza funções especificas para as máquinas UltiMaker (tais como, o assistente de nivelamento da base, seleção de atualizações, etc.)." #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Funções para impressoras Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Funções para impressoras UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6594,7 +6594,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Faz a gestão de extensões da aplicação e permite a navegação das extensões a partir do website da Ultimaker." +msgstr "Faz a gestão de extensões da aplicação e permite a navegação das extensões a partir do website da UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6946,8 +6946,8 @@ msgstr "Gravador de G-code" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Fornece suporte para ler pacotes de formato Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Fornece suporte para ler pacotes de formato UltiMaker." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 3ef33a8dcd..4b42e918af 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "Невозможно начать новый вход в систему. #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Нет связи с сервером учетных записей Ultimaker." +msgid "Unable to reach the UltiMaker account server." +msgstr "Нет связи с сервером учетных записей UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -729,14 +729,14 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    В ПО Ultimaker Cura обнаружена ошибка.

    \n

    Во время запуска обнаружена неустранимая ошибка. Возможно, она вызвана некоторыми" +msgstr "

    В ПО UltiMaker Cura обнаружена ошибка.

    \n

    Во время запуска обнаружена неустранимая ошибка. Возможно, она вызвана некоторыми" " файлами конфигурации с неправильными данными. Рекомендуется создать резервную копию конфигурации и сбросить ее.

    \n

    Резервные" " копии хранятся в папке конфигурации.

    \n

    Отправьте нам этот отчет о сбое для устранения проблемы.

    \n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Отправить отчет о сбое в Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "Отправить отчет о сбое в UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -936,7 +936,7 @@ msgstr "Ошибка сети" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "New printer detected from your Ultimaker account" msgstr[1] "New printers detected from your Ultimaker account" @@ -1098,7 +1098,7 @@ msgctxt "@info:status" msgid "" "You are attempting to connect to a printer that is not running Ultimaker " "Connect. Please update the printer to the latest firmware." -msgstr "Вы пытаетесь подключиться к принтеру, на котором не работает Ultimaker Connect. Обновите прошивку принтера до последней версии." +msgstr "Вы пытаетесь подключиться к принтеру, на котором не работает UltiMaker Connect. Обновите прошивку принтера до последней версии." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1327,8 +1327,8 @@ msgstr "Невозможно записать в файл UFP:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Пакет формата Ultimaker" +msgid "UltiMaker Format Package" +msgstr "Пакет формата UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1451,8 +1451,8 @@ msgstr "Хотите синхронизировать пакеты матери #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "В вашей учетной записи Ultimaker обнаружены изменения" +msgid "Changes detected from your UltiMaker account" +msgstr "В вашей учетной записи UltiMaker обнаружены изменения" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1614,8 +1614,8 @@ msgstr "Сообщить об ошибке" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Сообщите об ошибке в системе отслеживания проблем Ultimaker Cura." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "Сообщите об ошибке в системе отслеживания проблем UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1764,7 +1764,7 @@ msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " "unknown to this version of Ultimaker Cura." -msgstr "Файл проекта {0} создан с использованием профилей, несовместимых с данной версией Ultimaker Cura." +msgstr "Файл проекта {0} создан с использованием профилей, несовместимых с данной версией UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2438,9 +2438,9 @@ msgstr "Для удаленного управления очередью нео #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Каналы веб-камеры для облачных принтеров невозможно просмотреть из Ultimaker Cura. Щелкните «Управление принтером», чтобы просмотреть эту веб-камеру на" +msgstr "Каналы веб-камеры для облачных принтеров невозможно просмотреть из UltiMaker Cura. Щелкните «Управление принтером», чтобы просмотреть эту веб-камеру на" " сайте Ultimaker Digital Factory." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2823,7 +2823,7 @@ msgctxt "@text:window" msgid "" "Ultimaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura собирает анонимные данные для повышения качества печати и улучшения взаимодействия с пользователем. Ниже приведен пример всех передаваемых" +msgstr "UltiMaker Cura собирает анонимные данные для повышения качества печати и улучшения взаимодействия с пользователем. Ниже приведен пример всех передаваемых" " данных:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 @@ -2848,8 +2848,8 @@ msgstr "Сохранить проект Cura" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Пожалуйста, укажите любые изменения, внесённые в Ultimaker Original" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Пожалуйста, укажите любые изменения, внесённые в UltiMaker Original" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2955,7 +2955,7 @@ msgctxt "@text" msgid "" "Streamline your workflow and customize your Ultimaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Оптимизируйте свои рабочие процессы и настройте Ultimaker Cura с помощью встраиваемых модулей, разработанных экспертами нашего замечательного сообщества." +msgstr "Оптимизируйте свои рабочие процессы и настройте UltiMaker Cura с помощью встраиваемых модулей, разработанных экспертами нашего замечательного сообщества." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3018,7 +3018,7 @@ msgctxt "@text" msgid "" "Select and install material profiles optimised for your Ultimaker 3D " "printers." -msgstr "Выберите и установите профили материалов, оптимизированные для 3D-принтеров Ultimaker." +msgstr "Выберите и установите профили материалов, оптимизированные для 3D-принтеров UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3139,18 +3139,18 @@ msgstr "Загрузить еще" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Проверенный плагин Ultimaker" +msgid "UltiMaker Verified Plug-in" +msgstr "Проверенный плагин UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Сертифицированный материал Ultimaker" +msgid "UltiMaker Certified Material" +msgstr "Сертифицированный материал UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Проверенный пакет Ultimaker" +msgid "UltiMaker Verified Package" +msgstr "Проверенный пакет UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3162,7 +3162,7 @@ msgctxt "@text" msgid "" "Manage your Ultimaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Здесь можно управлять встраиваемыми модулями Ultimaker Cura и профилями материалов. Регулярно обновляйте встраиваемые модули и создавайте резервные копии" +msgstr "Здесь можно управлять встраиваемыми модулями UltiMaker Cura и профилями материалов. Регулярно обновляйте встраиваемые модули и создавайте резервные копии" " настроек." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4491,7 +4491,7 @@ msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "Можно ли отправлять анонимную информацию о вашей печати в Ultimaker? Следует отметить, что ни модели, ни IP-адреса и никакая другая персональная информация" +msgstr "Можно ли отправлять анонимную информацию о вашей печати в UltiMaker? Следует отметить, что ни модели, ни IP-адреса и никакая другая персональная информация" " не будет отправлена или сохранена." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 @@ -4810,8 +4810,8 @@ msgstr "Поиск и устранение неисправностей" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Войдите на платформу Ultimaker" +msgid "Sign in to the UltiMaker platform" +msgstr "Войдите на платформу UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4825,8 +4825,8 @@ msgstr "Выполняйте резервное копирование и син #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Делитесь идеями и получайте помощь от 48 000 пользователей в сообществе Ultimaker" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "Делитесь идеями и получайте помощь от 48 000 пользователей в сообществе UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4835,20 +4835,20 @@ msgstr "Пропустить" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Создайте бесплатную учетную запись Ultimaker" +msgid "Create a free UltiMaker Account" +msgstr "Создайте бесплатную учетную запись UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Помогите нам улучшить Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "Помогите нам улучшить UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" "Ultimaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura собирает анонимные данные для повышения качества печати и улучшения взаимодействия с пользователем, включая перечисленные ниже:" +msgstr "UltiMaker Cura собирает анонимные данные для повышения качества печати и улучшения взаимодействия с пользователем, включая перечисленные ниже:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4874,7 +4874,7 @@ msgstr "Параметры печати" msgctxt "@text" msgid "" "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Данные, собранные Ultimaker Cura, не содержат каких-либо персональных данных." +msgstr "Данные, собранные UltiMaker Cura, не содержат каких-либо персональных данных." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4944,8 +4944,8 @@ msgstr "Не удалось подключиться к устройству." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Не удается подключиться к принтеру Ultimaker?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "Не удается подключиться к принтеру UltiMaker?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4966,15 +4966,15 @@ msgstr "Подключить" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Приветствуем в Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "Приветствуем в UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" "Please follow these steps to set up Ultimaker Cura. This will only take a " "few moments." -msgstr "Выполните указанные ниже действия для настройки\nUltimaker Cura. Это займет немного времени." +msgstr "Выполните указанные ниже действия для настройки\nUltiMaker Cura. Это займет немного времени." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5675,9 +5675,9 @@ msgstr "Полное решение для 3D печати методом нап #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura разработана компанией Ultimaker B.V. совместно с сообществом.\nCura использует следующие проекты с открытым исходным кодом:" +msgstr "Cura разработана компанией UltiMaker B.V. совместно с сообществом.\nCura использует следующие проекты с открытым исходным кодом:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5882,23 +5882,23 @@ msgstr "Отслеживайте задания печати и запускай #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Расширяйте возможности Ultimaker Cura за счет плагинов и профилей материалов." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "Расширяйте возможности UltiMaker Cura за счет плагинов и профилей материалов." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Пройдите электронное обучение Ultimaker и станьте экспертом в области 3D-печати." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "Пройдите электронное обучение UltiMaker и станьте экспертом в области 3D-печати." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Поддержка Ultimaker" +msgid "UltiMaker support" +msgstr "Поддержка UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Узнайте, как начать работу с Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "Узнайте, как начать работу с UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5907,8 +5907,8 @@ msgstr "Задать вопрос" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Посоветуйтесь со специалистами в сообществе Ultimaker." +msgid "Consult the UltiMaker Community." +msgstr "Посоветуйтесь со специалистами в сообществе UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5922,8 +5922,8 @@ msgstr "Сообщите разработчикам о неполадках." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Посетите веб-сайт Ultimaker." +msgid "Visit the UltiMaker website." +msgstr "Посетите веб-сайт UltiMaker." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6239,8 +6239,8 @@ msgstr "- Добавляйте настройки материалов и пла #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Создайте бесплатную учетную запись Ultimaker" +msgid "Create a free UltiMaker account" +msgstr "Создайте бесплатную учетную запись UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6254,8 +6254,8 @@ msgstr "Последнее обновление: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Учетная запись Ultimaker" +msgid "UltiMaker Account" +msgstr "Учетная запись UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6479,13 +6479,13 @@ msgstr "Пост обработка" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Управляет сетевыми соединениями с сетевыми принтерами Ultimaker 3." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "Управляет сетевыми соединениями с сетевыми принтерами UltiMaker 3." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Соединение с сетью Ultimaker" +msgid "UltiMaker Network Connection" +msgstr "Соединение с сетью UltiMaker" #: /3MFWriter/plugin.json msgctxt "description" @@ -6519,8 +6519,8 @@ msgstr "Информация о нарезке модели" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Предоставляет поддержку для записи пакетов формата Ultimaker." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "Предоставляет поддержку для записи пакетов формата UltiMaker." #: /UFPWriter/plugin.json msgctxt "name" @@ -6537,7 +6537,7 @@ msgstr "Подключается к цифровой библиотеке, по #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Цифровая библиотека Ultimaker" +msgstr "Цифровая библиотека UltiMaker" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6574,12 +6574,12 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Предоставляет дополнительные возможности для принтеров Ultimaker (такие как мастер выравнивания стола, выбора обновления и так далее)" +msgstr "Предоставляет дополнительные возможности для принтеров UltiMaker (такие как мастер выравнивания стола, выбора обновления и так далее)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Действия с принтерами Ultimaker" +msgid "UltiMaker machine actions" +msgstr "Действия с принтерами UltiMaker" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6596,7 +6596,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Позволяет управлять расширениями приложения и просматривать расширения с веб-сайта Ultimaker." +msgstr "Позволяет управлять расширениями приложения и просматривать расширения с веб-сайта UltiMaker." #: /Marketplace/plugin.json msgctxt "name" @@ -6948,8 +6948,8 @@ msgstr "Средство записи G-кода" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Предоставляет поддержку для чтения пакетов формата Ultimaker." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "Предоставляет поддержку для чтения пакетов формата UltiMaker." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 15f440557b..178b28a8be 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -1,7 +1,7 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Cura +# Copyright (C) 2022 UltiMaker. +# This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # #, fuzzy msgid "" @@ -443,8 +443,8 @@ msgstr "Yeni bir oturum açma işlemi başlatılamıyor. Başka bir aktif oturum #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "Ultimaker hesabı sunucusuna ulaşılamadı." +msgid "Unable to reach the UltiMaker account server." +msgstr "UltiMaker hesabı sunucusuna ulaşılamadı." #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -729,14 +729,14 @@ msgid "" "

    Please send us this Crash Report to fix the problem.\n" " " -msgstr "

    Ultimaker Cura doğru görünmeyen bir şeyle karşılaştı.

    \n

    Başlatma esnasında kurtarılamaz bir hata ile karşılaştık. Muhtemelen" +msgstr "

    UltiMaker Cura doğru görünmeyen bir şeyle karşılaştı.

    \n

    Başlatma esnasında kurtarılamaz bir hata ile karşılaştık. Muhtemelen" " bazı hatalı yapılandırma dosyalarından kaynaklanıyordu. Yapılandırmanızı yedekleyip sıfırlamanızı öneriyoruz.

    \n

    Yedekler yapılandırma" " klasöründe bulunabilir.

    \n

    Sorunu düzeltmek için lütfen bu Çökme Raporunu bize gönderin.

    \n " #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "Çökme raporunu Ultimaker’a gönder" +msgid "Send crash report to UltiMaker" +msgstr "Çökme raporunu UltiMaker’a gönder" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -936,7 +936,7 @@ msgstr "Ağ hatası" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "Ultimaker hesabınızdan yeni yazıcı tespit edildi" msgstr[1] "Ultimaker hesabınızdan yeni yazıcılar tespit edildi" @@ -1095,7 +1095,7 @@ msgctxt "@info:status" msgid "" "You are attempting to connect to a printer that is not running Ultimaker " "Connect. Please update the printer to the latest firmware." -msgstr "Ultimaker Connect çalıştırmayan bir yazıcıya bağlanmaya çalışıyorsunuz. Lütfen yazıcının donanım yazılımını son sürüme güncelleyin." +msgstr "UltiMaker Connect çalıştırmayan bir yazıcıya bağlanmaya çalışıyorsunuz. Lütfen yazıcının donanım yazılımını son sürüme güncelleyin." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1323,8 +1323,8 @@ msgstr "UFP dosyasına yazamıyor:" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker Biçim Paketi" +msgid "UltiMaker Format Package" +msgstr "UltiMaker Biçim Paketi" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1447,8 +1447,8 @@ msgstr "Malzeme ve yazılım paketlerini hesabınızla senkronize etmek istiyor #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "Ultimaker hesabınızda değişiklik tespit edildi" +msgid "Changes detected from your UltiMaker account" +msgstr "UltiMaker hesabınızda değişiklik tespit edildi" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1610,8 +1610,8 @@ msgstr "Hata bildirin" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "Ultimaker Cura'nın sorun izleyicisinde hata bildirin." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "UltiMaker Cura'nın sorun izleyicisinde hata bildirin." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1759,7 +1759,7 @@ msgctxt "@info:error Don't translate the XML tag !" msgid "" "Project file {0} is made using profiles that are " "unknown to this version of Ultimaker Cura." -msgstr "{0} proje dosyası, Ultimaker Cura'nın bu sürümünde bilinmeyen profiller kullanılarak yapılmış." +msgstr "{0} proje dosyası, UltiMaker Cura'nın bu sürümünde bilinmeyen profiller kullanılarak yapılmış." #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2432,9 +2432,9 @@ msgstr "Kuyruğu uzaktan yönetmek için lütfen yazıcının donanım yazılım #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" msgid "" -"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click " +"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click " "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "Bulut yazıcıları için web kamerası akışları Ultimaker Cura'dan görüntülenemez. Ultimaker Digital Factory'i ziyaret etmek ve bu web kamerasını görüntülemek" +msgstr "Bulut yazıcıları için web kamerası akışları UltiMaker Cura'dan görüntülenemez. Ultimaker Digital Factory'i ziyaret etmek ve bu web kamerasını görüntülemek" " için \"Yazıcıyı Yönet\"i tıklayın." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 @@ -2817,7 +2817,7 @@ msgctxt "@text:window" msgid "" "Ultimaker Cura collects anonymous data in order to improve the print quality " "and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Aşağıda, paylaşılan tüm verilerin bir örneği verilmiştir:" +msgstr "UltiMaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Aşağıda, paylaşılan tüm verilerin bir örneği verilmiştir:" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2841,8 +2841,8 @@ msgstr "Cura projesini kaydet" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "Lütfen Ultimaker Original’e yapılan herhangi bir yükseltmeyi seçin" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "Lütfen UltiMaker Original’e yapılan herhangi bir yükseltmeyi seçin" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2948,7 +2948,7 @@ msgctxt "@text" msgid "" "Streamline your workflow and customize your Ultimaker Cura experience with " "plugins contributed by our amazing community of users." -msgstr "Muhteşem kullanıcı topluluğumuzun katkıda bulunduğu eklentilerle iş akışınızı kolaylaştırın ve Ultimaker Cura deneyiminizi kendinize uygun hale getirin." +msgstr "Muhteşem kullanıcı topluluğumuzun katkıda bulunduğu eklentilerle iş akışınızı kolaylaştırın ve UltiMaker Cura deneyiminizi kendinize uygun hale getirin." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -3011,7 +3011,7 @@ msgctxt "@text" msgid "" "Select and install material profiles optimised for your Ultimaker 3D " "printers." -msgstr "Ultimaker 3D yazıcılarınız için optimize edilmiş malzeme profillerini seçin ve yükleyin." +msgstr "UltiMaker 3D yazıcılarınız için optimize edilmiş malzeme profillerini seçin ve yükleyin." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -3132,18 +3132,18 @@ msgstr "Daha fazla yükle" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Ultimaker Tarafından Doğrulanmış Eklenti" +msgid "UltiMaker Verified Plug-in" +msgstr "UltiMaker Tarafından Doğrulanmış Eklenti" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Ultimaker Sertifikalı Malzeme" +msgid "UltiMaker Certified Material" +msgstr "UltiMaker Sertifikalı Malzeme" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Ultimaker Tarafından Doğrulanmış Paket" +msgid "UltiMaker Verified Package" +msgstr "UltiMaker Tarafından Doğrulanmış Paket" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3155,7 +3155,7 @@ msgctxt "@text" msgid "" "Manage your Ultimaker Cura plugins and material profiles here. Make sure to " "keep your plugins up to date and backup your setup regularly." -msgstr "Ultimaker Cura eklentilerinizi ve malzeme profillerini burada yönetin. Eklentilerinizi güncel tuttuğunuzdan ve ayarınızı düzenli olarak yedeklediğinizden" +msgstr "UltiMaker Cura eklentilerinizi ve malzeme profillerini burada yönetin. Eklentilerinizi güncel tuttuğunuzdan ve ayarınızı düzenli olarak yedeklediğinizden" " emin olun." #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4480,7 +4480,7 @@ msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " "models, IP addresses or other personally identifiable information is sent or " "stored." -msgstr "Yazdırmanızdaki anonim veriler Ultimaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz." +msgstr "Yazdırmanızdaki anonim veriler UltiMaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4797,8 +4797,8 @@ msgstr "Sorun giderme" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "Ultimaker platformuna giriş yapın" +msgid "Sign in to the UltiMaker platform" +msgstr "UltiMaker platformuna giriş yapın" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4812,8 +4812,8 @@ msgstr "Malzeme ayarlarınızı ve eklentilerinizi yedekleyin ve senkronize edin #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "Ultimaker Topluluğunda fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "UltiMaker Topluluğunda fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4822,20 +4822,20 @@ msgstr "Atla" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "Ücretsiz Ultimaker Hesabı oluşturun" +msgid "Create a free UltiMaker Account" +msgstr "Ücretsiz UltiMaker Hesabı oluşturun" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "Ultimaker Cura'yı geliştirmemiz yardım edin" +msgid "Help us to improve UltiMaker Cura" +msgstr "UltiMaker Cura'yı geliştirmemiz yardım edin" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" msgid "" "Ultimaker Cura collects anonymous data to improve print quality and user " "experience, including:" -msgstr "Ultimaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Bu veriler aşağıdakileri içerir:" +msgstr "UltiMaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Bu veriler aşağıdakileri içerir:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4861,7 +4861,7 @@ msgstr "Yazdırma ayarları" msgctxt "@text" msgid "" "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Ultimaker Cura tarafından toplanan veriler herhangi bir kişisel bilgi içermeyecektir." +msgstr "UltiMaker Cura tarafından toplanan veriler herhangi bir kişisel bilgi içermeyecektir." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4931,8 +4931,8 @@ msgstr "Cihaza bağlanılamadı." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "Ultimaker yazıcınıza bağlanamıyor musunuz?" +msgid "Can't connect to your UltiMaker printer?" +msgstr "UltiMaker yazıcınıza bağlanamıyor musunuz?" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4953,15 +4953,15 @@ msgstr "Bağlan" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "Ultimaker Cura'ya hoş geldiniz" +msgid "Welcome to UltiMaker Cura" +msgstr "UltiMaker Cura'ya hoş geldiniz" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" msgid "" "Please follow these steps to set up Ultimaker Cura. This will only take a " "few moments." -msgstr "Ultimaker Cura'yı kurmak\n için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir." +msgstr "UltiMaker Cura'yı kurmak\n için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5659,9 +5659,9 @@ msgstr "Kaynaşık filaman 3B yazdırma için kalıcı çözüm." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura, topluluk iş birliği ile Ultimaker B.V. tarafından geliştirilmiştir.\nCura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:" +msgstr "Cura, topluluk iş birliği ile UltiMaker B.V. tarafından geliştirilmiştir.\nCura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138 msgctxt "@label Description for application component" @@ -5866,23 +5866,23 @@ msgstr "Baskı işlerini takip edin ve baskı geçmişinizden yeniden baskı iş #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "Ultimaker Cura'yı eklentilerle ve malzeme profilleriyle genişletin." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "UltiMaker Cura'yı eklentilerle ve malzeme profilleriyle genişletin." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "Ultimaker e-öğrenme ile 3D baskı uzmanı olun." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "UltiMaker e-öğrenme ile 3D baskı uzmanı olun." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimaker desteği" +msgid "UltiMaker support" +msgstr "UltiMaker desteği" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "Ultimaker Cura ile işe nasıl başlayacağınızı öğrenin." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "UltiMaker Cura ile işe nasıl başlayacağınızı öğrenin." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5891,8 +5891,8 @@ msgstr "Soru gönder" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "Ultimaker Topluluğundan yardım alın." +msgid "Consult the UltiMaker Community." +msgstr "UltiMaker Topluluğundan yardım alın." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5906,8 +5906,8 @@ msgstr "Geliştiricileri sorunlarla ilgili bilgilendirin." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "Ultimaker web sitesini ziyaret edin." +msgid "Visit the UltiMaker website." +msgstr "UltiMaker web sitesini ziyaret edin." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -6219,13 +6219,13 @@ msgid "" "- Add material profiles and plug-ins from the Marketplace\n" "- Back-up and sync your material profiles and plug-ins\n" "- Share ideas and get help from 48,000+ users in the Ultimaker community" -msgstr "- Marketplace'den malzeme profilleri ve eklentiler ekleyin\n- Malzeme profillerinizi ve eklentilerinizi yedekleyin ve senkronize edin\n- Ultimaker topluluğunda" +msgstr "- Marketplace'den malzeme profilleri ve eklentiler ekleyin\n- Malzeme profillerinizi ve eklentilerinizi yedekleyin ve senkronize edin\n- UltiMaker topluluğunda" " fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "Ücretsiz Ultimaker hesabı oluşturun" +msgid "Create a free UltiMaker account" +msgstr "Ücretsiz UltiMaker hesabı oluşturun" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -6239,8 +6239,8 @@ msgstr "Son güncelleme: %1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker hesabı" +msgid "UltiMaker Account" +msgstr "UltiMaker hesabı" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6464,13 +6464,13 @@ msgstr "Son İşleme" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "Ultimaker ağındaki yazıcılar için ağ bağlantılarını yönetir." +msgid "Manages network connections to UltiMaker networked printers." +msgstr "UltiMaker ağındaki yazıcılar için ağ bağlantılarını yönetir." #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker Ağ Bağlantısı" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker Ağ Bağlantısı" #: /3MFWriter/plugin.json msgctxt "description" @@ -6504,8 +6504,8 @@ msgstr "Dilim bilgisi" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "Ultimaker Biçim Paketleri yazmak için destek sağlar." +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "UltiMaker Biçim Paketleri yazmak için destek sağlar." #: /UFPWriter/plugin.json msgctxt "name" @@ -6559,12 +6559,12 @@ msgctxt "description" msgid "" "Provides machine actions for Ultimaker machines (such as bed leveling " "wizard, selecting upgrades, etc.)." -msgstr "Ultimaker makineleri için makine eylemleri sunar (yatak dengeleme sihirbazı, yükseltme seçme vb.)" +msgstr "UltiMaker makineleri için makine eylemleri sunar (yatak dengeleme sihirbazı, yükseltme seçme vb.)" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker makine eylemleri" +msgid "UltiMaker machine actions" +msgstr "UltiMaker makine eylemleri" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6581,7 +6581,7 @@ msgctxt "description" msgid "" "Manages extensions to the application and allows browsing extensions from " "the Ultimaker website." -msgstr "Uygulamanın uzantılarını yönetir ve Ultimaker web sitesinden uzantıların incelenmesini sağlar." +msgstr "Uygulamanın uzantılarını yönetir ve UltiMaker web sitesinden uzantıların incelenmesini sağlar." #: /Marketplace/plugin.json msgctxt "name" @@ -6933,8 +6933,8 @@ msgstr "G-code Yazıcı" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "Ultimaker Biçim Paketlerinin okunması için destek sağlar." +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "UltiMaker Biçim Paketlerinin okunması için destek sağlar." #: /UFPReader/plugin.json msgctxt "name" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 2e18430d52..d7f2b8ce18 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -1,6 +1,7 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. +# Ultimaker , 2022. # msgid "" msgstr "" @@ -423,8 +424,8 @@ msgstr "无法开始新的登录过程。请检查是否仍在尝试进行另一 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "无法连接 Ultimaker 帐户服务器。" +msgid "Unable to reach the UltiMaker account server." +msgstr "无法连接 UltiMaker 帐户服务器。" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -700,8 +701,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "向 Ultimaker 发送错误报告" +msgid "Send crash report to UltiMaker" +msgstr "向 UltiMaker 发送错误报告" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -901,7 +902,7 @@ msgstr "网络错误" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "从您的 Ultimaker 帐户中检测到新的打印机" @@ -1047,8 +1048,8 @@ msgstr "删除打印机" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "您正在尝试连接未运行 Ultimaker Connect 的打印机。请将打印机更新至最新固件。" +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." +msgstr "您正在尝试连接未运行 UltiMaker Connect 的打印机。请将打印机更新至最新固件。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1274,8 +1275,8 @@ msgstr "无法写入到 UFP 文件：" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker 格式包" +msgid "UltiMaker Format Package" +msgstr "UltiMaker 格式包" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1396,8 +1397,8 @@ msgstr "是否要与您的帐户同步材料和软件包?" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "检测到您的 Ultimaker 帐户有更改" +msgid "Changes detected from your UltiMaker account" +msgstr "检测到您的 UltiMaker 帐户有更改" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1557,8 +1558,8 @@ msgstr "报告错误" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "在 Ultimaker Cura 问题跟踪器上报告错误。" +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "在 UltiMaker Cura 问题跟踪器上报告错误。" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1687,8 +1688,8 @@ msgstr "项目文件 {0} 损坏: {1}。" #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." -msgstr "项目文件 {0} 是用此 Ultimaker Cura 版本未识别的配置文件制作的。" +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." +msgstr "项目文件 {0} 是用此 UltiMaker Cura 版本未识别的配置文件制作的。" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2329,8 +2330,8 @@ msgstr "请及时更新打印机固件以远程管理打印队列。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "无法从 Ultimaker Cura 中查看云打印机的网络摄像头馈送。请单击“管理打印机”以访问 Ultimaker Digital Factory 并查看此网络摄像头。" +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgstr "无法从 UltiMaker Cura 中查看云打印机的网络摄像头馈送。请单击“管理打印机”以访问 Ultimaker Digital Factory 并查看此网络摄像头。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2695,8 +2696,8 @@ msgstr "更多关于匿名数据收集的信息" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "为了改善打印质量和用户体验，Ultimaker Cura 会收集匿名数据。以下是所有数据分享的示例：" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgstr "为了改善打印质量和用户体验，UltiMaker Cura 会收集匿名数据。以下是所有数据分享的示例：" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2720,8 +2721,8 @@ msgstr "保存 Cura 项目" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "请选择适用于 Ultimaker Original 的升级文件" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "请选择适用于 UltiMaker Original 的升级文件" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2816,8 +2817,8 @@ msgstr "安装插件" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." -msgstr "使用由我们卓越的用户社区提供的插件，简化您的工作流程并自定义 Ultimaker Cura 体验。" +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." +msgstr "使用由我们卓越的用户社区提供的插件，简化您的工作流程并自定义 UltiMaker Cura 体验。" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 msgctxt "@title" @@ -2875,8 +2876,8 @@ msgstr "安装材料" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." -msgstr "选择并安装针对您的 Ultimaker 3D 打印机经过优化的材料配置文件。" +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." +msgstr "选择并安装针对您的 UltiMaker 3D 打印机经过优化的材料配置文件。" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 msgctxt "@info:tooltip" @@ -2997,18 +2998,18 @@ msgstr "加载更多" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" -msgstr "Ultimaker 验证插件" +msgid "UltiMaker Verified Plug-in" +msgstr "UltiMaker 验证插件" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" -msgstr "Ultimaker 认证材料" +msgid "UltiMaker Certified Material" +msgstr "UltiMaker 认证材料" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" -msgstr "Ultimaker 验证包" +msgid "UltiMaker Verified Package" +msgstr "UltiMaker 验证包" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 msgctxt "@header" @@ -3017,8 +3018,8 @@ msgstr "管理包" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." -msgstr "在此处管理您的 Ultimaker Cura 插件和材料配置文件。请确保将插件保持为最新，并定期备份设置。" +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgstr "在此处管理您的 UltiMaker Cura 插件和材料配置文件。请确保将插件保持为最新，并定期备份设置。" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" @@ -4283,8 +4284,8 @@ msgstr "隐私" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "您愿意将关于您的打印数据以匿名形式发送到 Ultimaker 吗？注意：我们不会记录/发送任何模型、IP 地址或其他私人数据。" +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "您愿意将关于您的打印数据以匿名形式发送到 UltiMaker 吗？注意：我们不会记录/发送任何模型、IP 地址或其他私人数据。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4596,8 +4597,8 @@ msgstr "故障排除" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "登录 Ultimaker 平台" +msgid "Sign in to the UltiMaker platform" +msgstr "登录 UltiMaker 平台" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4611,8 +4612,8 @@ msgstr "备份和同步材料设置和插件" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "在 Ultimaker 社区分享观点并获取 48,000 多名用户的帮助" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "在 UltiMaker 社区分享观点并获取 48,000 多名用户的帮助" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4621,18 +4622,18 @@ msgstr "跳过" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "创建免费的 Ultimaker 帐户" +msgid "Create a free UltiMaker Account" +msgstr "创建免费的 UltiMaker 帐户" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "帮助我们改进 Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "帮助我们改进 UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" -msgstr "为了改善打印质量和用户体验，Ultimaker Cura 会收集匿名数据，这些数据包括：" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" +msgstr "为了改善打印质量和用户体验，UltiMaker Cura 会收集匿名数据，这些数据包括：" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4656,8 +4657,8 @@ msgstr "打印设置" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Ultimaker Cura 收集的数据不会包含任何个人信息。" +msgid "Data collected by UltiMaker Cura will not contain any personal information." +msgstr "UltiMaker Cura 收集的数据不会包含任何个人信息。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4727,8 +4728,8 @@ msgstr "无法连接到设备。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "无法连接到 Ultimaker 打印机？" +msgid "Can't connect to your UltiMaker printer?" +msgstr "无法连接到 UltiMaker 打印机？" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4747,12 +4748,12 @@ msgstr "连接" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "欢迎使用 Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "欢迎使用 UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." msgstr "" "请按照以下步骤设置\n" "Ultimaker Cura。此操作只需要几分钟时间。" @@ -5437,7 +5438,7 @@ msgstr "熔丝 3D 打印技术的的端对端解决方案。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" "Cura 由 Ultimaker B.V. 与社区合作开发。\n" @@ -5646,23 +5647,23 @@ msgstr "监控打印作业并从打印历史记录重新打印。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "用插件和材料配置文件扩展 Ultimaker Cura。" +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "用插件和材料配置文件扩展 UltiMaker Cura。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "通过 Ultimaker 线上课程教学，成为 3D 打印专家。" +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "通过 UltiMaker 线上课程教学，成为 3D 打印专家。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimaker 支持" +msgid "UltiMaker support" +msgstr "UltiMaker 支持" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "了解如何开始使用 Ultimaker Cura。" +msgid "Learn how to get started with UltiMaker Cura." +msgstr "了解如何开始使用 UltiMaker Cura。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5671,8 +5672,8 @@ msgstr "提问" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "咨询 Ultimaker 社区。" +msgid "Consult the UltiMaker Community." +msgstr "咨询 UltiMaker 社区。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5686,8 +5687,8 @@ msgstr "向开发人员报错。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "访问 Ultimaker 网站。" +msgid "Visit the UltiMaker website." +msgstr "访问 UltiMaker 网站。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -5983,8 +5984,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "创建免费的 Ultimaker 帐户" +msgid "Create a free UltiMaker account" +msgstr "创建免费的 UltiMaker 帐户" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -5998,8 +5999,8 @@ msgstr "上次更新时间：%1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker 帐户" +msgid "UltiMaker Account" +msgstr "UltiMaker 帐户" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6213,13 +6214,13 @@ msgstr "后期处理" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "管理与 Ultimaker 网络打印机的网络连接。" +msgid "Manages network connections to UltiMaker networked printers." +msgstr "管理与 UltiMaker 网络打印机的网络连接。" #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker 网络连接" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker 网络连接" #: /3MFWriter/plugin.json msgctxt "description" @@ -6253,8 +6254,8 @@ msgstr "切片信息" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "支持写入 Ultimaker 格式包。" +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "支持写入 UltiMaker 格式包。" #: /UFPWriter/plugin.json msgctxt "name" @@ -6303,13 +6304,13 @@ msgstr "Trimesh 阅读器" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." msgstr "为最后的机器提供机器操作（例如，热床调平向导，选择升级等）。" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker 打印机操作" +msgid "UltiMaker machine actions" +msgstr "UltiMaker 打印机操作" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6323,8 +6324,8 @@ msgstr "压缩 G-code 读取器" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." -msgstr "管理对应用程序的扩展并允许从 Ultimaker 网站浏览扩展。" +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." +msgstr "管理对应用程序的扩展并允许从 UltiMaker 网站浏览扩展。" #: /Marketplace/plugin.json msgctxt "name" @@ -6673,8 +6674,8 @@ msgstr "G-code 写入器" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "支持读取 Ultimaker 格式包。" +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "支持读取 UltiMaker 格式包。" #: /UFPReader/plugin.json msgctxt "name" @@ -6988,8 +6989,8 @@ msgstr "准备阶段" #~ msgstr "电子邮件" #~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" -#~ msgstr "请登录以获取经验证适用于 Ultimaker Cura Enterprise 的插件和材料" +#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +#~ msgstr "请登录以获取经验证适用于 UltiMaker Cura Enterprise 的插件和材料" #~ msgctxt "@label" #~ msgid "Version" @@ -7146,16 +7147,16 @@ msgstr "准备阶段" #~ msgstr "提供仿真视图。" #~ msgctxt "@info:status" -#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "使用您的 Ultimaker account 帐户从任何地方发送和监控打印作业。" +#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "使用您的 UltiMaker account 帐户从任何地方发送和监控打印作业。" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." #~ msgid "Connect to Ultimaker Digital Factory" #~ msgstr "连接到 Ultimaker Digital Factory" #~ msgctxt "@info" -#~ msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." -#~ msgstr "无法从 Ultimaker Cura 中查看云打印机的网络摄像头馈送。" +#~ msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." +#~ msgstr "无法从 UltiMaker Cura 中查看云打印机的网络摄像头馈送。" #~ msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" #~ msgid "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, it is recommended to update the firmware on your printer to version {latest_version}." @@ -7219,8 +7220,8 @@ msgstr "准备阶段" #~ msgstr "完成" #~ msgctxt "@label" -#~ msgid "Ultimaker Account" -#~ msgstr "Ultimaker 帐户" +#~ msgid "UltiMaker Account" +#~ msgstr "UltiMaker 帐户" #~ msgctxt "@text" #~ msgid "Your key to connected 3D printing" @@ -7235,8 +7236,8 @@ msgstr "准备阶段" #~ msgstr "- 通过同步设置并将其加载到任何位置保持灵活性" #~ msgctxt "@text" -#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -#~ msgstr "- 使用 Ultimaker 打印机上的远程工作流提高效率" +#~ msgid "- Increase efficiency with a remote workflow on UltiMaker printers" +#~ msgstr "- 使用 UltiMaker 打印机上的远程工作流提高效率" #~ msgctxt "@text" #~ msgid "" @@ -7247,8 +7248,8 @@ msgstr "准备阶段" #~ "Ultimaker Cura。此操作只需要几分钟时间。" #~ msgctxt "@label" -#~ msgid "What's new in Ultimaker Cura" -#~ msgstr "Ultimaker Cura 新增功能" +#~ msgid "What's new in UltiMaker Cura" +#~ msgstr "UltiMaker Cura 新增功能" #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" @@ -7280,11 +7281,11 @@ msgstr "准备阶段" #~ msgctxt "info:status" #~ msgid "
      {}
    To establish a connection, please visit the Ultimaker Digital Factory." -#~ msgstr "
      {}
    要建立连接，请访问 Ultimaker Digital Factory。" +#~ msgstr "
      {}
    要建立连接，请访问 Ultimaker Digital Factory。" #~ msgctxt "@label ({} is printer name)" #~ msgid "{} will be removed until the next account sync.
    To remove {} permanently, visit Ultimaker Digital Factory.

    Are you sure you want to remove {} temporarily?" -#~ msgstr "{} 将被删除，直至下次帐户同步为止。
    要永久删除 {}，请访问 Ultimaker Digital Factory。

    是否确实要暂时删除 {}？" +#~ msgstr "{} 将被删除，直至下次帐户同步为止。
    要永久删除 {}，请访问 Ultimaker Digital Factory。

    是否确实要暂时删除 {}？" #~ msgctxt "@label" #~ msgid "" @@ -7358,8 +7359,8 @@ msgstr "准备阶段" #~ msgstr "通过云连接" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "连接到 Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "连接到 UltiMaker Cloud" #~ msgctxt "@label" #~ msgid "You need to login first before you can rate" @@ -7386,16 +7387,16 @@ msgstr "准备阶段" #~ msgstr "作者" #~ msgctxt "@description" -#~ msgid "Get plugins and materials verified by Ultimaker" -#~ msgstr "获取经过 Ultimaker 验证的插件和材料" +#~ msgid "Get plugins and materials verified by UltiMaker" +#~ msgstr "获取经过 UltiMaker 验证的插件和材料" #~ msgctxt "@label The argument is a username." #~ msgid "Hi %1" #~ msgstr "%1，您好" #~ msgctxt "@button" -#~ msgid "Ultimaker account" -#~ msgstr "Ultimaker 帐户" +#~ msgid "UltiMaker account" +#~ msgstr "UltiMaker 帐户" #~ msgctxt "@button" #~ msgid "Sign out" @@ -7490,20 +7491,20 @@ msgstr "准备阶段" #~ msgstr "语言：" #~ msgctxt "@label" -#~ msgid "Ultimaker Cloud" -#~ msgstr "Ultimaker Cloud" +#~ msgid "UltiMaker Cloud" +#~ msgstr "UltiMaker Cloud" #~ msgctxt "@text" #~ msgid "The next generation 3D printing workflow" #~ msgstr "下一代 3D 打印工作流程" #~ msgctxt "@text" -#~ msgid "- Send print jobs to Ultimaker printers outside your local network" -#~ msgstr "- 将打印作业发送到局域网外的 Ultimaker 打印机" +#~ msgid "- Send print jobs to UltiMaker printers outside your local network" +#~ msgstr "- 将打印作业发送到局域网外的 UltiMaker 打印机" #~ msgctxt "@text" -#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere" -#~ msgstr "- 将 Ultimaker Cura 设置存储到云以便在任何地方使用" +#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere" +#~ msgstr "- 将 UltiMaker Cura 设置存储到云以便在任何地方使用" #~ msgctxt "@text" #~ msgid "- Get exclusive access to print profiles from leading brands" @@ -7590,8 +7591,8 @@ msgstr "准备阶段" #~ msgstr "显示所有设置" #~ msgctxt "@title:window" -#~ msgid "Ultimaker Cura" -#~ msgstr "Ultimaker Cura" +#~ msgid "UltiMaker Cura" +#~ msgstr "UltiMaker Cura" #~ msgctxt "@title:window" #~ msgid "About Cura" @@ -7674,8 +7675,8 @@ msgstr "准备阶段" #~ msgstr "检查表" #~ msgctxt "@label" -#~ msgid "Please select any upgrades made to this Ultimaker 2." -#~ msgstr "请选择适用于 Ultimaker 2 的升级文件。" +#~ msgid "Please select any upgrades made to this UltiMaker 2." +#~ msgstr "请选择适用于 UltiMaker 2 的升级文件。" #~ msgctxt "@label" #~ msgid "Olsson Block" @@ -7798,8 +7799,8 @@ msgstr "准备阶段" #~ msgstr "无法启动新的打印作业。" #~ msgctxt "@label" -#~ msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." -#~ msgstr "Ultimaker 配置存在问题，导致无法开始打印。请解决此问题，然后再继续。" +#~ msgid "There is an issue with the configuration of your UltiMaker, which makes it impossible to start the print. Please resolve this issues before continuing." +#~ msgstr "UltiMaker 配置存在问题，导致无法开始打印。请解决此问题，然后再继续。" #~ msgctxt "@window:title" #~ msgid "Mismatched configuration" @@ -7890,20 +7891,20 @@ msgstr "准备阶段" #~ msgstr "连接到云时出错。" #~ msgctxt "@info:status" -#~ msgid "Uploading via Ultimaker Cloud" -#~ msgstr "通过 Ultimaker Cloud 上传" +#~ msgid "Uploading via UltiMaker Cloud" +#~ msgstr "通过 UltiMaker Cloud 上传" #~ msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "连接到 Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "连接到 UltiMaker Cloud" #~ msgctxt "@action" #~ msgid "Don't ask me again for this printer." #~ msgstr "对此打印机不再询问。" #~ msgctxt "@info:status" -#~ msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "您现在可以使用您的 Ultimaker account 帐户从任何地方发送和监控打印作业。" +#~ msgid "You can now send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "您现在可以使用您的 UltiMaker account 帐户从任何地方发送和监控打印作业。" #~ msgctxt "@info:status" #~ msgid "Connected!" @@ -7949,7 +7950,7 @@ msgstr "准备阶段" #~ msgstr "正交" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers." +#~ msgid "Manages network connections to UltiMaker 3 printers." #~ msgstr "管理与最后的3个打印机的网络连接。" #~ msgctxt "name" @@ -8053,8 +8054,8 @@ msgstr "准备阶段" #~ msgstr "发送数据至远程群集" #~ msgctxt "@info:status" -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "连接到 Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "连接到 UltiMaker Cloud" #~ msgctxt "@info" #~ msgid "Cura collects anonymized usage statistics." @@ -8189,11 +8190,11 @@ msgstr "准备阶段" #~ msgstr "请选择已连接网络的打印机进行监控。" #~ msgctxt "@info" -#~ msgid "Please connect your Ultimaker printer to your local network." -#~ msgstr "请将 Ultimaker 打印机连接到您的局域网。" +#~ msgid "Please connect your UltiMaker printer to your local network." +#~ msgstr "请将 UltiMaker 打印机连接到您的局域网。" #~ msgctxt "@text:window" -#~ msgid "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." +#~ msgid "Cura sends anonymous data to UltiMaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." #~ msgstr "Cura向最终用户发送匿名数据，以提高打印质量和用户体验。下面是发送的所有数据的一个示例。" #~ msgctxt "@text:window" @@ -8201,8 +8202,8 @@ msgstr "准备阶段" #~ msgstr "我不想发送此数据" #~ msgctxt "@text:window" -#~ msgid "Allow sending this data to Ultimaker and help us improve Cura" -#~ msgstr "允许向 Ultimaker 发送此数据并帮助我们改善 Cura" +#~ msgid "Allow sending this data to UltiMaker and help us improve Cura" +#~ msgstr "允许向 UltiMaker 发送此数据并帮助我们改善 Cura" #~ msgctxt "@label" #~ msgid "No print selected" @@ -8404,7 +8405,7 @@ msgstr "准备阶段" #~ msgstr "我不想发送这些数据" #~ msgctxt "@text:window" -#~ msgid "Allow sending these data to Ultimaker and help us improve Cura" +#~ msgid "Allow sending these data to UltiMaker and help us improve Cura" #~ msgstr "允许将这些数据发送到最后一个，帮助我们改进Cura" #~ msgctxt "@label" @@ -8600,8 +8601,8 @@ msgstr "准备阶段" #~ msgstr "打印平台附着" #~ msgctxt "@label" -#~ msgid "Need help improving your prints?
    Read the Ultimaker Troubleshooting Guides" -#~ msgstr "需要帮助改善您的打印？
    阅读 Ultimaker 故障排除指南" +#~ msgid "Need help improving your prints?
    Read the UltiMaker Troubleshooting Guides" +#~ msgstr "需要帮助改善您的打印？
    阅读 UltiMaker 故障排除指南" #~ msgctxt "@title:window" #~ msgid "Engine Log" @@ -8620,8 +8621,8 @@ msgstr "准备阶段" #~ msgstr "检查兼容性" #~ msgctxt "@tooltip" -#~ msgid "Click to check the material compatibility on Ultimaker.com." -#~ msgstr "点击查看 Ultimaker.com 上的材料兼容情况。" +#~ msgid "Click to check the material compatibility on UltiMaker.com." +#~ msgstr "点击查看 UltiMaker.com 上的材料兼容情况。" #~ msgctxt "description" #~ msgid "Shows changes since latest checked version." @@ -8740,16 +8741,16 @@ msgstr "准备阶段" #~ msgstr "联系方式" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers." -#~ msgstr "这台打印机未设置为运行一组连接的 Ultimaker 3 打印机。" +#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers." +#~ msgstr "这台打印机未设置为运行一组连接的 UltiMaker 3 打印机。" #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers." -#~ msgstr "这台打印机是一组共 %1 台已连接 Ultimaker 3 打印机的主机。" +#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers." +#~ msgstr "这台打印机是一组共 %1 台已连接 UltiMaker 3 打印机的主机。" #~ msgctxt "@label: arg 1 is group name" -#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "%1 未设置为运行一组连接的 Ultimaker 3 打印机" +#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "%1 未设置为运行一组连接的 UltiMaker 3 打印机" #~ msgctxt "@label link to connect manager" #~ msgid "Add/Remove printers" @@ -9015,12 +9016,12 @@ msgstr "准备阶段" #~ msgstr "插件浏览器" #~ msgctxt "@label" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@title:window" #~ msgid "SolidWorks: Export wizard" @@ -9171,8 +9172,8 @@ msgstr "准备阶段" #~ msgstr "提供更改打印机设置（如成形空间体积、喷嘴口径等）的方法" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "管理与 Ultimaker 3 打印机的网络连接" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "管理与 UltiMaker 3 打印机的网络连接" #~ msgctxt "description" #~ msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations." @@ -9211,8 +9212,8 @@ msgstr "准备阶段" #~ msgstr "询问用户一次是否同意我们的许可" #~ msgctxt "description" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "为 Ultimaker 打印机提供操作选项(如平台调平向导、选择升级等)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "为 UltiMaker 打印机提供操作选项(如平台调平向导、选择升级等)" #~ msgctxt "@item:inlistbox" #~ msgid "GCode File" @@ -9318,12 +9319,12 @@ msgstr "准备阶段" #~ msgid "Resuming print..." #~ msgstr "恢复打印..." -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "这台打印机未设置为运行一组连接的 Ultimaker 3 打印机。" +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "这台打印机未设置为运行一组连接的 UltiMaker 3 打印机。" #~ msgctxt "Count is number of printers." -#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers." -#~ msgstr "这台打印机是一组共 {count} 台已连接 Ultimaker 3 打印机的主机。" +#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers." +#~ msgstr "这台打印机是一组共 {count} 台已连接 UltiMaker 3 打印机的主机。" #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate." #~ msgstr "{printer_name} 已完成打印 '{job_name}'。 请收起打印品并确认清空打印平台。" @@ -9332,8 +9333,8 @@ msgstr "准备阶段" #~ msgstr "{printer_name} 已保留用于打印 '{job_name}'。 请更改打印机配置以匹配此项作业，以便开始打印。" #~ msgctxt "@info:status" -#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "无法发送新打印作业：此 3D 打印机（尚）未设置为运行一组连接的 Ultimaker 3 打印机。" +#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "无法发送新打印作业：此 3D 打印机（尚）未设置为运行一组连接的 UltiMaker 3 打印机。" #~ msgctxt "@info:status" #~ msgid "Unable to send print job to group {cluster_name}." @@ -9458,12 +9459,12 @@ msgstr "准备阶段" #~ msgstr "未知错误代码: %1" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@label Printer status" #~ msgid "Unknown" @@ -9737,12 +9738,12 @@ msgstr "准备阶段" #~ msgstr "确定" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "这台打印机未设置为运行一组连接的 Ultimaker 3 打印机" +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "这台打印机未设置为运行一组连接的 UltiMaker 3 打印机" #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers" -#~ msgstr "这台打印机是一组 %1 台已连接 Ultimaker 3 打印机的主机" +#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers" +#~ msgstr "这台打印机是一组 %1 台已连接 UltiMaker 3 打印机的主机" #~ msgctxt "@label" #~ msgid "Completed on: " @@ -10058,8 +10059,8 @@ msgstr "准备阶段" #~ msgstr "提供可移动磁盘热插拔和写入文件的支持。" #~ msgctxt "@info:whatsthis" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "管理与 Ultimaker 3 打印机的网络连接" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "管理与 UltiMaker 3 打印机的网络连接" #~ msgctxt "@label" #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}" @@ -10222,12 +10223,12 @@ msgstr "准备阶段" #~ msgstr "提供对写入 3MF 文件的支持。" #~ msgctxt "@label" -#~ msgid "Ultimaker machine actions" -#~ msgstr "Ultimaker 打印机操作" +#~ msgid "UltiMaker machine actions" +#~ msgstr "UltiMaker 打印机操作" #~ msgctxt "@info:whatsthis" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "为 Ultimaker 打印机提供操作选项 (如平台调平向导、选择升级等)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "为 UltiMaker 打印机提供操作选项 (如平台调平向导、选择升级等)" #~ msgctxt "@label" #~ msgid "Cura Profile Reader" @@ -10266,8 +10267,8 @@ msgstr "准备阶段" #~ msgstr "如果您的打印机未列出，请阅读网络打印故障排除指南" #~ msgctxt "@item:inlistbox" -#~ msgid "Ultimaker" -#~ msgstr "Ultimaker" +#~ msgid "UltiMaker" +#~ msgstr "UltiMaker" #~ msgctxt "@label" #~ msgid "Support library for scientific computing " diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index a7c4dd7bd9..9337dbb04d 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -1,5 +1,5 @@ # Cura -# Copyright (C) 2022 Ultimaker B.V. +# Copyright (C) 2022 UltiMaker. # This file is distributed under the same license as the Cura package. # Ultimaker , 2022. # @@ -424,8 +424,8 @@ msgstr "無法開始新的登入程序。檢查是否有其他登入仍在進行 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277 msgctxt "@info" -msgid "Unable to reach the Ultimaker account server." -msgstr "無法連上 Ultimaker 帳號伺服器。" +msgid "Unable to reach the UltiMaker account server." +msgstr "無法連上 UltiMaker 帳號伺服器。" #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278 msgctxt "@info:title" @@ -701,8 +701,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122 msgctxt "@action:button" -msgid "Send crash report to Ultimaker" -msgstr "傳送錯誤報告給 Ultimaker" +msgid "Send crash report to UltiMaker" +msgstr "傳送錯誤報告給 UltiMaker" #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125 msgctxt "@action:button" @@ -902,7 +902,7 @@ msgstr "網路錯誤" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13 msgctxt "info:status" -msgid "New printer detected from your Ultimaker account" +msgid "New printer detected from your UltiMaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "從你的 Ultimaker 帳號偵測到新的印表機" @@ -1048,8 +1048,8 @@ msgstr "移除印表機" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" -msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "你正在嘗試連接到一台未安裝 Ultimaker Connect 的印表機。請將印表機更新至最新版本的韌體。" +msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware." +msgstr "你正在嘗試連接到一台未安裝 UltiMaker Connect 的印表機。請將印表機更新至最新版本的韌體。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" @@ -1275,8 +1275,8 @@ msgstr "無法寫入 UFP 檔案：" #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22 msgctxt "@item:inlistbox" -msgid "Ultimaker Format Package" -msgstr "Ultimaker 格式的封包" +msgid "UltiMaker Format Package" +msgstr "UltiMaker 格式的封包" #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19 msgctxt "@text Placeholder for the username if it has been deleted" @@ -1397,8 +1397,8 @@ msgstr "你要使用你的帳號同步線材資料和軟體套件嗎？" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" -msgid "Changes detected from your Ultimaker account" -msgstr "從你的 Ultimaker 帳號偵測到資料更動" +msgid "Changes detected from your UltiMaker account" +msgstr "從你的 UltiMaker 帳號偵測到資料更動" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147 msgctxt "@action:button" @@ -1558,8 +1558,8 @@ msgstr "回報問題" #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169 msgctxt "@message:description" -msgid "Report a bug on Ultimaker Cura's issue tracker." -msgstr "於Ultimaker Cura問題追蹤器中回報問題." +msgid "Report a bug on UltiMaker Cura's issue tracker." +msgstr "於UltiMaker Cura問題追蹤器中回報問題." #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 msgctxt "@info:status" @@ -1688,8 +1688,8 @@ msgstr "專案檔案{0} 已毀損 : {1}. #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" -msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." -msgstr "專案檔案 {0} 使用了此版本 Ultimaker Cura 未知的參數製作。" +msgid "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura." +msgstr "專案檔案 {0} 使用了此版本 UltiMaker Cura 未知的參數製作。" #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" @@ -2331,8 +2331,8 @@ msgstr "請更新你印表機的韌體以便遠端管理工作隊列。" #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287 msgctxt "@info" -msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "網路攝影機無法從Ultimaker Cura中瀏覽，請點擊\"管理列印機\"並從Ultimaker Digital Factory中瀏覽網路攝影機." +msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." +msgstr "網路攝影機無法從UltiMaker Cura中瀏覽，請點擊\"管理列印機\"並從Ultimaker Digital Factory中瀏覽網路攝影機." #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347 msgctxt "@label:status" @@ -2697,8 +2697,8 @@ msgstr "更多關於匿名資料收集的資訊" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73 msgctxt "@text:window" -msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" -msgstr "Ultimaker Cura 搜集匿名資料以提高列印品質和使用者體驗。以下是共享資料的範例：" +msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:" +msgstr "UltiMaker Cura 搜集匿名資料以提高列印品質和使用者體驗。以下是共享資料的範例：" #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107 msgctxt "@text:window" @@ -2722,8 +2722,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30 msgctxt "@label" -msgid "Please select any upgrades made to this Ultimaker Original" -msgstr "請選擇適用於 Ultimaker Original 的更新檔案" +msgid "Please select any upgrades made to this UltiMaker Original" +msgstr "請選擇適用於 UltiMaker Original 的更新檔案" #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39 msgctxt "@label" @@ -2818,7 +2818,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12 msgctxt "@text" -msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users." +msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15 @@ -2877,7 +2877,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12 msgctxt "@text" -msgid "Select and install material profiles optimised for your Ultimaker 3D printers." +msgid "Select and install material profiles optimised for your UltiMaker 3D printers." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32 @@ -2999,17 +2999,17 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21 msgctxt "@info" -msgid "Ultimaker Verified Plug-in" +msgid "UltiMaker Verified Plug-in" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22 msgctxt "@info" -msgid "Ultimaker Certified Material" +msgid "UltiMaker Certified Material" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23 msgctxt "@info" -msgid "Ultimaker Verified Package" +msgid "UltiMaker Verified Package" msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11 @@ -3019,7 +3019,7 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15 msgctxt "@text" -msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." +msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." msgstr "" #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 @@ -4285,8 +4285,8 @@ msgstr "隱私權" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862 msgctxt "@info:tooltip" -msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." -msgstr "你願意將關於你的列印資料以匿名形式發送到 Ultimaker 嗎？注意：我們不會記錄或發送任何模型、IP 位址或其他私人資料。" +msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." +msgstr "你願意將關於你的列印資料以匿名形式發送到 UltiMaker 嗎？注意：我們不會記錄或發送任何模型、IP 位址或其他私人資料。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867 msgctxt "@option:check" @@ -4598,8 +4598,8 @@ msgstr "故障排除" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19 msgctxt "@label" -msgid "Sign in to the Ultimaker platform" -msgstr "登入Ultimaker 論壇" +msgid "Sign in to the UltiMaker platform" +msgstr "登入UltiMaker 論壇" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123 msgctxt "@text" @@ -4613,8 +4613,8 @@ msgstr "備份及同步您的線材設定與插件" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175 msgctxt "@text" -msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" -msgstr "分享創意並可從Ultimaker社群中超過48000的使用者得到幫助" +msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community" +msgstr "分享創意並可從UltiMaker社群中超過48000的使用者得到幫助" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189 msgctxt "@button" @@ -4623,18 +4623,18 @@ msgstr "略過" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201 msgctxt "@text" -msgid "Create a free Ultimaker Account" -msgstr "創建免費的Ultimaker帳戶" +msgid "Create a free UltiMaker Account" +msgstr "創建免費的UltiMaker帳戶" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24 msgctxt "@label" -msgid "Help us to improve Ultimaker Cura" -msgstr "協助我們改進 Ultimaker Cura" +msgid "Help us to improve UltiMaker Cura" +msgstr "協助我們改進 UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56 msgctxt "@text" -msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:" -msgstr "Ultimaker Cura 搜集匿名資料以提高列印品質和使用者體驗，包含：" +msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:" +msgstr "UltiMaker Cura 搜集匿名資料以提高列印品質和使用者體驗，包含：" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68 msgctxt "@text" @@ -4658,8 +4658,8 @@ msgstr "列印設定" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99 msgctxt "@text" -msgid "Data collected by Ultimaker Cura will not contain any personal information." -msgstr "Ultimaker Cura 收集的資料不包含任何個人資訊。" +msgid "Data collected by UltiMaker Cura will not contain any personal information." +msgstr "UltiMaker Cura 收集的資料不包含任何個人資訊。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100 msgctxt "@text" @@ -4729,8 +4729,8 @@ msgstr "無法連接到裝置。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" -msgid "Can't connect to your Ultimaker printer?" -msgstr "無法連接到 Ultimaker 印表機？" +msgid "Can't connect to your UltiMaker printer?" +msgstr "無法連接到 UltiMaker 印表機？" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200 msgctxt "@label" @@ -4749,13 +4749,13 @@ msgstr "連接" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" -msgid "Welcome to Ultimaker Cura" -msgstr "歡迎來到 Ultimaker Cura" +msgid "Welcome to UltiMaker Cura" +msgstr "歡迎來到 UltiMaker Cura" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67 msgctxt "@text" -msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." -msgstr "請依照步驟安裝Ultimaker Cura. 這會需要幾分鐘的時間." +msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments." +msgstr "請依照步驟安裝UltiMaker Cura. 這會需要幾分鐘的時間." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82 msgctxt "@button" @@ -5434,7 +5434,7 @@ msgstr "熔絲 3D 列印技術的的端對端解決方案。" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87 msgctxt "@info:credit" msgid "" -"Cura is developed by Ultimaker B.V. in cooperation with the community.\n" +"Cura is developed by UltiMaker in cooperation with the community.\n" "Cura proudly uses the following open source projects:" msgstr "" "Cura 由 Ultimaker B.V. 與社群合作開發。\n" @@ -5643,23 +5643,23 @@ msgstr "監控列印工作並於從您的歷史紀錄中再次列印." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55 msgctxt "@tooltip:button" -msgid "Extend Ultimaker Cura with plugins and material profiles." -msgstr "使用插件及線材參數擴充Ultimaker Cura." +msgid "Extend UltiMaker Cura with plugins and material profiles." +msgstr "使用插件及線材參數擴充UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62 msgctxt "@tooltip:button" -msgid "Become a 3D printing expert with Ultimaker e-learning." -msgstr "使用Ultimaker e-learning成為一位3D列印專家." +msgid "Become a 3D printing expert with UltiMaker e-learning." +msgstr "使用UltiMaker e-learning成為一位3D列印專家." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67 msgctxt "@label:button" -msgid "Ultimaker support" -msgstr "Ultimaker 支援" +msgid "UltiMaker support" +msgstr "UltiMaker 支援" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69 msgctxt "@tooltip:button" -msgid "Learn how to get started with Ultimaker Cura." -msgstr "學習如何開始使用Ultimaker Cura." +msgid "Learn how to get started with UltiMaker Cura." +msgstr "學習如何開始使用UltiMaker Cura." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74 msgctxt "@label:button" @@ -5668,8 +5668,8 @@ msgstr "提出問題" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76 msgctxt "@tooltip:button" -msgid "Consult the Ultimaker Community." -msgstr "諮詢Ultimaker社群." +msgid "Consult the UltiMaker Community." +msgstr "諮詢UltiMaker社群." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81 msgctxt "@label:button" @@ -5683,8 +5683,8 @@ msgstr "讓開發者了解您遇到的問題." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90 msgctxt "@tooltip:button" -msgid "Visit the Ultimaker website." -msgstr "參觀Ultimaker網站." +msgid "Visit the UltiMaker website." +msgstr "參觀UltiMaker網站." #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@label" @@ -5980,8 +5980,8 @@ msgstr "" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58 msgctxt "@button" -msgid "Create a free Ultimaker account" -msgstr "創建免費的Ultimaker帳戶" +msgid "Create a free UltiMaker account" +msgstr "創建免費的UltiMaker帳戶" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24 msgctxt "@action:button" @@ -5995,8 +5995,8 @@ msgstr "最後一次更新：%1" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107 msgctxt "@button" -msgid "Ultimaker Account" -msgstr "Ultimaker 帳號" +msgid "UltiMaker Account" +msgstr "UltiMaker 帳號" #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126 msgctxt "@button" @@ -6210,13 +6210,13 @@ msgstr "後處理" #: /UM3NetworkPrinting/plugin.json msgctxt "description" -msgid "Manages network connections to Ultimaker networked printers." -msgstr "管理與 Ultimaker 網絡印表機的網絡連線。" +msgid "Manages network connections to UltiMaker networked printers." +msgstr "管理與 UltiMaker 網絡印表機的網絡連線。" #: /UM3NetworkPrinting/plugin.json msgctxt "name" -msgid "Ultimaker Network Connection" -msgstr "Ultimaker 網絡連線" +msgid "UltiMaker Network Connection" +msgstr "UltiMaker 網絡連線" #: /3MFWriter/plugin.json msgctxt "description" @@ -6250,8 +6250,8 @@ msgstr "切片資訊" #: /UFPWriter/plugin.json msgctxt "description" -msgid "Provides support for writing Ultimaker Format Packages." -msgstr "提供寫入 Ultimaker 格式封包的支援。" +msgid "Provides support for writing UltiMaker Format Packages." +msgstr "提供寫入 UltiMaker 格式封包的支援。" #: /UFPWriter/plugin.json msgctxt "name" @@ -6266,7 +6266,7 @@ msgstr "連結至\"數位博物館\"，允許Cura從\"數位博物館\"打開或 #: /DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "Ultimaker 數位博物館" +msgstr "UltiMaker 數位博物館" #: /GCodeProfileReader/plugin.json msgctxt "description" @@ -6300,13 +6300,13 @@ msgstr "Trimesh 讀取器" #: /UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." -msgstr "提供 Ultimaker 機器的操作（例如平台調平精靈，選擇升級等）。" +msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgstr "提供 UltiMaker 機器的操作（例如平台調平精靈，選擇升級等）。" #: /UltimakerMachineActions/plugin.json msgctxt "name" -msgid "Ultimaker machine actions" -msgstr "Ultimaker 印表機操作" +msgid "UltiMaker machine actions" +msgstr "UltiMaker 印表機操作" #: /GCodeGzReader/plugin.json msgctxt "description" @@ -6320,7 +6320,7 @@ msgstr "壓縮檔案 G-code 讀取器" #: /Marketplace/plugin.json msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." msgstr "" #: /Marketplace/plugin.json @@ -6670,8 +6670,8 @@ msgstr "G-code 寫入器" #: /UFPReader/plugin.json msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "提供讀取 Ultimaker 格式封包的支援。" +msgid "Provides support for reading UltiMaker Format Packages." +msgstr "提供讀取 UltiMaker 格式封包的支援。" #: /UFPReader/plugin.json msgctxt "name" @@ -6964,8 +6964,8 @@ msgstr "準備介面" #~ msgstr "電子郵件" #~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" -#~ msgstr "請登入以取得 Ultimaker Cura Enterprise 驗証的外掛及線材" +#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +#~ msgstr "請登入以取得 UltiMaker Cura Enterprise 驗証的外掛及線材" #~ msgctxt "@label" #~ msgid "Version" @@ -7122,16 +7122,16 @@ msgstr "準備介面" #~ msgstr "提供模擬檢視。" #~ msgctxt "@info:status" -#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "利用你的 Ultimaker 帳號在任何地方傳送和監控列印作業。" +#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "利用你的 UltiMaker 帳號在任何地方傳送和監控列印作業。" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." #~ msgid "Connect to Ultimaker Digital Factory" #~ msgstr "連接到 Ultimaker Digital Factory" #~ msgctxt "@info" -#~ msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." -#~ msgstr "無法從Ultimaker Cura中查看你的雲端列印機." +#~ msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." +#~ msgstr "無法從UltiMaker Cura中查看你的雲端列印機." #~ msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" #~ msgid "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, it is recommended to update the firmware on your printer to version {latest_version}." @@ -7195,8 +7195,8 @@ msgstr "準備介面" #~ msgstr "完成" #~ msgctxt "@label" -#~ msgid "Ultimaker Account" -#~ msgstr "Ultimaker 帳號" +#~ msgid "UltiMaker Account" +#~ msgstr "UltiMaker 帳號" #~ msgctxt "@text" #~ msgid "Your key to connected 3D printing" @@ -7211,8 +7211,8 @@ msgstr "準備介面" #~ msgstr "- 通過同步設定可在任何地方將其載入以保持靈活性" #~ msgctxt "@text" -#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -#~ msgstr "- 透過 Ultimaker 印表機上的遠端工作流程提高效率" +#~ msgid "- Increase efficiency with a remote workflow on UltiMaker printers" +#~ msgstr "- 透過 UltiMaker 印表機上的遠端工作流程提高效率" #~ msgctxt "@text" #~ msgid "" @@ -7223,8 +7223,8 @@ msgstr "準備介面" #~ "Ultimaker Cura。這只需要一點時間。" #~ msgctxt "@label" -#~ msgid "What's new in Ultimaker Cura" -#~ msgstr "Ultimaker Cura 新功能" +#~ msgid "What's new in UltiMaker Cura" +#~ msgstr "UltiMaker Cura 新功能" #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" @@ -7256,11 +7256,11 @@ msgstr "準備介面" #~ msgctxt "info:status" #~ msgid "
      {}
    To establish a connection, please visit the Ultimaker Digital Factory." -#~ msgstr "
      {}
    要建立連線，請前往 Ultimaker Digital Factory。" +#~ msgstr "
      {}
    要建立連線，請前往 Ultimaker Digital Factory。" #~ msgctxt "@label ({} is printer name)" #~ msgid "{} will be removed until the next account sync.
    To remove {} permanently, visit Ultimaker Digital Factory.

    Are you sure you want to remove {} temporarily?" -#~ msgstr "直到下次帳號同步前 {} 將被移除。
    要永久移除 {}，請前往 Ultimaker Digital Factory。

    你確定要暫時移除 {} 嗎？" +#~ msgstr "直到下次帳號同步前 {} 將被移除。
    要永久移除 {}，請前往 Ultimaker Digital Factory。

    你確定要暫時移除 {} 嗎？" #~ msgctxt "@label" #~ msgid "" @@ -7334,8 +7334,8 @@ msgstr "準備介面" #~ msgstr "透過雲端服務連接" #~ msgctxt "@info:status Ultimaker Cloud should not be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "連接到 Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "連接到 UltiMaker Cloud" #~ msgctxt "@label" #~ msgid "You need to login first before you can rate" @@ -7362,16 +7362,16 @@ msgstr "準備介面" #~ msgstr "作者" #~ msgctxt "@description" -#~ msgid "Get plugins and materials verified by Ultimaker" -#~ msgstr "取得經 Ultimaker 驗証過的外掛和耗材" +#~ msgid "Get plugins and materials verified by UltiMaker" +#~ msgstr "取得經 UltiMaker 驗証過的外掛和耗材" #~ msgctxt "@label The argument is a username." #~ msgid "Hi %1" #~ msgstr "嗨 %1" #~ msgctxt "@button" -#~ msgid "Ultimaker account" -#~ msgstr "Ultimaker 帳號" +#~ msgid "UltiMaker account" +#~ msgstr "UltiMaker 帳號" #~ msgctxt "@button" #~ msgid "Sign out" @@ -7466,20 +7466,20 @@ msgstr "準備介面" #~ msgstr "語言：" #~ msgctxt "@label" -#~ msgid "Ultimaker Cloud" -#~ msgstr "Ultimaker Cloud" +#~ msgid "UltiMaker Cloud" +#~ msgstr "UltiMaker Cloud" #~ msgctxt "@text" #~ msgid "The next generation 3D printing workflow" #~ msgstr "下一世代的 3D 列印流程" #~ msgctxt "@text" -#~ msgid "- Send print jobs to Ultimaker printers outside your local network" -#~ msgstr "- 將列印作業傳送到你區域網路外的 Ultimaker 印表機" +#~ msgid "- Send print jobs to UltiMaker printers outside your local network" +#~ msgstr "- 將列印作業傳送到你區域網路外的 UltiMaker 印表機" #~ msgctxt "@text" -#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere" -#~ msgstr "- 將你的 Ultimaker Cura 設定儲存在雲端以便隨處使用" +#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere" +#~ msgstr "- 將你的 UltiMaker Cura 設定儲存在雲端以便隨處使用" #~ msgctxt "@text" #~ msgid "- Get exclusive access to print profiles from leading brands" @@ -7566,8 +7566,8 @@ msgstr "準備介面" #~ msgstr "顯示所有設定" #~ msgctxt "@title:window" -#~ msgid "Ultimaker Cura" -#~ msgstr "Ultimaker Cura" +#~ msgid "UltiMaker Cura" +#~ msgstr "UltiMaker Cura" #~ msgctxt "@title:window" #~ msgid "About Cura" @@ -7650,8 +7650,8 @@ msgstr "準備介面" #~ msgstr "檢查清單" #~ msgctxt "@label" -#~ msgid "Please select any upgrades made to this Ultimaker 2." -#~ msgstr "請選擇適用於 Ultimaker 2 的更新檔案。" +#~ msgid "Please select any upgrades made to this UltiMaker 2." +#~ msgstr "請選擇適用於 UltiMaker 2 的更新檔案。" #~ msgctxt "@label" #~ msgid "Olsson Block" @@ -7774,8 +7774,8 @@ msgstr "準備介面" #~ msgstr "無法開始新的列印作業。" #~ msgctxt "@label" -#~ msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." -#~ msgstr "Ultimaker 的設定有問題導致無法開始列印。請在繼續之前解決這個問題。" +#~ msgid "There is an issue with the configuration of your UltiMaker, which makes it impossible to start the print. Please resolve this issues before continuing." +#~ msgstr "UltiMaker 的設定有問題導致無法開始列印。請在繼續之前解決這個問題。" #~ msgctxt "@window:title" #~ msgid "Mismatched configuration" @@ -7866,20 +7866,20 @@ msgstr "準備介面" #~ msgstr "連接到雲端服務時發生錯誤。" #~ msgctxt "@info:status" -#~ msgid "Uploading via Ultimaker Cloud" -#~ msgstr "透過 Ultimaker Cloud 上傳" +#~ msgid "Uploading via UltiMaker Cloud" +#~ msgstr "透過 UltiMaker Cloud 上傳" #~ msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "連接到 Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "連接到 UltiMaker Cloud" #~ msgctxt "@action" #~ msgid "Don't ask me again for this printer." #~ msgstr "對此印表機不要再次詢問。" #~ msgctxt "@info:status" -#~ msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." -#~ msgstr "現在你可以利用你的 Ultimaker 帳號在任何地方傳送和監控列印作業。" +#~ msgid "You can now send and monitor print jobs from anywhere using your UltiMaker account." +#~ msgstr "現在你可以利用你的 UltiMaker 帳號在任何地方傳送和監控列印作業。" #~ msgctxt "@info:status" #~ msgid "Connected!" @@ -7925,8 +7925,8 @@ msgstr "準備介面" #~ msgstr "正交" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers." -#~ msgstr "管理與 Ultimaker 3 印表機的網絡連線。" +#~ msgid "Manages network connections to UltiMaker 3 printers." +#~ msgstr "管理與 UltiMaker 3 印表機的網絡連線。" #~ msgctxt "name" #~ msgid "UM3 Network Connection" @@ -8029,8 +8029,8 @@ msgstr "準備介面" #~ msgstr "正在傳送資料到遠端叢集" #~ msgctxt "@info:status" -#~ msgid "Connect to Ultimaker Cloud" -#~ msgstr "連接到 Ultimaker Cloud" +#~ msgid "Connect to UltiMaker Cloud" +#~ msgstr "連接到 UltiMaker Cloud" #~ msgctxt "@info" #~ msgid "Cura collects anonymized usage statistics." @@ -8165,20 +8165,20 @@ msgstr "準備介面" #~ msgstr "請選擇要監控的網絡連線印表機。" #~ msgctxt "@info" -#~ msgid "Please connect your Ultimaker printer to your local network." -#~ msgstr "請將你的 Ultimaker 印表機連接到區域網路。" +#~ msgid "Please connect your UltiMaker printer to your local network." +#~ msgstr "請將你的 UltiMaker 印表機連接到區域網路。" #~ msgctxt "@text:window" -#~ msgid "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." -#~ msgstr "Cura 傳送匿名資料給 Ultimaker 以提高列印品質和使用者體驗。以下是傳送資料的例子。" +#~ msgid "Cura sends anonymous data to UltiMaker in order to improve the print quality and user experience. Below is an example of all the data that is sent." +#~ msgstr "Cura 傳送匿名資料給 UltiMaker 以提高列印品質和使用者體驗。以下是傳送資料的例子。" #~ msgctxt "@text:window" #~ msgid "I don't want to send this data" #~ msgstr "我不想傳送這些資料" #~ msgctxt "@text:window" -#~ msgid "Allow sending this data to Ultimaker and help us improve Cura" -#~ msgstr "允許將這些資料傳送給 Ultimaker 以協助我們改進 Cura" +#~ msgid "Allow sending this data to UltiMaker and help us improve Cura" +#~ msgstr "允許將這些資料傳送給 UltiMaker 以協助我們改進 Cura" #~ msgctxt "@label" #~ msgid "No print selected" @@ -8380,8 +8380,8 @@ msgstr "準備介面" #~ msgstr "我不想傳送這些資料" #~ msgctxt "@text:window" -#~ msgid "Allow sending these data to Ultimaker and help us improve Cura" -#~ msgstr "允許將這些資料傳送給 Ultimaker 並協助我們改進 Cura" +#~ msgid "Allow sending these data to UltiMaker and help us improve Cura" +#~ msgstr "允許將這些資料傳送給 UltiMaker 並協助我們改進 Cura" #~ msgctxt "@label" #~ msgid "Printer type:" @@ -8576,8 +8576,8 @@ msgstr "準備介面" #~ msgstr "列印平台附著" #~ msgctxt "@label" -#~ msgid "Need help improving your prints?
    Read the Ultimaker Troubleshooting Guides" -#~ msgstr "需要幫助改善你的列印？閱讀 Ultimaker 故障排除指南" +#~ msgid "Need help improving your prints?
    Read the UltiMaker Troubleshooting Guides" +#~ msgstr "需要幫助改善你的列印？閱讀 UltiMaker 故障排除指南" #~ msgctxt "@title:window" #~ msgid "Engine Log" @@ -8596,8 +8596,8 @@ msgstr "準備介面" #~ msgstr "檢查相容性" #~ msgctxt "@tooltip" -#~ msgid "Click to check the material compatibility on Ultimaker.com." -#~ msgstr "點擊查看 Ultimaker.com 上的耗材相容性。" +#~ msgid "Click to check the material compatibility on UltiMaker.com." +#~ msgstr "點擊查看 UltiMaker.com 上的耗材相容性。" #~ msgctxt "description" #~ msgid "Shows changes since latest checked version." @@ -8716,16 +8716,16 @@ msgstr "準備介面" #~ msgstr "聯繫" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers." -#~ msgstr "這台印表機未設定成管理一組 Ultimaker 3 印表機的主機。" +#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers." +#~ msgstr "這台印表機未設定成管理一組 UltiMaker 3 印表機的主機。" #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers." -#~ msgstr "這台印表機是 %1 台 Ultimaker 3 印表機群組的主機。" +#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers." +#~ msgstr "這台印表機是 %1 台 UltiMaker 3 印表機群組的主機。" #~ msgctxt "@label: arg 1 is group name" -#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "%1 未設定成管理一組連線的 Ultimaker 3 印表機的主機" +#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "%1 未設定成管理一組連線的 UltiMaker 3 印表機的主機" #~ msgctxt "@label link to connect manager" #~ msgid "Add/Remove printers" @@ -8992,12 +8992,12 @@ msgstr "準備介面" #~ msgstr "外掛瀏覽器" #~ msgctxt "@label" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@title:window" #~ msgid "SolidWorks: Export wizard" @@ -9148,8 +9148,8 @@ msgstr "準備介面" #~ msgstr "提供更改印表機設定（如成形空間體積、噴頭口徑等）的方法" #~ msgctxt "description" -#~ msgid "Manages network connections to Ultimaker 3 printers" -#~ msgstr "管理與 Ultimaker 3 印表機的網路連接" +#~ msgid "Manages network connections to UltiMaker 3 printers" +#~ msgstr "管理與 UltiMaker 3 印表機的網路連接" #~ msgctxt "description" #~ msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations." @@ -9188,8 +9188,8 @@ msgstr "準備介面" #~ msgstr "詢問使用者是否同意我們的授權協議" #~ msgctxt "description" -#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)" -#~ msgstr "提供 Ultimaker 印表機專屬功能(如平台調平精靈、選擇升級等)" +#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)" +#~ msgstr "提供 UltiMaker 印表機專屬功能(如平台調平精靈、選擇升級等)" #~ msgctxt "@item:inlistbox" #~ msgid "GCode File" @@ -9295,12 +9295,12 @@ msgstr "準備介面" #~ msgid "Resuming print..." #~ msgstr "繼續列印..." -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "這台印表機未設定成管理一組連線的 Ultimaker 3 印表機的主機。" +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "這台印表機未設定成管理一組連線的 UltiMaker 3 印表機的主機。" #~ msgctxt "Count is number of printers." -#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers." -#~ msgstr "這台印表機是 {count} 台連線的 Ultimaker 3 印表機群組的主機。" +#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers." +#~ msgstr "這台印表機是 {count} 台連線的 UltiMaker 3 印表機群組的主機。" #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate." #~ msgstr "{printer_name} 已完成列印 '{job_name}'。請收起列印件並確認清空列印平台。" @@ -9309,8 +9309,8 @@ msgstr "準備介面" #~ msgstr "{printer_name} 已為了列印 '{job_name}' 保留。請更改印表機設定配合此列印作業，以便開始列印。" #~ msgctxt "@info:status" -#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers." -#~ msgstr "無法傳送新的列印作業：這台印表機尚未設定成管理一組連線的 Ultimaker 3 印表機的主機。" +#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers." +#~ msgstr "無法傳送新的列印作業：這台印表機尚未設定成管理一組連線的 UltiMaker 3 印表機的主機。" #~ msgctxt "@info:status" #~ msgid "Unable to send print job to group {cluster_name}." @@ -9435,12 +9435,12 @@ msgstr "準備介面" #~ msgstr "未知錯誤代碼: %1" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3" -#~ msgstr "Ultimaker 3" +#~ msgid "UltiMaker 3" +#~ msgstr "UltiMaker 3" #~ msgctxt "@label Printer name" -#~ msgid "Ultimaker 3 Extended" -#~ msgstr "Ultimaker 3 Extended" +#~ msgid "UltiMaker 3 Extended" +#~ msgstr "UltiMaker 3 Extended" #~ msgctxt "@label Printer status" #~ msgid "Unknown" @@ -9711,12 +9711,12 @@ msgstr "準備介面" #~ msgstr "確定" #~ msgctxt "@label" -#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers" -#~ msgstr "這台印表機未設定成管理一組連線的 Ultimaker 3 印表機的主機" +#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers" +#~ msgstr "這台印表機未設定成管理一組連線的 UltiMaker 3 印表機的主機" #~ msgctxt "@label" -#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers" -#~ msgstr "這台印表機是 %1 台 Ultimaker 3 印表機群組的主機" +#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers" +#~ msgstr "這台印表機是 %1 台 UltiMaker 3 印表機群組的主機" #~ msgctxt "@label" #~ msgid "Completed on: " diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index da62124f3f..3ebb197142 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/resources/qml/Account/GeneralOperations.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -16,7 +16,7 @@ Column { id: title anchors.horizontalCenter: parent.horizontalCenter - text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") + text: catalog.i18nc("@label", "Sign in to the UltiMaker platform") font: UM.Theme.getFont("large_bold") } @@ -36,7 +36,7 @@ Column id: generalInformationPoints anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignLeft - text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the Ultimaker community") + text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the UltiMaker community") lineHeight: 1.4 wrapMode: Text.NoWrap } @@ -55,7 +55,7 @@ Column { anchors.horizontalCenter: parent.horizontalCenter height: UM.Theme.getSize("account_button").height - text: catalog.i18nc("@button", "Create a free Ultimaker account") + text: catalog.i18nc("@button", "Create a free UltiMaker account") onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=menu-signup") } } diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index 9e5d082738..52d9cfc344 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -104,7 +104,7 @@ Column width: parent.width height: UM.Theme.getSize("account_button").height - text: catalog.i18nc("@button", "Ultimaker Account") + text: catalog.i18nc("@button", "UltiMaker Account") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "?utm_source=cura&utm_medium=software&utm_campaign=menu-visit-account") fixedWidthMode: false } diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 00089dd85b..d48d8e610f 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. pragma Singleton @@ -214,7 +214,7 @@ Item Action { id: marketplaceMaterialsAction - text: catalog.i18nc("@action:inmenu Marketplace is a brand name of Ultimaker's, so don't translate.", "Add more materials from Marketplace") + text: catalog.i18nc("@action:inmenu Marketplace is a brand name of UltiMaker's, so don't translate.", "Add more materials from Marketplace") } Action diff --git a/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml b/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml index 453f2ed9e0..f13ca28447 100644 --- a/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml +++ b/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml @@ -50,30 +50,30 @@ Popup permissionsRequired: ["digital-factory.print-job.read"] }, { - displayName: "Ultimaker Marketplace", //Not translated, since it's a brand name. + displayName: "UltiMaker Marketplace", //Not translated, since it's a brand name. thumbnail: UM.Theme.getIcon("Shop", "high"), - description: catalog.i18nc("@tooltip:button", "Extend Ultimaker Cura with plugins and material profiles."), + description: catalog.i18nc("@tooltip:button", "Extend UltiMaker Cura with plugins and material profiles."), link: "https://marketplace.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-marketplace-materials", permissionsRequired: [] }, { - displayName: "Ultimaker Academy", //Not translated, since it's a brand name. + displayName: "UltiMaker Academy", //Not translated, since it's a brand name. thumbnail: UM.Theme.getIcon("Knowledge"), - description: catalog.i18nc("@tooltip:button", "Become a 3D printing expert with Ultimaker e-learning."), + description: catalog.i18nc("@tooltip:button", "Become a 3D printing expert with UltiMaker e-learning."), link: "https://academy.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-academy", permissionsRequired: [] }, { - displayName: catalog.i18nc("@label:button", "Ultimaker support"), + displayName: catalog.i18nc("@label:button", "UltiMaker support"), thumbnail: UM.Theme.getIcon("Help", "high"), - description: catalog.i18nc("@tooltip:button", "Learn how to get started with Ultimaker Cura."), + description: catalog.i18nc("@tooltip:button", "Learn how to get started with UltiMaker Cura."), link: "https://support.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-support", permissionsRequired: [] }, { displayName: catalog.i18nc("@label:button", "Ask a question"), thumbnail: UM.Theme.getIcon("Speak", "high"), - description: catalog.i18nc("@tooltip:button", "Consult the Ultimaker Community."), + description: catalog.i18nc("@tooltip:button", "Consult the UltiMaker Community."), link: "https://community.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-community", permissionsRequired: [] }, @@ -87,7 +87,7 @@ Popup { displayName: "Ultimaker.com", //Not translated, since it's a URL. thumbnail: UM.Theme.getIcon("Browser"), - description: catalog.i18nc("@tooltip:button", "Visit the Ultimaker website."), + description: catalog.i18nc("@tooltip:button", "Visit the UltiMaker website."), link: "https://ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-umwebsite", permissionsRequired: [] } diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index e3fdbfa787..4ccf58d0b4 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -84,7 +84,7 @@ UM.Dialog width: parent.width //: About dialog application author note - text: catalog.i18nc("@info:credit","Cura is developed by Ultimaker B.V. in cooperation with the community.\nCura proudly uses the following open source projects:") + text: catalog.i18nc("@info:credit","Cura is developed by UltiMaker in cooperation with the community.\nCura proudly uses the following open source projects:") font: UM.Theme.getFont("system") wrapMode: Text.WordWrap anchors.top: description.bottom @@ -134,7 +134,7 @@ UM.Dialog Component.onCompleted: { //Do NOT add dependencies of our dependencies here, nor CI-dependencies! - //Ultimaker's own projects and forks. + //UltiMaker's own projects and forks. projectsModel.append({ name: "Cura", description: catalog.i18nc("@label Description for application component", "Graphical user interface"), license: "LGPLv3", url: "https://github.com/Ultimaker/Cura" }); projectsModel.append({ name: "Uranium", description: catalog.i18nc("@label Description for application component", "Application framework"), license: "LGPLv3", url: "https://github.com/Ultimaker/Uranium" }); projectsModel.append({ name: "CuraEngine", description: catalog.i18nc("@label Description for application component", "G-code generator"), license: "AGPLv3", url: "https://github.com/Ultimaker/CuraEngine" }); diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 0b39d84177..0fecb6b662 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -56,7 +56,7 @@ UM.Dialog UM.Label { id: infoText - text: catalog.i18nc("@text:window, %1 is a profile name", "You have customized some profile settings. Would you like to Keep these changed settings after switching profiles? Alternatively, you can discard the changes to load the defaults from '%1'.").arg(Cura.MachineManager.activeQualityDisplayNameMap["main"]) + text: catalog.i18nc("@text:window, %1 is a profile name", "You have customized some profile settings. Would you like to Keep these changed settings after switching profiles? Alternatively, you can discard the changes to load the defaults from '%1'.").arg(Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - ")) anchors.left: parent.left anchors.right: parent.right wrapMode: Text.WordWrap @@ -83,7 +83,7 @@ UM.Dialog columnHeaders: [ catalog.i18nc("@title:column", "Profile settings"), - Cura.MachineManager.activeQualityDisplayNameMap["main"], + Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - "), catalog.i18nc("@title:column", "Current changes") ] model: UM.TableModel diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index f285bc0c75..32bbcd5053 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -859,7 +859,7 @@ UM.PreferencesPage { width: childrenRect.width height: visible ? childrenRect.height : 0 - text: catalog.i18nc("@info:tooltip", "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.") + text: catalog.i18nc("@info:tooltip", "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.") UM.CheckBox { diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 554b663a9b..e64f211cd1 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -67,7 +67,7 @@ Item UM.Label { id: textLabel - text: Cura.MachineManager.activeQualityDisplayNameMap["main"] + text: Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - ") Layout.margins: 0 Layout.maximumWidth: Math.floor(parent.width * 0.7) // Always leave >= 30% for the rest of the row. height: contentHeight @@ -77,7 +77,19 @@ Item UM.Label { - text: activeQualityDetailText() + text: + { + const string_parts = Cura.MachineManager.activeQualityDisplayNameTailStringParts; + if (string_parts.length === 0) + { + return ""; + } + else + { + ` - ${string_parts.join(" - ")}` + } + } + color: UM.Theme.getColor("text_detail") Layout.margins: 0 Layout.fillWidth: true @@ -85,32 +97,6 @@ Item height: contentHeight elide: Text.ElideRight wrapMode: Text.NoWrap - function activeQualityDetailText() - { - var resultMap = Cura.MachineManager.activeQualityDisplayNameMap - var resultSuffix = resultMap["suffix"] - var result = "" - - if (Cura.MachineManager.isActiveQualityExperimental) - { - resultSuffix += " (Experimental)" - } - - if (Cura.MachineManager.isActiveQualitySupported) - { - if (Cura.MachineManager.activeQualityLayerHeight > 0) - { - if (resultSuffix) - { - result += " - " + resultSuffix - } - result += " - " - result += Cura.MachineManager.activeQualityLayerHeight + "mm" - } - } - - return result - } } } diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 41e913a2c1..8804e51bb2 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -17,26 +17,8 @@ RowLayout { source: UM.Theme.getIcon("Sliders", "medium") iconSize: UM.Theme.getSize("button_icon").width - text: - { - if (Cura.MachineManager.activeStack) - { - var resultMap = Cura.MachineManager.activeQualityDisplayNameMap - var text = resultMap["main"] - if (resultMap["suffix"]) - { - text += " - " + resultMap["suffix"] - } - if (!Cura.MachineManager.hasNotSupportedQuality) - { - text += " - " + layerHeight.properties.value + "mm" - text += Cura.MachineManager.isActiveQualityExperimental ? " - " + catalog.i18nc("@label", "Experimental") : "" - } - return text - } - return "" - } + text: Cura.MachineManager.activeQualityDisplayNameStringParts.join(" - ") font: UM.Theme.getFont("medium") elide: Text.ElideMiddle wrapMode: Text.NoWrap diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 0008529408..b8b27049f6 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -11,12 +11,29 @@ Cura.ExpandablePopup { id: machineSelector - property bool isNetworkPrinter: Cura.MachineManager.activeMachineHasNetworkConnection - property bool isConnectedCloudPrinter: Cura.MachineManager.activeMachineHasCloudConnection - property bool isCloudRegistered: Cura.MachineManager.activeMachineHasCloudRegistration - property bool isGroup: Cura.MachineManager.activeMachineIsGroup + property Cura.MachineManager machineManager + property bool isNetworkPrinter: machineManager.activeMachineHasNetworkConnection + property bool isConnectedCloudPrinter: machineManager.activeMachineHasCloudConnection + property bool isCloudRegistered: machineManager.activeMachineHasCloudRegistration + property bool isGroup: machineManager.activeMachineIsGroup + property string machineName: { + if (isNetworkPrinter && machineManager.activeMachineNetworkGroupName != "") + { + return machineManager.activeMachineNetworkGroupName + } + if (machineManager.activeMachine != null) + { + return machineManager.activeMachine.name + } + return "" + } - readonly property string connectionStatus: { + property alias machineListModel: machineSelectorList.model + property alias onSelectPrinter: machineSelectorList.onSelectPrinter + + property list buttons + + property string connectionStatus: { if (isNetworkPrinter) { return "printer_connected" @@ -42,7 +59,7 @@ Cura.ExpandablePopup { if (Cura.API.account.isLoggedIn) { - if (Cura.MachineManager.activeMachineIsLinkedToCurrentAccount) + if (machineManager.activeMachineIsLinkedToCurrentAccount) { return catalog.i18nc("@status", "The cloud printer is offline. Please check if the printer is turned on and connected to the internet.") } @@ -55,7 +72,8 @@ Cura.ExpandablePopup { return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please sign in to connect to the cloud printer.") } - } else + } + else { return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please check your internet connection.") } @@ -77,18 +95,8 @@ Cura.ExpandablePopup headerItem: Cura.IconWithText { - text: - { - if (isNetworkPrinter && Cura.MachineManager.activeMachineNetworkGroupName != "") - { - return Cura.MachineManager.activeMachineNetworkGroupName - } - if(Cura.MachineManager.activeMachine != null) - { - return Cura.MachineManager.activeMachine.name - } - return "" - } + text: machineName + source: { if (isGroup) @@ -140,7 +148,7 @@ Cura.ExpandablePopup color: connectionStatus == "printer_cloud_not_available" ? UM.Theme.getColor("cloud_unavailable") : UM.Theme.getColor("primary") - visible: isNetworkPrinter || isCloudRegistered + visible: (isNetworkPrinter || isCloudRegistered) && source != "" // Make a themable circle in the background so we can change it in other themes Rectangle @@ -156,7 +164,8 @@ Cura.ExpandablePopup } - MouseArea // Connection status tooltip hover area + // Connection status tooltip hover area + MouseArea { id: connectionStatusTooltipHoverArea anchors.fill: parent @@ -189,11 +198,14 @@ Cura.ExpandablePopup } } + property int minDropDownWidth: UM.Theme.getSize("machine_selector_widget_content").width + property int maxDropDownHeight: UM.Theme.getSize("machine_selector_widget_content").height + contentItem: Item { id: popup - implicitWidth: Math.max(machineSelector.width, UM.Theme.getSize("machine_selector_widget_content").width) - implicitHeight: Math.min(machineSelectorList.contentHeight + separator.height + buttonRow.height, UM.Theme.getSize("machine_selector_widget_content").height) //Maximum height is the theme entry. + implicitWidth: Math.max(machineSelector.width, minDropDownWidth) + implicitHeight: Math.min(machineSelectorList.contentHeight + separator.height + buttonRow.height, maxDropDownHeight) //Maximum height is the theme entry. MachineSelectorList { id: machineSelectorList @@ -229,39 +241,25 @@ Cura.ExpandablePopup padding: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width - Cura.SecondaryButton - { - id: addPrinterButton - leftPadding: UM.Theme.getSize("default_margin").width - rightPadding: UM.Theme.getSize("default_margin").width - text: catalog.i18nc("@button", "Add printer") - // The maximum width of the button is half of the total space, minus the padding of the parent, the left - // padding of the component and half the spacing because of the space between buttons. - fixedWidthMode: true - width: buttonRow.width / 2 - leftPadding * 1.5 - onClicked: - { - toggleContent() - Cura.Actions.addMachine.trigger() - } - } - - Cura.SecondaryButton - { - id: managePrinterButton - leftPadding: UM.Theme.getSize("default_margin").width - rightPadding: UM.Theme.getSize("default_margin").width - text: catalog.i18nc("@button", "Manage printers") - fixedWidthMode: true - // The maximum width of the button is half of the total space, minus the padding of the parent, the right - // padding of the component and half the spacing because of the space between buttons. - width: buttonRow.width / 2 - rightPadding * 1.5 - onClicked: - { - toggleContent() - Cura.Actions.configureMachines.trigger() - } - } + children: buttons } + + states: [ + State { + name: "noButtons" + when: !buttons || buttons.length == 0 + PropertyChanges + { + target: buttonRow + height: 0 + padding: 0 + } + PropertyChanges + { + target: separator + height: 0 + } + } + ] } } diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml index a328ae69d9..ddf9586065 100644 --- a/resources/qml/PrinterSelector/MachineSelectorList.qml +++ b/resources/qml/PrinterSelector/MachineSelectorList.qml @@ -10,9 +10,9 @@ import Cura 1.0 as Cura ListView { id: listView - model: Cura.MachineListModel {} - section.property: "isOnline" + section.property: "category" property real contentHeight: childrenRect.height + property var onSelectPrinter ScrollBar.vertical: UM.ScrollBar { @@ -21,7 +21,17 @@ ListView section.delegate: UM.Label { - text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Other printers") + text: { + switch (section) + { + case "connected": + return catalog.i18nc("@label", "Connected printers"); + case "other": + return catalog.i18nc("@label", "Other printers"); + default: + return catalog.i18nc("@label", "Other printers"); + } + } height: UM.Theme.getSize("action_button").height width: parent.width - scrollBar.width leftPadding: UM.Theme.getSize("default_margin").width @@ -43,8 +53,7 @@ ListView listView.model.setShowCloudPrinters(true); break; case "MACHINE": - toggleContent() - Cura.MachineManager.setActiveMachine(model.id) + if (typeof onSelectPrinter === "function") onSelectPrinter(model); break; default: } diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index cbabb3ffd4..c57c0a1548 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/resources/qml/Settings/SettingComboBox.qml @@ -18,6 +18,7 @@ SettingItem model: definition.options textRole: "value" + forceHighlight: base.hovered anchors.fill: parent diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 567161b8f6..63413aa9bd 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -17,6 +17,8 @@ SettingItem id: control anchors.fill: parent + forceHighlight: base.hovered + property var extrudersModel: CuraApplication.getExtrudersModel() model: extrudersModel diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 22f03d44a2..a9fdc626b9 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -23,6 +23,7 @@ SettingItem { id: control anchors.fill: parent + forceHighlight: base.hovered model: base.extrudersWithOptionalModel diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index 90fdd2be91..9cc5b85f04 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 @@ -193,12 +193,12 @@ Item if (addPrinterByIpScreen.hasRequestFinished) { return catalog.i18nc("@label", "Could not connect to device.") + "

    " - + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + ""; + + catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + ""; } else { return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "

    " - + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + ""; + + catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + ""; } } onLinkActivated: Qt.openUrlExternally(link) diff --git a/resources/qml/WelcomePages/AddThirdPartyPrinter.qml b/resources/qml/WelcomePages/AddThirdPartyPrinter.qml index f25cdccbf1..2c6c3a19bf 100644 --- a/resources/qml/WelcomePages/AddThirdPartyPrinter.qml +++ b/resources/qml/WelcomePages/AddThirdPartyPrinter.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -99,7 +99,7 @@ Item id: backButton anchors.left: parent.left anchors.bottom: parent.bottom - text: catalog.i18nc("@button", "Add Ultimaker printer via Digital Factory") + text: catalog.i18nc("@button", "Add UltiMaker printer via Digital Factory") onClicked: goToUltimakerPrinter() } diff --git a/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml b/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml index c76979fecf..2e02e35c46 100644 --- a/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml +++ b/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -52,7 +52,7 @@ Control id: ultimakerPrinterCard Layout.alignment: Qt.AlignBottom onClicked: goToUltimakerPrinter - text: catalog.i18nc("@button", "Ultimaker printer") + text: catalog.i18nc("@button", "UltiMaker printer") imageSource: UM.Theme.getImage("ultimaker_printer") } @@ -61,7 +61,7 @@ Control id: thrirdPartyPrinterCard Layout.alignment: Qt.AlignBottom onClicked: goToThirdPartyPrinter - text: catalog.i18nc("@button", "Non Ultimaker printer") + text: catalog.i18nc("@button", "Non UltiMaker printer") imageSource: UM.Theme.getImage("third_party_printer") } } diff --git a/resources/qml/WelcomePages/AddUltimakerPrinter.qml b/resources/qml/WelcomePages/AddUltimakerPrinter.qml index f175942e06..f66b8de2de 100644 --- a/resources/qml/WelcomePages/AddUltimakerPrinter.qml +++ b/resources/qml/WelcomePages/AddUltimakerPrinter.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -26,61 +26,66 @@ Control contentItem: ColumnLayout { + Layout.fillWidth: true UM.Label { Layout.fillWidth: true - text: catalog.i18nc("@label", "New Ultimaker printers can be connected to Digital Factory and monitored remotely.") + text: catalog.i18nc("@label", "New UltiMaker printers can be connected to Digital Factory and monitored remotely.") wrapMode: Text.WordWrap } RowLayout { Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: true - Image + Item { - source: UM.Theme.getImage("add_printer") - Layout.preferredWidth: 200 * screenScaleFactor - Layout.preferredHeight: 200 * screenScaleFactor + Layout.fillWidth: true + Layout.minimumWidth: childrenRect.width + Layout.preferredHeight: childrenRect.height + + Image + { + anchors.right: parent.right + source: UM.Theme.getImage("add_printer") + Layout.preferredWidth: 200 * screenScaleFactor + Layout.preferredHeight: 200 * screenScaleFactor + } } ColumnLayout { Layout.fillHeight: true - Layout.fillWidth: false + Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter spacing: UM.Theme.getSize("default_margin").height UM.Label { - Layout.fillWidth: false + Layout.fillWidth: true Layout.alignment: Qt.AlignTop wrapMode: Text.WordWrap font: UM.Theme.getFont("default_bold") - text: catalog.i18nc("@label", "If you are trying to add a new Ultimaker printer to Cura") + text: catalog.i18nc("@label", "If you are trying to add a new UltiMaker printer to Cura") } ColumnLayout { spacing: 0 - - FontMetrics - { - id: fontMetrics - font: UM.Theme.getFont("default") - } + Layout.fillWidth: true Repeater { model: [ - catalog.i18nc("@info", "Sign in into Ultimaker Digilal Factory"), + catalog.i18nc("@info", "Sign in into UltiMaker Digilal Factory"), catalog.i18nc("@info", "Follow the procedure to add a new printer"), catalog.i18nc("@info", "Your new printer will automatically appear in Cura"), ] UM.Label { Layout.alignment: Qt.AlignTop - font: fontMetrics.font - Layout.preferredHeight: fontMetrics.height + Layout.fillWidth: true + wrapMode: Text.WordWrap text: `${index + 1}. ${modelData}` } } diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index cf830a9b36..54e95462e0 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -61,7 +61,7 @@ Item id: titleLabel anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") + text: catalog.i18nc("@label", "Sign in to the UltiMaker platform") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") } @@ -172,7 +172,7 @@ Item id: communityTextLabel anchors.horizontalCenter: communityColumn.horizontalCenter width: parent.width - text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the Ultimaker Community") + text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the UltiMaker Community") horizontalAlignment: Text.AlignHCenter } } @@ -198,7 +198,7 @@ Item anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.bottom: parent.bottom - text: catalog.i18nc("@text", "Create a free Ultimaker Account") + text: catalog.i18nc("@text", "Create a free UltiMaker Account") onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=onboarding-signup") } diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index ece437890e..603074adae 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -21,7 +21,7 @@ Item anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura") + text: catalog.i18nc("@label", "Help us to improve UltiMaker Cura") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") } @@ -53,7 +53,7 @@ Item width: parent.width anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:") + text: catalog.i18nc("@text", "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:") wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") } @@ -96,7 +96,7 @@ Item horizontalAlignment: Text.AlignHCenter text: { - var t = catalog.i18nc("@text", "Data collected by Ultimaker Cura will not contain any personal information.") + var t = catalog.i18nc("@text", "Data collected by UltiMaker Cura will not contain any personal information.") var t2 = catalog.i18nc("@text", "More information") t += " " + t2 + "" return t diff --git a/resources/qml/WelcomePages/UserAgreementContent.qml b/resources/qml/WelcomePages/UserAgreementContent.qml index dcff613efb..4a98a98e57 100644 --- a/resources/qml/WelcomePages/UserAgreementContent.qml +++ b/resources/qml/WelcomePages/UserAgreementContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -36,10 +36,10 @@ Item right: parent.right } - text: "

    Disclaimer by Ultimaker

    " + text: "

    Disclaimer by UltiMaker

    " + "

    Please read this disclaimer carefully.

    " - + "

    Except when otherwise stated in writing, Ultimaker provides any Ultimaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and performance of Ultimaker software is with you.

    " - + "

    Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.

    " + + "

    Except when otherwise stated in writing, UltiMaker provides any UltiMaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and performance of UltiMaker software is with you.

    " + + "

    Unless required by applicable law or agreed to in writing, in no event will UltiMaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any UltiMaker software or third party software.

    " textFormat: Text.RichText wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 4123535cc9..ecfa5db68f 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -53,7 +53,7 @@ Item id: titleLabel anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") + text: catalog.i18nc("@label", "Welcome to UltiMaker Cura") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge_bold") } @@ -64,7 +64,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width - text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura. This will only take a few moments.") + text: catalog.i18nc("@text", "Please follow these steps to set up UltiMaker Cura. This will only take a few moments.") font: UM.Theme.getFont("medium") } diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index eac85bfb44..efe14497bc 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -18,6 +18,10 @@ ComboBox property var defaultTextOnEmptyModel: catalog.i18nc("@label", "No items to select from") // Text displayed in the combobox when the model is empty property var defaultTextOnEmptyIndex: "" // Text displayed in the combobox when the model has items but no item is selected property alias textFormat: contentLabel.textFormat + property alias backgroundColor: background.color + property bool forceHighlight: false + property int contentLeftPadding: UM.Theme.getSize("setting_unit_margin").width + property var textFont: UM.Theme.getFont("default") enabled: delegateModel.count > 0 @@ -45,7 +49,7 @@ ComboBox State { name: "highlighted" - when: (base.hovered || control.hovered) && !control.activeFocus + when: (control.hovered && !control.activeFocus) || forceHighlight PropertyChanges { target: background @@ -56,6 +60,7 @@ ComboBox background: UM.UnderlineBackground { + id: background // Rectangle for highlighting when this combobox needs to pulse. Rectangle { @@ -101,9 +106,10 @@ ComboBox contentItem: UM.Label { id: contentLabel - leftPadding: UM.Theme.getSize("setting_unit_margin").width + UM.Theme.getSize("default_margin").width + leftPadding: contentLeftPadding + UM.Theme.getSize("default_margin").width anchors.right: downArrow.left wrapMode: Text.NoWrap + font: textFont text: { if (control.delegateModel.count == 0) @@ -173,11 +179,12 @@ ComboBox id: delegateLabel // FIXME: Somehow the top/bottom anchoring is not correct on Linux and it results in invisible texts. anchors.fill: parent - anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width + anchors.leftMargin: contentLeftPadding anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width text: delegateItem.text textFormat: control.textFormat + font: textFont color: UM.Theme.getColor("setting_control_text") elide: Text.ElideRight wrapMode: Text.NoWrap diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg index e6ba07e333..59183e1226 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg @@ -18,5 +18,4 @@ cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 20 speed_print = 30 -top_bottom_thickness = 0.72 -retraction_combing_max_distance = 50 \ No newline at end of file +top_bottom_thickness = 0.72 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg index ecc275955a..131196e4f2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 45 speed_travel = 150 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg index 04edfcc04e..21e4815242 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 2 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 20 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg index 575f34afa5..a5bc52107a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg index 3bbfcae59a..f9bb6000df 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 5 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 8 infill_sparse_density = 20 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 40 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg index b423160845..ab3546eda5 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg @@ -18,5 +18,4 @@ cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 -top_bottom_thickness = 1.2 -retraction_combing_max_distance = 50 \ No newline at end of file +top_bottom_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg index 1b72899389..1a617d5a7b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg @@ -20,7 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg index 9ca4dec093..e7b4596e32 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg @@ -20,7 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg index bdf526c785..d8390ebf5e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg @@ -20,7 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg index f9348f6118..780e81c8ec 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg @@ -20,7 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg index a612263cfa..1fcd6241b0 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg @@ -27,5 +27,4 @@ speed_wall_x = =speed_print support_angle = 45 support_enable = True support_z_distance = 0.26 -top_bottom_thickness = 1.2 -retraction_combing_max_distance = 50 \ No newline at end of file +top_bottom_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg index 5bf30209fe..156c0cb434 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg @@ -28,4 +28,3 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.2 -retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg index dbdc672498..6aaf960862 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg @@ -18,5 +18,4 @@ cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 15 infill_sparse_density = 20 speed_print = 30 -top_bottom_thickness = 0.72 -retraction_combing_max_distance = 8 \ No newline at end of file +top_bottom_thickness = 0.72 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg index fc7dec4b93..4880801cc4 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg @@ -24,5 +24,4 @@ top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) -retraction_combing_max_distance = 8 \ No newline at end of file +speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg index a14e2fa0e9..242094359e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg @@ -24,5 +24,4 @@ top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) -retraction_combing_max_distance = 8 \ No newline at end of file +speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg index 1daeacf5b1..9eabf0f070 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg @@ -19,5 +19,4 @@ cool_min_speed = 10 infill_sparse_density = 20 speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) -top_bottom_thickness = 0.8 -retraction_combing_max_distance = 8 \ No newline at end of file +top_bottom_thickness = 0.8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg index 7598e7bce6..fa4835b5e0 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg @@ -18,5 +18,4 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 -top_bottom_thickness = 1.2 -retraction_combing_max_distance = 8 \ No newline at end of file +top_bottom_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg index 17badc67ef..e816088c5e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg @@ -18,5 +18,4 @@ cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 -top_bottom_thickness = 1.2 -retraction_combing_max_distance = 8 \ No newline at end of file +top_bottom_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg index ce7087bf3a..c9a96ecf1c 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -16,5 +16,4 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg index df43409808..398f4be2a0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg @@ -20,5 +20,4 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg index d7c1434f85..292389472c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg @@ -21,5 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_infill = =math.ceil(speed_print * 50 / 60) -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg index 22d4a931c4..69bff08818 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -21,5 +21,4 @@ speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) speed_infill = =math.ceil(speed_print * 45 / 55) -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg index 5e296b117a..caa2516bb4 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg @@ -18,5 +18,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg index 7b203fe360..c36030f0f6 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -21,5 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_infill = =math.ceil(speed_print * 33 / 45) -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg index 1117ab1a43..0dbd21ea00 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -19,5 +19,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg index 5ced8748b1..2c7b1f63f3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -12,7 +12,6 @@ material = generic_cpe variant = AA 0.25 [values] -retraction_combing_max_distance = 50 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg index 8b42be13b0..45afd4501a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.25 [values] material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index 562023183d..177290c551 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -23,7 +23,6 @@ material_print_temperature = =default_material_print_temperature + 10 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index 86a955c24a..ebb934c56c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -23,7 +23,6 @@ material_print_temperature = =default_material_print_temperature + 10 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index cbd48442e3..42faffdd88 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -25,7 +25,6 @@ material_print_temperature = =default_material_print_temperature + 2 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index f70b6b22bf..bbbf14001b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -25,7 +25,6 @@ material_print_temperature = =default_material_print_temperature + 5 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 57ae37e209..7a0115080e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index 2becdb2bc2..5759d4d710 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -17,7 +17,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index 4774cea71f..df2df7d58f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -19,7 +19,6 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index e34a9c943d..5c182298a0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg index 08e059547d..5630992467 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 -retraction_combing_max_distance = 8 skin_overlap = 20 speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg index 81431a2089..d7a21b7db9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -17,7 +17,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg index 943b720e4d..7dc95765e5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -19,7 +19,6 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 10 -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg index c16ac3fb99..0d4448d7c5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index 16464b6394..a04f4ce184 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = True -retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 17bcb153be..8d93a7cc86 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index cd22ced2ce..d68a2fa7a5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 prime_tower_enable = True -retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index c05205a9f2..7672b99659 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 8cd5ba4ac2..c5fd2c0955 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True -retraction_combing_max_distance = 50 speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index 1d619bf42c..e0b9362e0b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 material_print_temperature = =default_material_print_temperature + 17 prime_tower_enable = True -retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index d4a1f6c985..b4ff2efe6c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 127166bd62..437c9a8a1e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -16,7 +16,6 @@ brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index ca5a5b8404..3c115ddec1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -16,7 +16,6 @@ brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg index f895450c0a..5220dc917c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg @@ -12,7 +12,6 @@ material = generic_cpe variant = AA 0.25 [values] -retraction_combing_max_distance = 50 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg index afd987af02..3f99451398 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.25 [values] material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 757c495559..6a7089ebe5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -23,7 +23,6 @@ material_print_temperature = =default_material_print_temperature + 10 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index 5e438c8704..06f2cc19b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -23,7 +23,6 @@ material_print_temperature = =default_material_print_temperature + 10 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index 6bcd25a9b9..be93585e5b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -25,7 +25,6 @@ material_print_temperature = =default_material_print_temperature + 2 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index cc08c9d5d6..1dce2eff05 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -25,7 +25,6 @@ material_print_temperature = =default_material_print_temperature + 5 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True -retraction_combing_max_distance = 50 retraction_hop = 0.2 retraction_hop_enabled = False retraction_hop_only_when_collides = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index b1f0be1594..b961ede473 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index e34aa7fd24..cf0eab0fca 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -17,7 +17,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 270b03521a..68a04f4f61 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -19,7 +19,6 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index f7f7979188..3a136fdd40 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg index f1e55234df..b07d4d37f1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 -retraction_combing_max_distance = 8 skin_overlap = 20 speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg index bdb4e78d6a..97b6d52fa8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -17,7 +17,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg index 58ddfca383..118dbded28 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -19,7 +19,6 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 10 -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg index 5a9addabb1..20c4c73716 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 9f7101546f..e014c6ae90 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = True -retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index c342e4d2f7..a4e265c4cf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index cf0b8da5b7..c27a37dafb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 prime_tower_enable = True -retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index 19f7e7be37..d10b520869 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index d15f1a7c84..4745f45d52 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True -retraction_combing_max_distance = 50 speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 721d0a8752..3e2317aea2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 material_print_temperature = =default_material_print_temperature + 17 prime_tower_enable = True -retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index c9dc99154d..c38b26a764 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -16,7 +16,6 @@ brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index 67bbef5ac0..2c627b32ca 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -16,7 +16,6 @@ brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index e25a61b38a..036943bba7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -16,7 +16,6 @@ brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True -retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 66a26d5466..b7aaeeeaa2 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -277,6 +277,9 @@ minimum_support_area support_interface_enable support_roof_enable support_bottom_enable +support_interface_wall_count +support_roof_wall_count +support_bottom_wall_count support_interface_height support_roof_height support_bottom_height diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 7fd5d797cd..ead7bbcb2f 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "Ultimaker Dark", + "name": "UltiMaker Dark", "inherits": "cura-light" }, diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 809bcfdee8..22986b3d68 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "Ultimaker" + "name": "UltiMaker" }, "fonts": {