diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index d25d71bcc9..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.github -resources/materials -CuraEngine \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 6dbe51a09e..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: CI -on: - push: - branches: - - master - - 'WIP**' - - '4.*' - - 'CURA-*' - pull_request: -jobs: - build: - runs-on: ubuntu-latest - container: ultimaker/cura-build-environment - steps: - - name: Checkout Cura - uses: actions/checkout@v2 - - name: Build - run: docker/build.sh - - name: Test - run: docker/test.sh diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml new file mode 100644 index 0000000000..4af608b7ac --- /dev/null +++ b/.github/workflows/conan-package-create.yml @@ -0,0 +1,153 @@ +name: Create and Upload Conan package + +on: + workflow_call: + inputs: + recipe_id_full: + required: true + type: string + + recipe_id_latest: + required: false + type: string + + runs_on: + required: true + type: string + + python_version: + required: true + type: string + + conan_config_branch: + required: false + type: string + + conan_logging_level: + required: false + type: string + + conan_clean_local_cache: + required: false + type: boolean + default: false + + conan_upload_community: + required: false + 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 }} + CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }} + CONAN_LOG_RUN_TO_OUTPUT: 1 + CONAN_LOGGING_LEVEL: ${{ inputs.conan_logging_level }} + CONAN_NON_INTERACTIVE: 1 + +jobs: + conan-package-create: + runs-on: ${{ inputs.runs_on }} + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: ${{ inputs.python_version }} + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt + + - name: Install Python requirements for runner + run: pip install -r .github/workflows/requirements-conan-package.txt + + - name: Use Conan download cache (Bash) + if: ${{ runner.os != 'Windows' }} + run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" + + - name: Use Conan download cache (Powershell) + if: ${{ runner.os == 'Windows' }} + run: conan config set storage.download_cache="C:\Users\runneradmin\.conan\conan_download_cache" + + - name: Cache Conan local repository packages (Bash) + uses: actions/cache@v3 + if: ${{ runner.os != 'Windows' }} + with: + path: | + $HOME/.conan/data + $HOME/.conan/conan_download_cache + key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache + + - name: Cache Conan local repository packages (Powershell) + uses: actions/cache@v3 + if: ${{ runner.os == 'Windows' }} + with: + path: | + C:\Users\runneradmin\.conan\data + C:\.conan + C:\Users\runneradmin\.conan\conan_download_cache + key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache + + - name: Install MacOS system requirements + if: ${{ runner.os == 'Macos' }} + run: brew install autoconf automake ninja + + - name: Install Linux system requirements + if: ${{ runner.os == 'Linux' }} + run: | + 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 + + - name: Install GCC-12 on ubuntu-22.04 + if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} + run: | + sudo apt install g++-12 gcc-12 -y + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + + - name: Create the default Conan profile + run: conan profile new default --detect + + - name: Get Conan configuration from branch + if: ${{ inputs.conan_config_branch != '' }} + run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" + + - name: Get Conan configuration + 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 }} + run: conan install ${{ inputs.recipe_id_full }} --build=missing --update + + - name: Create the Packages (from source) + if: ${{ inputs.create_from_source }} + run: conan create . ${{ inputs.recipe_id_full }} --build=missing --update + + - 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 latest alias + if: ${{ inputs.create_from_source && inputs.recipe_id_latest != '' && always() }} + run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} + + - name: Upload the Package(s) + if: always() + run: conan upload "*" -r cura --all -c + + - name: Upload the Package(s) community + if: ${{ always() && inputs.conan_upload_community == true }} + run: conan upload "*" -r cura-ce -c diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml new file mode 100644 index 0000000000..d7f4557b81 --- /dev/null +++ b/.github/workflows/conan-package.yml @@ -0,0 +1,103 @@ +--- +name: conan-package + +# Exports the recipe, sources and binaries for Mac, Windows and Linux and upload these to the server such that these can +# be used downstream. +# +# It should run on pushes against main or CURA-* branches, but it will only create the binaries for main and release branches + +on: + workflow_dispatch: + inputs: + create_binaries_windows: + required: true + default: false + description: 'create binaries Windows' + create_binaries_linux: + required: true + default: false + description: 'create binaries Linux' + create_binaries_macos: + required: true + default: false + description: 'create binaries Macos' + + push: + paths: + - 'plugins/**' + - 'resources/**' + - 'cura/**' + - 'icons/**' + - 'tests/**' + - 'packaging/**' + - '.github/workflows/conan-*.yml' + - '.github/workflows/notify.yml' + - '.github/workflows/requirements-conan-package.txt' + - 'requirements*.txt' + - 'conanfile.py' + - 'conandata.yml' + - 'GitVersion.yml' + - '*.jinja' + branches: + - main + - 'CURA-*' + - '[1-9].[0-9]' + - '[1-9].[0-9][0-9]' + tags: + - '[1-9].[0-9].[0-9]+' + - '[1-9].[0-9][0-9].[0-9]+' + +jobs: + conan-recipe-version: + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main + with: + project_name: cura + + conan-package-export: + needs: [ conan-recipe-version ] + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main + with: + recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} + recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} + runs_on: 'ubuntu-20.04' + python_version: '3.10.x' + conan_logging_level: 'info' + secrets: inherit + + conan-package-create-linux: + if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} + needs: [ conan-recipe-version, conan-package-export ] + + uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main + with: + recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} + runs_on: 'ubuntu-20.04' + python_version: '3.10.x' + conan_logging_level: 'info' + secrets: inherit + + notify-export: + if: ${{ always() }} + needs: [ conan-recipe-version, conan-package-export ] + + uses: ultimaker/cura/.github/workflows/notify.yml@main + with: + success: ${{ contains(join(needs.*.result, ','), 'success') }} + success_title: "New Conan recipe exported in ${{ github.repository }}" + success_body: "Exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" + failure_title: "Failed to export Conan Export in ${{ github.repository }}" + failure_body: "Failed to exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" + secrets: inherit + + notify-create: + if: ${{ always() && ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }} + needs: [ conan-recipe-version, conan-package-create-linux ] + + uses: ultimaker/cura/.github/workflows/notify.yml@main + with: + success: ${{ contains(join(needs.*.result, ','), 'success') }} + success_title: "New binaries created in ${{ github.repository }}" + success_body: "Created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" + failure_title: "Failed to create binaries in ${{ github.repository }}" + failure_body: "Failed to created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" + secrets: inherit diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml new file mode 100644 index 0000000000..f38c0046c9 --- /dev/null +++ b/.github/workflows/conan-recipe-export.yml @@ -0,0 +1,106 @@ +name: Export Conan Recipe to server + +on: + workflow_call: + inputs: + recipe_id_full: + required: true + type: string + + recipe_id_latest: + required: false + type: string + + runs_on: + required: true + type: string + + python_version: + required: true + type: string + + conan_config_branch: + required: false + type: string + + conan_logging_level: + required: false + type: string + + conan_export_binaries: + required: false + type: boolean + + conan_upload_community: + required: false + default: true + type: boolean + +env: + CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} + CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }} + CONAN_LOG_RUN_TO_OUTPUT: 1 + CONAN_LOGGING_LEVEL: ${{ inputs.conan_logging_level }} + CONAN_NON_INTERACTIVE: 1 + +jobs: + package-export: + runs-on: ${{ inputs.runs_on }} + + steps: + - name: Checkout project + uses: actions/checkout@v3 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: ${{ inputs.python_version }} + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt + + - name: Install Python requirements and Create default Conan profile + run: | + pip install -r .github/workflows/requirements-conan-package.txt + conan profile new default --detect + + - name: Cache Conan local repository packages + uses: actions/cache@v3 + with: + path: $HOME/.conan/data + key: ${{ runner.os }}-conan-export-cache + + - name: Get Conan configuration from branch + if: ${{ inputs.conan_config_branch != '' }} + run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" + + - name: Get Conan configuration + if: ${{ inputs.conan_config_branch == '' }} + run: conan config install https://github.com/Ultimaker/conan-config.git + + - name: Export the Package (binaries) + if: ${{ inputs.conan_export_binaries }} + run: conan create . ${{ inputs.recipe_id_full }} --build=missing --update + + - name: Export the Package + if: ${{ !inputs.conan_export_binaries }} + run: conan export . ${{ inputs.recipe_id_full }} + + - name: Remove the latest alias + if: ${{ 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 latest alias + if: ${{ inputs.recipe_id_latest != '' && always() }} + run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} + + - name: Upload the Package(s) + if: always() + run: conan upload "*" -r cura --all -c + + - name: Upload the Package(s) community + if: ${{ always() && inputs.conan_upload_community == true }} + run: conan upload "*" -r cura-ce -c diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml new file mode 100644 index 0000000000..ddadfe1781 --- /dev/null +++ b/.github/workflows/conan-recipe-version.yml @@ -0,0 +1,181 @@ +name: Get Conan Recipe Version + +on: + workflow_call: + inputs: + project_name: + required: true + type: string + + additional_buildmetadata: + required: false + default: "" + type: string + + outputs: + recipe_id_full: + description: "The full Conan recipe id: /@/" + value: ${{ jobs.get-semver.outputs.recipe_id_full }} + + recipe_id_latest: + description: "The full Conan recipe aliased (latest) id: /(latest)@/" + value: ${{ jobs.get-semver.outputs.recipe_id_latest }} + + recipe_semver_full: + description: "The full semver ..-+" + value: ${{ jobs.get-semver.outputs.semver_full }} + + is_release_branch: + description: "is current branch a release branch?" + value: ${{ jobs.get-semver.outputs.release_branch }} + + recipe_user: + description: "The conan user" + value: ${{ jobs.get-semver.outputs.user }} + + recipe_channel: + description: "The conan channel" + value: ${{ jobs.get-semver.outputs.channel }} + +jobs: + get-semver: + + runs-on: ubuntu-latest + + outputs: + recipe_id_full: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_full }} + recipe_id_latest: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_latest }} + semver_full: ${{ steps.get-conan-broadcast-data.outputs.semver_full }} + is_release_branch: ${{ steps.get-conan-broadcast-data.outputs.is_release_branch }} + user: ${{ steps.get-conan-broadcast-data.outputs.user }} + channel: ${{ steps.get-conan-broadcast-data.outputs.channel }} + + steps: + - name: Checkout repo + uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref }} + fetch-depth: 0 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: "3.10.x" + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt + + - name: Install Python requirements and Create default Conan profile + run: | + pip install -r .github/workflows/requirements-conan-package.txt + pip install gitpython + + - id: get-conan-broadcast-data + name: Get Conan broadcast data + run: | + import subprocess + from conans import tools + from conans.errors import ConanException + from git import Repo + + repo = Repo('.') + user = "${{ github.repository_owner }}".lower() + project_name = "${{ inputs.project_name }}" + event_name = "${{ github.event_name }}" + issue_number = "${{ github.ref }}".split('/')[2] + is_tag = "${{ github.ref_type }}" == "tag" + is_release_branch = False + buildmetadata = "" if "${{ inputs.additional_buildmetadata }}" == "" else "${{ inputs.additional_buildmetadata }}_" + + # FIXME: for when we push a tag (such as an release) + channel = "testing" + if is_tag: + branch_version = tools.Version("${{ github.ref_name }}") + is_release_branch = True + channel = "_" + user = "_" + else: + try: + branch_version = tools.Version(repo.active_branch.name) + except ConanException: + branch_version = tools.Version('0.0.0') + if "${{ github.ref_name }}" == f"{branch_version.major}.{branch_version.minor}": + channel = 'stable' + is_release_branch = True + elif "${{ github.ref_name }}" in ("main", "master"): + channel = 'testing' + else: + channel = repo.active_branch.name.split("_")[0].replace("-", "_").lower() + + if event_name == "pull_request": + channel = f"pr_{issue_number}" + + # %% Get the actual version + latest_branch_version = tools.Version("0.0.0") + latest_branch_tag = None + for tag in repo.git.tag(merged = True).splitlines(): + try: + version = tools.Version(tag) + except ConanException: + continue + if version > latest_branch_version: + latest_branch_version = version + latest_branch_tag = repo.tag(tag) + + # %% Get the actual version + no_commits = 0 + for commit in repo.iter_commits("HEAD"): + if commit == latest_branch_tag.commit: + break + no_commits += 1 + + if no_commits == 0: + # This is a release + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" + if channel == "stable": + user = "_" + channel = "_" + else: + if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: + # The prerealese did not contain a version number, default it to 1 + latest_branch_version.prerelease += ".1" + if event_name == "pull_request": + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" + else: + if channel in ("stable", "_", ""): + channel_metadata = f"{no_commits}" + else: + channel_metadata = f"{channel}_{no_commits}" + # FIXME: for when we create a new release branch + if latest_branch_version.prerelease == "": + bump_up_minor = int(latest_branch_version.minor) + 1 + actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{latest_branch_version.patch}-alpha+{buildmetadata}{channel_metadata}" + else: + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{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) + + 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"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()}") + print("::endgroup::") + shell: python diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml new file mode 100644 index 0000000000..10e7888029 --- /dev/null +++ b/.github/workflows/cura-installer.yml @@ -0,0 +1,254 @@ +name: Cura Installer + +on: + workflow_dispatch: + inputs: + cura_conan_version: + description: 'Cura Conan Version' + default: 'cura/latest@ultimaker/testing' + required: true + conan_args: + description: 'Conan args: eq.: --require-override' + default: '' + required: false + conan_config: + description: 'Conan config branch to use' + default: '' + required: false + enterprise: + description: 'Build Cura as an Enterprise edition' + required: true + default: false + type: boolean + staging: + description: 'Use staging API' + required: true + default: false + type: boolean + installer: + description: 'Create the installer' + required: true + default: false + 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 }} + CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }} + CONAN_LOG_RUN_TO_OUTPUT: 1 + CONAN_LOGGING_LEVEL: ${{ inputs.conan_logging_level }} + CONAN_NON_INTERACTIVE: 1 + CODESIGN_IDENTITY: ${{ secrets.CODESIGN_IDENTITY }} + MAC_NOTARIZE_USER: ${{ secrets.MAC_NOTARIZE_USER }} + MAC_NOTARIZE_PASS: ${{ secrets.MAC_NOTARIZE_PASS }} + MACOS_CERT_P12: ${{ secrets.MACOS_CERT_P12 }} + MACOS_CERT_PASS: ${{ secrets.MACOS_CERT_PASS }} + MACOS_CERT_USER: ${{ secrets.MACOS_CERT_USER }} + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + MACOS_CERT_PASSPHRASE: ${{ secrets.MACOS_CERT_PASSPHRASE }} + +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' } + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: '3.10.x' + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt + + - name: Install Python requirements for runner + run: pip install -r .github/workflows/requirements-conan-package.txt + + - name: Use Conan download cache (Bash) + if: ${{ runner.os != 'Windows' }} + run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" + + - name: Use Conan download cache (Powershell) + if: ${{ runner.os == 'Windows' }} + run: conan config set storage.download_cache="C:\Users\runneradmin\.conan\conan_download_cache" + + - name: Cache Conan local repository packages (Bash) + uses: actions/cache@v3 + if: ${{ runner.os != 'Windows' }} + with: + path: | + $HOME/.conan/data + $HOME/.conan/conan_download_cache + key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache + + - name: Cache Conan local repository packages (Powershell) + uses: actions/cache@v3 + if: ${{ runner.os == 'Windows' }} + with: + path: | + C:\Users\runneradmin\.conan\data + C:\.conan + C:\Users\runneradmin\.conan\conan_download_cache + key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache + + - name: Install MacOS system requirements + if: ${{ runner.os == 'Macos' }} + run: brew install autoconf automake ninja create-dmg + + - name: Install Linux system requirements + if: ${{ runner.os == 'Linux' }} + run: | + 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 + wget --no-check-certificate --quiet https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O $GITHUB_WORKSPACE/appimagetool + chmod +x $GITHUB_WORKSPACE/appimagetool + echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV + + - name: Install GCC-12 on ubuntu-22.04 + if: ${{ matrix.os == 'ubuntu-22.04' }} + run: | + sudo apt install g++-12 gcc-12 -y + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + + - name: Create the default Conan profile + run: conan profile new default --detect + + - name: Configure GPG Key Linux (Bash) + if: ${{ runner.os == 'Linux' }} + run: echo -n "$GPG_PRIVATE_KEY" | base64 --decode | gpg --import + + - name: Configure Macos keychain (Bash) + id: macos-keychain + if: ${{ runner.os == 'Macos' }} + uses: apple-actions/import-codesign-certs@v1 + with: + p12-file-base64: ${{ secrets.MACOS_CERT_P12 }} + p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }} + + - name: Clean Conan local cache + if: ${{ inputs.conan_clean_local_cache }} + run: conan remove "*" -f + + - name: Get Conan configuration from branch + if: ${{ inputs.conan_config_branch != '' }} + run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" + + - name: Get Conan configuration + if: ${{ inputs.conan_config_branch == '' }} + run: conan config install https://github.com/Ultimaker/conan-config.git + + - name: Create the Packages + run: conan install ${{ inputs.cura_conan_version }} ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" + + - name: Set Environment variables for Cura (bash) + if: ${{ runner.os != 'Windows' }} + run: | + . ./cura_inst/bin/activate_github_actions_env.sh + . ./cura_inst/bin/activate_github_actions_version_env.sh + + - name: Set Environment variables for Cura (Powershell) + if: ${{ runner.os == 'Windows' }} + run: | + .\cura_inst\Scripts\activate_github_actions_env.ps1 + .\cura_inst\Scripts\activate_github_actions_version_env.ps1 + + - name: Unlock Macos keychain (Bash) + if: ${{ runner.os == 'Macos' }} + run: security unlock -p $TEMP_KEYCHAIN_PASSWORD signing_temp.keychain + env: + TEMP_KEYCHAIN_PASSWORD: ${{ steps.macos-keychain.outputs.keychain-password }} + + # FIXME: This is a workaround to ensure that we use and pack a shared library for OpenSSL 1.1.1l. We currently compile + # OpenSSL statically for CPython, but our Python Dependenies (such as PyQt6) require a shared library. + # Because Conan won't allow for building the same library with two different options (easily) we need to install it explicitly + # and do a manual copy to the VirtualEnv, such that Pyinstaller can find it. + + - name: Install OpenSSL shared + run: conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy + + - name: Copy OpenSSL shared (Bash) + if: ${{ runner.os != 'Windows' }} + run: | + cp ./openssl/lib/*.so* ./cura_inst/bin/ || true + cp ./openssl/lib/*.dylib* ./cura_inst/bin/ || true + + - name: Copy OpenSSL shared (Powershell) + if: ${{ runner.os == 'Windows' }} + run: | + cp openssl/bin/*.dll ./cura_inst/Scripts/ + cp openssl/lib/*.lib ./cura_inst/Lib/ + + - name: Create the Cura dist + 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/" + 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" + 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" + 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" + 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" + working-directory: dist + + - name: Upload the artifacts + uses: actions/upload-artifact@v3 + with: + name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ matrix.os_id }} + path: | + dist/*.tar.gz + dist/*.zip + dist/*.exe + dist/*.msi + dist/*.dmg + dist/*.AppImage + dist/*.asc + retention-days: 5 + + notify-export: + if: ${{ always() }} + needs: [ cura-installer-create ] + + uses: ultimaker/cura/.github/workflows/notify.yml@main + with: + success: ${{ contains(join(needs.*.result, ','), 'success') }} + success_title: "Create the Cura distributions" + success_body: "Installers for ${{ inputs.cura_conan_version }}" + failure_title: "Failed to create the Cura distributions" + failure_body: "Failed to create at least 1 installer for ${{ inputs.cura_conan_version }}" + secrets: inherit diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml index 776aa1c652..b22c825c8c 100644 --- a/.github/workflows/no-response.yml +++ b/.github/workflows/no-response.yml @@ -7,7 +7,7 @@ on: types: [created] schedule: # Schedule for ten minutes after the hour, every hour - - cron: '10 * * * *' + - cron: '* */12 * * *' # By specifying the access of one of the scopes, all of those that are not # specified are set to 'none'. diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml new file mode 100644 index 0000000000..370b54c78b --- /dev/null +++ b/.github/workflows/notify.yml @@ -0,0 +1,54 @@ +name: Get Conan Recipe Version + +on: + workflow_call: + inputs: + success: + required: true + type: boolean + + success_title: + required: true + type: string + + success_body: + required: true + type: string + + failure_title: + required: true + type: string + + failure_body: + required: true + type: string + + +jobs: + slackNotification: + name: Slack Notification + + runs-on: ubuntu-latest + + steps: + - name: Slack notify on-success + if: ${{ inputs.success }} + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_USERNAME: ${{ github.repository }} + SLACK_COLOR: green + SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true + SLACK_TITLE: ${{ inputs.success_title }} + SLACK_MESSAGE: ${{ inputs.success_body }} + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + + - name: Slack notify on-failure + if: ${{ !inputs.success }} + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_USERNAME: ${{ github.repository }} + SLACK_COLOR: red + SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true + SLACK_TITLE: ${{ inputs.failure_title }} + SLACK_MESSAGE: ${{ inputs.failure_body }} + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt new file mode 100644 index 0000000000..fcc1379cfa --- /dev/null +++ b/.github/workflows/requirements-conan-package.txt @@ -0,0 +1,2 @@ +conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3 +sip diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml new file mode 100644 index 0000000000..20ea83bdb1 --- /dev/null +++ b/.github/workflows/unit-test.yml @@ -0,0 +1,164 @@ +--- +name: unit-test +# FIXME: This should be a reusable workflow + +on: + push: + paths: + - 'plugins/**' + - 'resources/**' + - 'cura/**' + - 'icons/**' + - 'tests/**' + - 'packaging/**' + - '.github/workflows/conan-*.yml' + - '.github/workflows/unit-test.yml' + - '.github/workflows/notify.yml' + - '.github/workflows/requirements-conan-package.txt' + - 'requirements*.txt' + - 'conanfile.py' + - 'conandata.yml' + - 'GitVersion.yml' + - '*.jinja' + branches: + - main + - 'CURA-*' + - '[1-9]+.[0-9]+' + tags: + - '[0-9]+.[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+-beta' + pull_request: + paths: + - 'plugins/**' + - 'resources/**' + - 'cura/**' + - 'icons/**' + - 'tests/**' + - 'packaging/**' + - '.github/workflows/conan-*.yml' + - '.github/workflows/unit-test.yml' + - '.github/workflows/notify.yml' + - '.github/workflows/requirements-conan-package.txt' + - 'requirements*.txt' + - 'conanfile.py' + - 'conandata.yml' + - 'GitVersion.yml' + - '*.jinja' + branches: + - main + - '[1-9]+.[0-9]+' + tags: + - '[0-9]+.[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+-beta' + +env: + CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} + CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }} + CONAN_LOG_RUN_TO_OUTPUT: 1 + CONAN_LOGGING_LEVEL: info + CONAN_NON_INTERACTIVE: 1 + +jobs: + conan-recipe-version: + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main + with: + project_name: cura + + testing: + runs-on: ubuntu-20.04 + needs: [ conan-recipe-version ] + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: '3.10.x' + architecture: 'x64' + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt + + - name: Install Python requirements and Create default Conan profile + run: | + pip install -r requirements-conan-package.txt + conan profile new default --detect + working-directory: .github/workflows/ + + - name: Use Conan download cache (Bash) + if: ${{ runner.os != 'Windows' }} + run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" + + - name: Cache Conan local repository packages (Bash) + uses: actions/cache@v3 + if: ${{ runner.os != 'Windows' }} + with: + path: | + $HOME/.conan/data + $HOME/.conan/conan_download_cache + key: conan-${{ runner.os }}-${{ runner.arch }}-unit-cache + + - name: Install Linux system requirements + if: ${{ runner.os == 'Linux' }} + run: 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 -y + + - name: Get Conan configuration + run: conan config install https://github.com/Ultimaker/conan-config.git + + - name: Install dependencies + run: conan install . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} --build=missing --update -o cura:devtools=True -g VirtualPythonEnv -if venv + + - name: Upload the Dependency package(s) + run: conan upload "*" -r cura --all -c + + - name: Set Environment variables for Cura (bash) + if: ${{ runner.os != 'Windows' }} + run: | + . ./venv/bin/activate_github_actions_env.sh + + - name: Run Unit Test + id: run-test + run: | + pytest --junitxml=junit_cura.xml + working-directory: tests + + - name: Upload Test Results + if: always() + uses: actions/upload-artifact@v3 + with: + name: Test Results + path: "tests/**/*.xml" + + publish-test-results: + runs-on: ubuntu-20.04 + needs: [ testing ] + if: success() || failure() + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Python and pip + uses: actions/setup-python@v4 + with: + python-version: '3.10.x' + architecture: 'x64' + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt + + - name: Download Artifacts + uses: actions/download-artifact@v3 + with: + path: artifacts + + - name: Publish Unit Test Results + id: test-results + uses: EnricoMi/publish-unit-test-result-action@v1 + with: + files: "artifacts/**/*.xml" + + - name: Conclusion + run: echo "Conclusion is ${{ fromJSON( steps.test-results.outputs.json ).conclusion }}" diff --git a/.gitignore b/.gitignore index c1fd5477d9..26fe1ccf4a 100644 --- a/.gitignore +++ b/.gitignore @@ -89,4 +89,13 @@ CuraEngine #Prevents import failures when plugin running tests plugins/__init__.py -/venv +venv/ +build/ +dist/ +conaninfo.txt +conan.lock +conan_imports_manifest.txt +conanbuildinfo.txt +graph_info.json +Ultimaker-Cura.spec +.run/ diff --git a/.run_templates/pycharm_cura_run.run.xml.jinja b/.run_templates/pycharm_cura_run.run.xml.jinja new file mode 100644 index 0000000000..3c04c5eaef --- /dev/null +++ b/.run_templates/pycharm_cura_run.run.xml.jinja @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/.run_templates/pycharm_cura_test.run.xml.jinja b/.run_templates/pycharm_cura_test.run.xml.jinja new file mode 100644 index 0000000000..428876ee52 --- /dev/null +++ b/.run_templates/pycharm_cura_test.run.xml.jinja @@ -0,0 +1,23 @@ + + + + + diff --git a/CMakeLists.txt b/CMakeLists.txt index f61737fbcf..9d6e3c709b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +# For MSVC flags, will be ignored on non-Windows OS's and this project in general. Only needed for cura-build-environment. +cmake_policy(SET CMP0091 NEW) project(cura) cmake_minimum_required(VERSION 3.18) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja new file mode 100644 index 0000000000..1c8ff0551c --- /dev/null +++ b/CuraVersion.py.jinja @@ -0,0 +1,14 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +CuraAppName = "{{ cura_app_name }}" +CuraAppDisplayName = "{{ cura_app_display_name }}" +CuraVersion = "{{ cura_version }}" +CuraBuildType = "{{ cura_build_type }}" +CuraDebugMode = {{ cura_debug_mode }} +CuraCloudAPIRoot = "{{ cura_cloud_api_root }}" +CuraCloudAPIVersion = "{{ cura_cloud_api_version }}" +CuraCloudAccountAPIRoot = "{{ cura_cloud_account_api_root }}" +CuraMarketplaceRoot = "{{ cura_marketplace_root }}" +CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" +CuraLatestURL = "{{ cura_latest_url }}" diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 68255c56b9..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ultimaker/cura-build-environment:1 - -# Environment vars for easy configuration -ENV CURA_APP_DIR=/srv/cura - -# Ensure our sources dir exists -RUN mkdir $CURA_APP_DIR - -# Setup CuraEngine -ENV CURA_ENGINE_BRANCH=master -WORKDIR $CURA_APP_DIR -RUN git clone -b $CURA_ENGINE_BRANCH --depth 1 https://github.com/Ultimaker/CuraEngine -WORKDIR $CURA_APP_DIR/CuraEngine -RUN mkdir build -WORKDIR $CURA_APP_DIR/CuraEngine/build -RUN cmake3 .. -RUN make -RUN make install - -# TODO: setup libCharon - -# Setup Uranium -ENV URANIUM_BRANCH=master -WORKDIR $CURA_APP_DIR -RUN git clone -b $URANIUM_BRANCH --depth 1 https://github.com/Ultimaker/Uranium - -# Setup materials -ENV MATERIALS_BRANCH=master -WORKDIR $CURA_APP_DIR -RUN git clone -b $MATERIALS_BRANCH --depth 1 https://github.com/Ultimaker/fdm_materials materials - -# Setup Cura -WORKDIR $CURA_APP_DIR/Cura -ADD . . -RUN mv $CURA_APP_DIR/materials resources/materials - -# Make sure Cura can find CuraEngine -RUN ln -s /usr/local/bin/CuraEngine $CURA_APP_DIR/Cura - -# Run Cura -WORKDIR $CURA_APP_DIR/Cura -ENV PYTHONPATH=${PYTHONPATH}:$CURA_APP_DIR/Uranium -RUN chmod +x ./CuraEngine -RUN chmod +x ./run_in_docker.sh -CMD "./run_in_docker.sh" diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000000..6f94c14540 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,55 @@ +mode: ContinuousDelivery +next-version: 5.1 +branches: + main: + regex: ^main$ + mode: ContinuousDelivery + tag: alpha + increment: None + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: [ ] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + develop: + regex: ^CURA-.*$ + mode: ContinuousDelivery + tag: alpha + increment: None + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [ 'main' ] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + release: + regex: ^[\d]+\.[\d]+$ + mode: ContinuousDelivery + tag: beta + increment: None + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: [ 'main' ] + tracks-release-branches: false + is-release-branch: true + is-mainline: false + pre-release-weight: 30000 + pull-request-main: + regex: ^(pull|pull\-requests|pr)[/-] + mode: ContinuousDelivery + tag: alpha+ + increment: Inherit + prevent-increment-of-merged-branch-version: true + tag-number-pattern: '[/-](?\d+)[-/]' + track-merge-target: true + source-branches: [ 'main' ] + tracks-release-branches: false + is-release-branch: false + is-mainline: false + pre-release-weight: 30000 +ignore: + sha: [ ] +merge-message-formats: { } diff --git a/README.md b/README.md index 1090d13aa7..36e829981f 100644 --- a/README.md +++ b/README.md @@ -1,61 +1,96 @@ -Cura -==== -Ultimaker Cura is a state-of-the-art slicer application to prepare your 3D models for printing with a 3D printer. With hundreds of settings and hundreds of community-managed print profiles, Ultimaker Cura is sure to lead your next project to a success. -![Screenshot](cura-logo.PNG) +
-Logging Issues ------------- -For crashes and similar issues, please attach the following information: +
-* (On Windows) The log as produced by dxdiag (start -> run -> dxdiag -> save output) -* The Cura GUI log file, located at - * `%APPDATA%\cura\\cura.log` (Windows), or usually `C:\Users\\AppData\Roaming\cura\\cura.log` - * `$HOME/Library/Application Support/cura//cura.log` (OSX) - * `$HOME/.local/share/cura//cura.log` (Ubuntu/Linux) +[![Badge Issues]][Issues]    +[![Badge PullRequests]][PullRequests]    +[![Badge Closed]][Closed] -If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder +[![Badge Size]][#]    +[![Badge License]][License]    +[![Badge Contributors]][Contributors] -For additional support, you could also ask in the [#cura channel](https://web.libera.chat/#cura) on [libera.chat](https://libera.chat/). For help with development, there is also the [#cura-dev channel](https://web.libera.chat/#cura-dev). +[![Badge Test]][Test]    +[![Badge Conan]][Conan]    -Dependencies ------------- -* [Uranium](https://github.com/Ultimaker/Uranium) Cura is built on top of the Uranium framework. -* [CuraEngine](https://github.com/Ultimaker/CuraEngine) This will be needed at runtime to perform the actual slicing. -* [fdm_materials](https://github.com/Ultimaker/fdm_materials) Required to load a printer that has swappable material profiles. -* [PySerial](https://github.com/pyserial/pyserial) Only required for USB printing support. -* [python-zeroconf](https://github.com/jstasiak/python-zeroconf) Only required to detect mDNS-enabled printers. +
+
-For a list of required Python packages, with their recommended version, see `requirements.txt`. +![Logo] -This list is not exhaustive at the moment, please check the links in the next section for more details. +# Ultimaker Cura -Build scripts -------------- -Please check out [cura-build](https://github.com/Ultimaker/cura-build) for detailed building instructions. +*State-of-the-art slicer app to prepare*
+*your 3D models for your 3D printer.* -If you want to build the entire environment from scratch before building Cura as well, [cura-build-environment](https://github.com/Ultimaker/cura-build-environment) might be a starting point before cura-build. (Again, see cura-build for more details.) +*With hundreds of settings & community-managed print profiles,*
+*Ultimaker Cura is sure to lead your next project to a success.* -Running from Source -------------- -Please check our [Wiki page](https://github.com/Ultimaker/Cura/wiki/Running-Cura-from-Source) for details about running Cura from source. +
+
-Plugins -------------- -Please check our [Wiki page](https://github.com/Ultimaker/Cura/wiki/Plugin-Directory) for details about creating and using plugins. +[![Button Building]][Building]    +[![Button Plugins]][Plugins]    +[![Button Machines]][Machines] -Supported printers -------------- -Please check our [Wiki page](https://github.com/Ultimaker/Cura/wiki/Adding-new-machine-profiles-to-Cura) for guidelines about adding support for new machines. +[![Button Report]][Report]    +[![Button Settings]][Settings]    +[![Button Localize]][Localize] -Configuring Cura ----------------- -Please check out [Wiki page](https://github.com/Ultimaker/Cura/wiki/Cura-Settings) about configuration options for developers. +
+
+ + + + + Shows cura open on the preview screen with a large benchy model in the center. + + +
+ +
+ + + + +[Contributors]: https://github.com/Ultimaker/Cura/graphs/contributors +[PullRequests]: https://github.com/Ultimaker/Cura/pulls +[Machines]: https://github.com/Ultimaker/Cura/wiki/Adding-new-machine-profiles-to-Cura +[Building]: https://github.com/Ultimaker/Cura/wiki/Running-Cura-from-Source +[Localize]: https://github.com/Ultimaker/Cura/wiki/Translating-Cura +[Settings]: https://github.com/Ultimaker/Cura/wiki/Cura-Settings +[Plugins]: https://github.com/Ultimaker/Cura/wiki/Plugin-Directory +[Closed]: https://github.com/Ultimaker/Cura/issues?q=is%3Aissue+is%3Aclosed +[Issues]: https://github.com/Ultimaker/Cura/issues +[Conan]: https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml +[Test]: https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml + +[License]: LICENSE +[Report]: docs/Report.md +[Logo]: resources/images/cura-icon.png +[#]: # + + + + +[Badge Contributors]: https://img.shields.io/github/contributors/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=db5e8a&color=ab4a6c&logo=GitHub +[Badge PullRequests]: https://img.shields.io/github/issues-pr/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=bb9f3e&color=937d31&logo=GitExtensions +[Badge License]: https://img.shields.io/badge/License-LGPL3-336887.svg?style=for-the-badge&labelColor=458cb5&logoColor=white&logo=GNU +[Badge Closed]: https://img.shields.io/github/issues-closed/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=629944&color=446a30&logo=AddThis +[Badge Issues]: https://img.shields.io/github/issues/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=c34360&color=933349&logo=AdBlock +[Badge Conan]: https://img.shields.io/github/workflow/status/Ultimaker/Cura/conan-package?style=for-the-badge&logoColor=white&labelColor=6185aa&color=4c6987&logo=Conan&label=Conan%20Package +[Badge Test]: https://img.shields.io/github/workflow/status/Ultimaker/Cura/unit-test?style=for-the-badge&logoColor=white&labelColor=4a999d&color=346c6e&logo=Codacy&label=Unit%20Test +[Badge Size]: https://img.shields.io/github/repo-size/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=715a97&color=584674&logo=GoogleAnalytics + + + + +[Button Localize]: https://img.shields.io/badge/Help_Localize-e2467d?style=for-the-badge&logoColor=white&logo=GoogleTranslate +[Button Machines]: https://img.shields.io/badge/Adding_Machines-yellow?style=for-the-badge&logoColor=white&logo=CloudFoundry +[Button Settings]: https://img.shields.io/badge/Configuration-00979D?style=for-the-badge&logoColor=white&logo=CodeReview +[Button Building]: https://img.shields.io/badge/Building_Cura-blue?style=for-the-badge&logoColor=white&logo=GitBook +[Button Plugins]: https://img.shields.io/badge/Plugin_Usage-569A31?style=for-the-badge&logoColor=white&logo=ROS +[Button Report]: https://img.shields.io/badge/Report_Issues-C9284D?style=for-the-badge&logoColor=white&logo=Cliqz -Translating Cura ----------------- -Please check out [Wiki page](https://github.com/Ultimaker/Cura/wiki/Translating-Cura) about how to translate Cura into other languages. -License ----------------- -Cura is released under the terms of the LGPLv3 or higher. A copy of this license should be included with the software. diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja new file mode 100644 index 0000000000..74e4fd098b --- /dev/null +++ b/Ultimaker-Cura.spec.jinja @@ -0,0 +1,273 @@ +# -*- mode: python ; coding: utf-8 -*- +import os +from pathlib import Path +from PyInstaller.utils.hooks import collect_all + + +datas = {{ datas }} +binaries = {{ binaries }} + +hiddenimports = {{ hiddenimports }} + +{% for value in collect_all %}tmp_ret = collect_all('{{ value }}') +datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] +{% endfor %} + +# Add dynamic libs in the venv bin/Script Path. This is needed because we might copy some additional libs +# e.q.: OpenSSL 1.1.1l in that directory with a separate: +# `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin` +binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.so*")]) +binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dll")]) +binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dylib")]) + +block_cipher = None + +a = Analysis( + [{{ entrypoint }}], + pathex=[], + binaries=binaries, + datas=datas, + hiddenimports=hiddenimports, + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False +) +pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) + +exe = EXE( + pyz, + a.scripts, + [], + exclude_binaries=True, + name=r'{{ name }}', + debug=False, + bootloader_ignore_signals=False, + strip={{ strip }}, + upx={{ upx }}, + console=False, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch={{ target_arch }}, + codesign_identity=os.getenv('CODESIGN_IDENTITY', None), + entitlements_file={{ entitlements_file }}, + icon={{ icon }} +) + +coll = COLLECT( + exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name=r'{{ name }}' +) + +{% if macos == true %} +# PyInstaller seems to copy everything in the resource folder for the MacOS, this causes issues with codesigning and notarizing +# The folder structure should adhere to the one specified in Table 2-5 +# https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW1 +# The class below is basically ducktyping the BUNDLE class of PyInstaller and using our own `assemble` method for more fine-grain and specific +# control. Some code of the method below is copied from: +# https://github.com/pyinstaller/pyinstaller/blob/22d1d2a5378228744cc95f14904dae1664df32c4/PyInstaller/building/osx.py#L115 +#----------------------------------------------------------------------------- +# Copyright (c) 2005-2022, PyInstaller Development Team. +# +# Distributed under the terms of the GNU General Public License (version 2 +# or later) with exception for distributing the bootloader. +# +# The full license is in the file COPYING.txt, distributed with this software. +# +# SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception) +#----------------------------------------------------------------------------- + +import plistlib +import shutil +import PyInstaller.utils.osx as osxutils +from pathlib import Path +from PyInstaller.building.osx import BUNDLE +from PyInstaller.building.utils import (_check_path_overlap, _rmtree, add_suffix_to_extension, checkCache) +from PyInstaller.building.datastruct import logger +from PyInstaller.building.icon import normalize_icon_type + + +class UMBUNDLE(BUNDLE): + def assemble(self): + from PyInstaller.config import CONF + + if _check_path_overlap(self.name) and os.path.isdir(self.name): + _rmtree(self.name) + logger.info("Building BUNDLE %s", self.tocbasename) + + # Create a minimal Mac bundle structure. + macos_path = Path(self.name, "Contents", "MacOS") + resources_path = Path(self.name, "Contents", "Resources") + frameworks_path = Path(self.name, "Contents", "Frameworks") + os.makedirs(macos_path) + os.makedirs(resources_path) + os.makedirs(frameworks_path) + + # Makes sure the icon exists and attempts to convert to the proper format if applicable + self.icon = normalize_icon_type(self.icon, ("icns",), "icns", CONF["workpath"]) + + # Ensure icon path is absolute + self.icon = os.path.abspath(self.icon) + + # Copy icns icon to Resources directory. + shutil.copy(self.icon, os.path.join(self.name, 'Contents', 'Resources')) + + # Key/values for a minimal Info.plist file + info_plist_dict = { + "CFBundleDisplayName": self.appname, + "CFBundleName": self.appname, + + # Required by 'codesign' utility. + # The value for CFBundleIdentifier is used as the default unique name of your program for Code Signing + # purposes. It even identifies the APP for access to restricted OS X areas like Keychain. + # + # The identifier used for signing must be globally unique. The usual form for this identifier is a + # hierarchical name in reverse DNS notation, starting with the toplevel domain, followed by the company + # name, followed by the department within the company, and ending with the product name. Usually in the + # form: com.mycompany.department.appname + # CLI option --osx-bundle-identifier sets this value. + "CFBundleIdentifier": self.bundle_identifier, + "CFBundleExecutable": os.path.basename(self.exename), + "CFBundleIconFile": os.path.basename(self.icon), + "CFBundleInfoDictionaryVersion": "6.0", + "CFBundlePackageType": "APPL", + "CFBundleShortVersionString": self.version, + } + + # Set some default values. But they still can be overwritten by the user. + if self.console: + # Setting EXE console=True implies LSBackgroundOnly=True. + info_plist_dict['LSBackgroundOnly'] = True + else: + # Let's use high resolution by default. + info_plist_dict['NSHighResolutionCapable'] = True + + # Merge info_plist settings from spec file + if isinstance(self.info_plist, dict) and self.info_plist: + info_plist_dict.update(self.info_plist) + + plist_filename = os.path.join(self.name, "Contents", "Info.plist") + with open(plist_filename, "wb") as plist_fh: + plistlib.dump(info_plist_dict, plist_fh) + + links = [] + _QT_BASE_PATH = {'PySide2', 'PySide6', 'PyQt5', 'PyQt6', 'PySide6'} + for inm, fnm, typ in self.toc: + # Adjust name for extensions, if applicable + inm, fnm, typ = add_suffix_to_extension(inm, fnm, typ) + inm = Path(inm) + fnm = Path(fnm) + # Copy files from cache. This ensures that are used files with relative paths to dynamic library + # dependencies (@executable_path) + if typ in ('EXTENSION', 'BINARY') or (typ == 'DATA' and inm.suffix == '.so'): + if any(['.' in p for p in inm.parent.parts]): + inm = Path(inm.name) + fnm = Path(checkCache( + str(fnm), + strip = self.strip, + upx = self.upx, + upx_exclude = self.upx_exclude, + dist_nm = str(inm), + target_arch = self.target_arch, + codesign_identity = self.codesign_identity, + entitlements_file = self.entitlements_file, + strict_arch_validation = (typ == 'EXTENSION'), + )) + frame_dst = frameworks_path.joinpath(inm) + if not frame_dst.exists(): + if frame_dst.is_dir(): + os.makedirs(frame_dst, exist_ok = True) + else: + os.makedirs(frame_dst.parent, exist_ok = True) + shutil.copy(fnm, frame_dst, follow_symlinks = True) + macos_dst = macos_path.joinpath(inm) + if not macos_dst.exists(): + if macos_dst.is_dir(): + os.makedirs(macos_dst, exist_ok = True) + else: + os.makedirs(macos_dst.parent, exist_ok = True) + + # Create relative symlink to the framework + symlink_to = Path(*[".." for p in macos_dst.relative_to(macos_path).parts], "Frameworks").joinpath( + frame_dst.relative_to(frameworks_path)) + try: + macos_dst.symlink_to(symlink_to) + except FileExistsError: + pass + else: + if typ == 'DATA': + if any(['.' in p for p in inm.parent.parts]) or inm.suffix == '.so': + # Skip info dist egg and some not needed folders in tcl and tk, since they all contain dots in their files + logger.warning(f"Skipping DATA file {inm}") + continue + res_dst = resources_path.joinpath(inm) + if not res_dst.exists(): + if res_dst.is_dir(): + os.makedirs(res_dst, exist_ok = True) + else: + os.makedirs(res_dst.parent, exist_ok = True) + shutil.copy(fnm, res_dst, follow_symlinks = True) + macos_dst = macos_path.joinpath(inm) + if not macos_dst.exists(): + if macos_dst.is_dir(): + os.makedirs(macos_dst, exist_ok = True) + else: + os.makedirs(macos_dst.parent, exist_ok = True) + + # Create relative symlink to the resource + symlink_to = Path(*[".." for p in macos_dst.relative_to(macos_path).parts], "Resources").joinpath( + res_dst.relative_to(resources_path)) + try: + macos_dst.symlink_to(symlink_to) + except FileExistsError: + pass + else: + macos_dst = macos_path.joinpath(inm) + if not macos_dst.exists(): + if macos_dst.is_dir(): + os.makedirs(macos_dst, exist_ok = True) + else: + os.makedirs(macos_dst.parent, exist_ok = True) + shutil.copy(fnm, macos_dst, follow_symlinks = True) + + # Sign the bundle + logger.info('Signing the BUNDLE...') + try: + osxutils.sign_binary(self.name, self.codesign_identity, self.entitlements_file, deep = True) + except Exception as e: + logger.warning(f"Error while signing the bundle: {e}") + logger.warning("You will need to sign the bundle manually!") + + logger.info(f"Building BUNDLE {self.tocbasename} completed successfully.") + +app = UMBUNDLE( + coll, + name='{{ name }}.app', + icon={{ icon }}, + bundle_identifier={{ osx_bundle_identifier }}, + version={{ version }}, + info_plist={ + 'CFBundleDisplayName': '{{ display_name }}', + 'NSPrincipalClass': 'NSApplication', + 'CFBundleDevelopmentRegion': 'English', + 'CFBundleExecutable': '{{ name }}', + 'CFBundleInfoDictionaryVersion': '6.0', + 'CFBundlePackageType': 'APPL', + 'CFBundleShortVersionString': {{ short_version }}, + 'CFBundleDocumentTypes': [{ + 'CFBundleTypeRole': 'Viewer', + 'CFBundleTypeExtensions': ['*'], + 'CFBundleTypeName': 'Model Files', + }] + }, +){% endif %} diff --git a/build.sh b/build.sh deleted file mode 100644 index 7da99d0de5..0000000000 --- a/build.sh +++ /dev/null @@ -1,34 +0,0 @@ -set -e -set -u - -export OLD_PWD=`pwd` -export CMAKE=/c/software/PCL/cmake-3.0.1-win32-x86/bin/cmake.exe -export MAKE=mingw32-make.exe -export PATH=/c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin:$PATH - -mkdir -p /c/software/protobuf/_build -cd /c/software/protobuf/_build -$CMAKE ../ -$MAKE install - -mkdir -p /c/software/libArcus/_build -cd /c/software/libArcus/_build -$CMAKE ../ -$MAKE install - -mkdir -p /c/software/PinkUnicornEngine/_build -cd /c/software/PinkUnicornEngine/_build -$CMAKE ../ -$MAKE - -cd $OLD_PWD -export PYTHONPATH=`pwd`/../libArcus/python:/c/Software/Uranium/ -/c/python34/python setup.py py2exe - -cp /c/software/PinkUnicornEngine/_build/CuraEngine.exe dist/ -cp /c/software/libArcus/_install/bin/libArcus.dll dist/ -cp /c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/libgcc_s_dw2-1.dll dist/ -cp /c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/libwinpthread-1.dll dist/ -cp /c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/libstdc++-6.dll dist/ - -/c/program\ files\ \(x86\)/NSIS/makensis.exe installer.nsi diff --git a/conandata.yml b/conandata.yml new file mode 100644 index 0000000000..4b9d8dd612 --- /dev/null +++ b/conandata.yml @@ -0,0 +1,424 @@ +--- +# Usage: defaults to None +# If you're on a release branch create an entry for that **version** e.q.: `5.1.0` update the requirements (use pinned versions, not latest) +# also create a beta entry for that **version** e.q.: `5.1.0-beta`, update the requirements (use the /(latest)@ultimaker/stable) +# +# If you're working on a feature/bugfix branch from a release branch, create an entry for that **channel**, update the requirements (use +# the /(latest)@ultimaker/stable) +# +# If you're working on a feature/bugfix branch from a main branch, it is optional to create an entry for that **channel**, update the +# requirements (use the /(latest)@ultimaker/testing) +# +# Subject to change in the future! +"None": + requirements: + - "pyarcus/(latest)@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" + - "pysavitar/(latest)@ultimaker/testing" + - "pynest2d/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" + - "fdm_materials/(latest)@ultimaker/testing" + - "cura_binary_data/(latest)@ultimaker/testing" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"5.2.0-alpha": + requirements: + - "pyarcus/(latest)@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" + - "pysavitar/(latest)@ultimaker/testing" + - "pynest2d/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" + - "fdm_materials/(latest)@ultimaker/testing" + - "cura_binary_data/(latest)@ultimaker/testing" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"5.1.0": + requirements: + - "arcus/5.1.0" + - "curaengine/5.1.0" + - "savitar/5.1.0" + - "pynest2d/5.1.0" + - "uranium/5.1.0" + - "fdm_materials/5.1.0" + - "cura_binary_data/5.1.0" + - "cpython/3.10.4" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/Qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +pycharm_targets: + - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja + module_name: Cura + name: cura + script_name: cura_app.py + - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja + module_name: Cura + name: cura_external_engine + parameters: --external-backend + script_name: cura_app.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in tests + script_name: tests/ + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestBuildVolume.py + script_name: tests/TestBuildVolume.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestConvexHullDecorator.py + script_name: tests/TestConvexHullDecorator.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestCuraSceneNode.py + script_name: tests/TestCuraSceneNode.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestCuraSceneNode.py + script_name: tests/TestExtruderManager.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestGCodeListDecorator.py + script_name: tests/TestGCodeListDecorator.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestIntentManager.py + script_name: tests/TestIntentManager.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestLayer.py + script_name: tests/TestLayer.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestMachineAction.py + script_name: tests/TestMachineAction.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestMachineManager.py + script_name: tests/TestMachineManager.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestOAuth2.py + script_name: tests/TestOAuth2.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestObjectsModel.py + script_name: tests/TestObjectsModel.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestPrintInformation.py + script_name: tests/TestPrintInformation.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestProfileRequirements.py + script_name: tests/TestProfileRequirements.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestThemes.py + script_name: tests/TestThemes.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestContainerManager.py + script_name: tests/Settings/TestContainerManager.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestCuraContainerRegistry.py + script_name: tests/Settings/TestCuraContainerRegistry.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestCuraStackBuilder.py + script_name: tests/Settings/TestCuraStackBuilder.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestDefinitionContainer.py + script_name: tests/Settings/TestDefinitionContainer.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestExtruderStack.py + script_name: tests/Settings/TestExtruderStack.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestGlobalStack.py + script_name: tests/Settings/TestGlobalStack.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestProfiles.py + script_name: tests/Settings/TestProfiles.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestSettingInheritanceManager.py + script_name: tests/Settings/TestSettingInheritanceManager.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestSettingOverrideDecorator.py + script_name: tests/Settings/TestSettingOverrideDecorator.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestSettingVisibilityPresets.py + script_name: tests/Settings/TestSettingVisibilityPresets.py diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 0000000000..bcdaeda5d9 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,442 @@ +import os +from pathlib import Path + +from jinja2 import Template + +from conans import tools +from conan import ConanFile +from conan.tools import files +from conan.tools.env import VirtualRunEnv, Environment +from conan.errors import ConanInvalidConfiguration + +required_conan_version = ">=1.48.0" + + +class CuraConan(ConanFile): + name = "cura" + license = "LGPL-3.0" + author = "Ultimaker B.V." + 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" + settings = "os", "compiler", "build_type", "arch" + no_copy_source = True # We won't build so no need to copy sources to the build folder + + # FIXME: Remove specific branch once merged to main + # Extending the conanfile with the UMBaseConanfile https://github.com/Ultimaker/conan-ultimaker-index/tree/CURA-9177_Fix_CI_CD/recipes/umbase + python_requires = "umbase/0.1.5@ultimaker/testing" + python_requires_extend = "umbase.UMBaseConanfile" + + options = { + "enterprise": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string + "staging": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string + "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools + "cloud_api_version": "ANY", + "display_name": "ANY", # TODO: should this be an option?? + "cura_debug_mode": [True, False], # FIXME: Use profiles + "internal": [True, False] + } + default_options = { + "enterprise": "False", + "staging": "False", + "devtools": False, + "cloud_api_version": "1", + "display_name": "Ultimaker Cura", + "cura_debug_mode": False, # Not yet implemented + "internal": False, + } + scm = { + "type": "git", + "subfolder": ".", + "url": "auto", + "revision": "auto" + } + + @property + def _pycharm_targets(self): + return self.conan_data["pycharm_targets"] + + # FIXME: These env vars should be defined in the runenv. + _cura_env = None + + @property + def _cura_run_env(self): + if self._cura_env: + return self._cura_env + + self._cura_env = Environment() + self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) + self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) + + if self.settings.os == "Linux": + self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") + self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") + self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") + return self._cura_env + + @property + def _staging(self): + return self.options.staging in ["True", 'true'] + + @property + def _enterprise(self): + return self.options.enterprise in ["True", 'true'] + + @property + def _cloud_api_root(self): + return "https://api-staging.ultimaker.com" if self._staging else "https://api.ultimaker.com" + + @property + def _cloud_account_api_root(self): + return "https://account-staging.ultimaker.com" if self._staging else "https://account.ultimaker.com" + + @property + def _marketplace_root(self): + return "https://marketplace-staging.ultimaker.com" if self._staging else "https://marketplace.ultimaker.com" + + @property + def _digital_factory_url(self): + return "https://digitalfactory-staging.ultimaker.com" if self._staging else "https://digitalfactory.ultimaker.com" + + @property + def _cura_latest_url(self): + return "https://software.ultimaker.com/latest.json" + + @property + def requirements_txts(self): + if self.options.devtools: + return ["requirements.txt", "requirements-ultimaker.txt", "requirements-dev.txt"] + return ["requirements.txt", "requirements-ultimaker.txt"] + + @property + def _base_dir(self): + if self.install_folder is None: + if self.build_folder is not None: + return Path(self.build_folder) + return Path(os.getcwd(), "venv") + if self.in_local_cache: + return Path(self.install_folder) + else: + return Path(self.source_folder, "venv") + + @property + def _share_dir(self): + return self._base_dir.joinpath("share") + + @property + def _script_dir(self): + if self.settings.os == "Windows": + return self._base_dir.joinpath("Scripts") + return self._base_dir.joinpath("bin") + + @property + def _site_packages(self): + if self.settings.os == "Windows": + return self._base_dir.joinpath("Lib", "site-packages") + py_version = tools.Version(self.deps_cpp_info["cpython"].version) + return self._base_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages") + + @property + def _py_interp(self): + py_interp = self._script_dir.joinpath(Path(self.deps_user_info["cpython"].python).name) + if self.settings.os == "Windows": + py_interp = Path(*[f'"{p}"' if " " in p else p for p in py_interp.parts]) + return py_interp + + def _generate_cura_version(self, location): + with open(Path(__file__).parent.joinpath("CuraVersion.py.jinja"), "r") as f: + cura_version_py = Template(f.read()) + + cura_version = self.version + if self.options.internal: + version = tools.Version(self.version) + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" + + with open(Path(location, "CuraVersion.py"), "w") as f: + f.write(cura_version_py.render( + cura_app_name = self.name, + cura_app_display_name = self.options.display_name, + cura_version = cura_version, + cura_build_type = "Enterprise" if self._enterprise else "", + cura_debug_mode = self.options.cura_debug_mode, + cura_cloud_api_root = self._cloud_api_root, + cura_cloud_api_version = self.options.cloud_api_version, + cura_cloud_account_api_root = self._cloud_account_api_root, + cura_marketplace_root = self._marketplace_root, + cura_digital_factory_url = self._digital_factory_url, + cura_latest_url = self._cura_latest_url)) + + def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): + pyinstaller_metadata = self._um_data()["pyinstaller"] + datas = [(str(self._base_dir.joinpath("conan_install_info.json")), ".")] + for data in pyinstaller_metadata["datas"].values(): + if not self.options.internal and data.get("internal", False): + continue + + if "package" in data: # get the paths from conan package + if data["package"] == self.name: + if self.in_local_cache: + src_path = Path(self.package_folder, data["src"]) + else: + src_path = Path(self.source_folder, data["src"]) + else: + src_path = Path(self.deps_cpp_info[data["package"]].rootpath, data["src"]) + elif "root" in data: # get the paths relative from the sourcefolder + src_path = Path(self.source_folder, data["root"], data["src"]) + else: + continue + if src_path.exists(): + datas.append((str(src_path), data["dst"])) + + binaries = [] + for binary in pyinstaller_metadata["binaries"].values(): + if "package" in binary: # get the paths from conan package + src_path = Path(self.deps_cpp_info[binary["package"]].rootpath, binary["src"]) + elif "root" in binary: # get the paths relative from the sourcefolder + src_path = Path(self.source_folder, binary["root"], binary["src"]) + else: + continue + if not src_path.exists(): + continue + for bin in src_path.glob(binary["binary"] + ".*[exe|dll|so|dylib]"): + binaries.append((str(bin), binary["dst"])) + for bin in src_path.glob(binary["binary"]): + binaries.append((str(bin), binary["dst"])) + + for _, dependency in self.dependencies.items(): + for bin_paths in dependency.cpp_info.bindirs: + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")]) + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")]) + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")]) + + # Copy dynamic libs from lib path + binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib")]) + + # 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: + pyinstaller = Template(f.read()) + + cura_version = tools.Version(self.version) if self.version else tools.Version("0.0.0") + + 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, + entrypoint = entrypoint_location, + datas = datas, + binaries = binaries, + venv_script_path = str(self._script_dir), + hiddenimports = pyinstaller_metadata["hiddenimports"], + collect_all = pyinstaller_metadata["collect_all"], + icon = icon_path, + entitlements_file = entitlements_file, + osx_bundle_identifier = "'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None", + upx = str(self.settings.os == "Windows"), + strip = False, # This should be possible on Linux and MacOS but, it can also cause issues on some distributions. Safest is to disable it for now + target_arch = "'x86_64'" if self.settings.os == "Macos" else "None", # FIXME: Make this dependent on the settings.arch_target + macos = self.settings.os == "Macos", + version = f"'{self.version}'", + short_version = f"'{cura_version.major}.{cura_version.minor}.{cura_version.patch}'", + )) + + def configure(self): + self.options["pyarcus"].shared = True + self.options["pysavitar"].shared = True + self.options["pynest2d"].shared = True + self.options["cpython"].shared = True + + def validate(self): + if self.version and tools.Version(self.version) <= tools.Version("4"): + raise ConanInvalidConfiguration("Only versions 5+ are support") + + def requirements(self): + for req in self._um_data()["requirements"]: + self.requires(req) + if self.options.internal: + for req in self._um_data()["internal_requirements"]: + self.requires(req) + + def layout(self): + self.folders.source = "." + self.folders.build = "venv" + self.folders.generators = Path(self.folders.build, "conan") + + self.cpp.package.libdirs = [os.path.join("site-packages", "cura")] + self.cpp.package.bindirs = ["bin"] + self.cpp.package.resdirs = ["resources", "plugins", "packaging", "pip_requirements"] # pip_requirements should be the last item in the list + + def build(self): + pass + + def generate(self): + cura_run_envvars = self._cura_run_env.vars(self, scope = "run") + ext = ".ps1" if self.settings.os == "Windows" else ".sh" + cura_run_envvars.save_script(self.folders.generators.joinpath(f"cura_run_environment{ext}")) + + vr = VirtualRunEnv(self) + vr.generate() + + self._generate_cura_version(Path(self.source_folder, "cura")) + + if self.options.devtools: + entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements")) + self._generate_pyinstaller_spec(location = self.generators_folder, + entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), + icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), + entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") + + def imports(self): + self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) + self.copy("CuraEngine", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) + + files.rmdir(self, "resources/materials") + self.copy("*.fdm_material", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False) + self.copy("*.sig", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False) + + if self.options.internal: + self.copy("*.fdm_material", root_package = "fdm_materials_private", src = "@resdirs", dst = "resources/materials", keep_path = False) + self.copy("*.sig", root_package = "fdm_materials_private", src = "@resdirs", dst = "resources/materials", keep_path = False) + self.copy("*", root_package = "cura_private_data", src = self.deps_cpp_info["cura_private_data"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources"), keep_path = True) + + # Copy resources of cura_binary_data + self.copy("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources"), keep_path = True) + self.copy("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[1], + dst =self._share_dir.joinpath("uranium", "resources"), keep_path = True) + + self.copy("*.dll", src = "@bindirs", dst = self._site_packages) + self.copy("*.pyd", src = "@libdirs", dst = self._site_packages) + self.copy("*.pyi", src = "@libdirs", dst = self._site_packages) + self.copy("*.dylib", src = "@libdirs", dst = self._script_dir) + + def deploy(self): + # Copy CuraEngine.exe to bindirs of Virtual Python Environment + # TODO: Fix source such that it will get the curaengine relative from the executable (Python bindir in this case) + self.copy_deps("CuraEngine.exe", root_package = "curaengine", src = self.deps_cpp_info["curaengine"].bindirs[0], + dst = self._base_dir, + keep_path = False) + self.copy_deps("CuraEngine", root_package = "curaengine", src = self.deps_cpp_info["curaengine"].bindirs[0], dst = self._base_dir, + keep_path = False) + + # Copy resources of Cura (keep folder structure) + self.copy("*", src = self.cpp_info.bindirs[0], dst = self._base_dir, keep_path = False) + self.copy("*", src = self.cpp_info.libdirs[0], dst = self._site_packages.joinpath("cura"), keep_path = True) + self.copy("*", src = self.cpp_info.resdirs[0], dst = self._share_dir.joinpath("cura", "resources"), keep_path = True) + self.copy("*", src = self.cpp_info.resdirs[1], dst = self._share_dir.joinpath("cura", "plugins"), keep_path = True) + + # Copy materials (flat) + self.copy_deps("*.fdm_material", root_package = "fdm_materials", src = self.deps_cpp_info["fdm_materials"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources", "materials"), keep_path = False) + self.copy_deps("*.sig", root_package = "fdm_materials", src = self.deps_cpp_info["fdm_materials"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources", "materials"), keep_path = False) + + # Copy internal resources + if self.options.internal: + self.copy_deps("*.fdm_material", root_package = "fdm_materials_private", src = self.deps_cpp_info["fdm_materials_private"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources", "materials"), keep_path = False) + self.copy_deps("*.sig", root_package = "fdm_materials_private", src = self.deps_cpp_info["fdm_materials_private"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources", "materials"), keep_path = False) + self.copy_deps("*", root_package = "cura_private_data", src = self.deps_cpp_info["cura_private_data"].resdirs[0], + dst = self._share_dir.joinpath("cura", "resources"), keep_path = True) + + # Copy resources of Uranium (keep folder structure) + self.copy_deps("*", root_package = "uranium", src = self.deps_cpp_info["uranium"].resdirs[0], + dst = self._share_dir.joinpath("uranium", "resources"), keep_path = True) + self.copy_deps("*", root_package = "uranium", src = self.deps_cpp_info["uranium"].resdirs[1], + dst = self._share_dir.joinpath("uranium", "plugins"), keep_path = True) + self.copy_deps("*", root_package = "uranium", src = self.deps_cpp_info["uranium"].libdirs[0], + dst = self._site_packages.joinpath("UM"), + keep_path = True) + self.copy_deps("*", root_package = "uranium", src = str(Path(self.deps_cpp_info["uranium"].libdirs[0], "Qt", "qml", "UM")), + dst = self._site_packages.joinpath("PyQt6", "Qt6", "qml", "UM"), + keep_path = True) + + # Copy resources of cura_binary_data + self.copy_deps("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[0], + dst = self._share_dir.joinpath("cura"), keep_path = True) + self.copy_deps("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[1], + dst = self._share_dir.joinpath("uranium"), keep_path = True) + if self.settings.os == "Windows": + self.copy_deps("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[2], + dst = self._share_dir.joinpath("windows"), keep_path = True) + + self.copy_deps("*.dll", src = "@bindirs", dst = self._site_packages) + self.copy_deps("*.pyd", src = "@libdirs", dst = self._site_packages) + self.copy_deps("*.pyi", src = "@libdirs", dst = self._site_packages) + self.copy_deps("*.dylib", src = "@libdirs", dst = self._base_dir.joinpath("lib")) + + # Copy packaging scripts + self.copy("*", src = self.cpp_info.resdirs[2], dst = self._base_dir.joinpath("packaging")) + + # Copy requirements.txt's + self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements")) + + # Generate the GitHub Action version info Environment + cura_version = tools.Version(self.version) + env_prefix = "Env:" if self.settings.os == "Windows" else "" + activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV +echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV +echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV +echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV +echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV + """).render(cura_version_major = cura_version.major, + cura_version_minor = cura_version.minor, + cura_version_patch = cura_version.patch, + cura_version_build = cura_version.build if cura_version.build != "" else "0", + cura_version_full = self.version, + env_prefix = env_prefix) + + ext = ".sh" if self.settings.os != "Windows" else ".ps1" + files.save(self, self._script_dir.joinpath(f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) + + self._generate_cura_version(Path(self._site_packages, "cura")) + + entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "dmg", "cura.entitlements")) + self._generate_pyinstaller_spec(location = self._base_dir, + entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), + icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), + entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") + + def package(self): + self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0]) + self.copy("*", src = "cura", dst = self.cpp.package.libdirs[0]) + self.copy("*", src = "resources", dst = self.cpp.package.resdirs[0]) + self.copy("*", src = "plugins", dst = self.cpp.package.resdirs[1]) + self.copy("requirement*.txt", src = ".", dst = self.cpp.package.resdirs[-1]) + self.copy("*", src = "packaging", dst = self.cpp.package.resdirs[2]) + + def package_info(self): + self.user_info.pip_requirements = "requirements.txt" + self.user_info.pip_requirements_git = "requirements-ultimaker.txt" + self.user_info.pip_requirements_build = "requirements-dev.txt" + + if self.in_local_cache: + self.runenv_info.append_path("PYTHONPATH", str(Path(self.cpp_info.lib_paths[0]).parent)) + self.runenv_info.append_path("PYTHONPATH", self.cpp_info.res_paths[1]) # Add plugins to PYTHONPATH + else: + self.runenv_info.append_path("PYTHONPATH", self.source_folder) + self.runenv_info.append_path("PYTHONPATH", os.path.join(self.source_folder, "plugins")) + + def package_id(self): + del self.info.settings.os + del self.info.settings.compiler + del self.info.settings.build_type + del self.info.settings.arch + + # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py + # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` + del self.info.options.enterprise + del self.info.options.staging + del self.info.options.devtools + del self.info.options.cloud_api_version + del self.info.options.display_name + del self.info.options.cura_debug_mode + + # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different + # Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't + # ideal but an acceptable solution for now. diff --git a/cura-logo-dark.PNG b/cura-logo-dark.PNG new file mode 100644 index 0000000000..c176eda379 Binary files /dev/null and b/cura-logo-dark.PNG differ diff --git a/cura-logo.PNG b/cura-logo.PNG index 52da8203a8..972dcd7535 100644 Binary files a/cura-logo.PNG and b/cura-logo.PNG differ diff --git a/cura/API/Account.py b/cura/API/Account.py index b63983e0cc..2651037e9e 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -1,19 +1,26 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import enum from datetime import datetime +import json from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty, QTimer, pyqtEnum -from typing import Any, Optional, Dict, TYPE_CHECKING, Callable +from PyQt6.QtNetwork import QNetworkRequest +from typing import Any, Callable, Dict, List, Optional, TYPE_CHECKING +from UM.Decorators import deprecated from UM.Logger import Logger from UM.Message import Message from UM.i18n import i18nCatalog +from UM.TaskManagement.HttpRequestManager import HttpRequestManager +from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope from cura.OAuth2.AuthorizationService import AuthorizationService from cura.OAuth2.Models import OAuth2Settings, UserProfile from cura.UltimakerCloud import UltimakerCloudConstants +from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope if TYPE_CHECKING: from cura.CuraApplication import CuraApplication + from PyQt6.QtNetwork import QNetworkReply i18n_catalog = i18nCatalog("cura") @@ -78,6 +85,7 @@ class Account(QObject): self._logged_in = False self._user_profile: Optional[UserProfile] = None self._additional_rights: Dict[str, Any] = {} + self._permissions: List[str] = [] # List of account permission keys, e.g. ["digital-factory.print-job.write"] self._sync_state = SyncState.IDLE self._manual_sync_enabled = False self._update_packages_enabled = False @@ -109,6 +117,7 @@ class Account(QObject): self._sync_services: Dict[str, int] = {} """contains entries "service_name" : SyncState""" + self.syncRequested.connect(self._updatePermissions) def initialize(self) -> None: self._authorization_service.initialize(self._application.getPreferences()) @@ -311,13 +320,63 @@ class Account(QObject): self._authorization_service.deleteAuthData() + @deprecated("Get permissions from the 'permissions' property", since = "5.2.0") def updateAdditionalRight(self, **kwargs) -> None: """Update the additional rights of the account. The argument(s) are the rights that need to be set""" self._additional_rights.update(kwargs) self.additionalRightsChanged.emit(self._additional_rights) + @deprecated("Get permissions from the 'permissions' property", since = "5.2.0") @pyqtProperty("QVariantMap", notify = additionalRightsChanged) def additionalRights(self) -> Dict[str, Any]: """A dictionary which can be queried for additional account rights.""" return self._additional_rights + + permissionsChanged = pyqtSignal() + @pyqtProperty("QVariantList", notify = permissionsChanged) + def permissions(self) -> List[str]: + """ + The permission keys that the user has in his account. + """ + return self._permissions + + def _updatePermissions(self) -> None: + """ + Update the list of permissions that the user has. + """ + def callback(reply: "QNetworkReply"): + status_code = reply.attribute(QNetworkRequest.Attribute.HttpStatusCodeAttribute) + if status_code is None: + Logger.error("Server did not respond to request to get list of permissions.") + return + if status_code >= 300: + Logger.error(f"Request to get list of permission resulted in HTTP error {status_code}") + return + + try: + reply_data = json.loads(bytes(reply.readAll()).decode("UTF-8")) + except (UnicodeDecodeError, json.JSONDecodeError, ValueError) as e: + Logger.logException("e", f"Could not parse response to permission list request: {e}") + return + if "errors" in reply_data: + Logger.error(f"Request to get list of permission resulted in error response: {reply_data['errors']}") + return + + if "data" in reply_data and "permissions" in reply_data["data"]: + permissions = sorted(reply_data["data"]["permissions"]) + if permissions != self._permissions: + self._permissions = permissions + self.permissionsChanged.emit() + + def error_callback(reply: "QNetworkReply", error: "QNetworkReply.NetworkError"): + Logger.error(f"Request for user permissions list failed. Network error: {error}") + + HttpRequestManager.getInstance().get( + url = f"{self._oauth_root}/users/permissions", + scope = JsonDecoratorScope(UltimakerCloudScope(self._application)), + callback = callback, + error_callback = error_callback, + timeout = 10 + ) + diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index cb80c12416..4938d569e7 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -6,14 +6,22 @@ # --------- DEFAULT_CURA_APP_NAME = "cura" DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" -DEFAULT_CURA_VERSION = "master" +DEFAULT_CURA_VERSION = "dev" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False +DEFAULT_CURA_LATEST_URL = "https://software.ultimaker.com/latest.json" # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. -CuraSDKVersion = "8.0.0" +CuraSDKVersion = "8.1.0" + +try: + from cura.CuraVersion import CuraLatestURL + if CuraLatestURL == "": + CuraLatestURL = DEFAULT_CURA_LATEST_URL +except ImportError: + CuraLatestURL = DEFAULT_CURA_LATEST_URL try: from cura.CuraVersion import CuraAppName # type: ignore @@ -60,3 +68,14 @@ try: except ImportError: CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME + +DEPENDENCY_INFO = {} +try: + from pathlib import Path + conan_install_info = Path(__file__).parent.parent.joinpath("conan_install_info.json") + if conan_install_info.exists(): + import json + with open(conan_install_info, "r") as f: + DEPENDENCY_INFO = json.loads(f.read()) +except: + pass diff --git a/cura/Arranging/ShapeArray.py b/cura/Arranging/ShapeArray.py index 5607c03663..714d9d3837 100644 --- a/cura/Arranging/ShapeArray.py +++ b/cura/Arranging/ShapeArray.py @@ -74,14 +74,14 @@ class ShapeArray: # If the child-nodes are included, adjust convex hulls as well: if include_children: children = node.getAllChildren() - if not children is None: + if children is not None: for child in children: # 'Inefficient' combination of convex hulls through known code rather than mess it up: child_hull = child.callDecoration("getConvexHull") - if not child_hull is None: + if child_hull is not None: hull_verts = hull_verts.unionConvexHulls(child_hull) child_hull_head = child.callDecoration("getConvexHullHead") or child_hull - if not child_hull_head is None: + if child_hull_head is not None: hull_head_verts = hull_head_verts.unionConvexHulls(child_hull_head) offset_verts = hull_head_verts.getMinkowskiHull(Polygon.approximatedCircle(min_offset)) @@ -159,4 +159,4 @@ class ShapeArray: max_col_idx = (idxs[0] - p1[0]) / (p2[0] - p1[0]) * (p2[1] - p1[1]) + p1[1] sign = numpy.sign(p2[0] - p1[0]) - return idxs[1] * sign <= max_col_idx * sign \ No newline at end of file + return idxs[1] * sign <= max_col_idx * sign diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py index a5fc3044ce..19655df531 100644 --- a/cura/Backups/Backup.py +++ b/cura/Backups/Backup.py @@ -136,7 +136,7 @@ class Backup: return False current_version = Version(self._application.getVersion()) - version_to_restore = Version(self.meta_data.get("cura_release", "master")) + version_to_restore = Version(self.meta_data.get("cura_release", "dev")) if current_version < version_to_restore: # Cannot restore version newer than current because settings might have changed. diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index fe607915c1..776d92a1f6 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -565,8 +565,8 @@ class BuildVolume(SceneNode): self._updateScaleFactor() self._volume_aabb = AxisAlignedBox( - minimum = Vector(min_w, min_h - 1.0, min_d).scale(self._scale_vector), - maximum = Vector(max_w, max_h - self._raft_thickness - self._extra_z_clearance, max_d).scale(self._scale_vector) + minimum = Vector(min_w, min_h - 1.0, min_d), + maximum = Vector(max_w, max_h - self._raft_thickness - self._extra_z_clearance, max_d) ) bed_adhesion_size = self.getEdgeDisallowedSize() @@ -575,8 +575,8 @@ class BuildVolume(SceneNode): # This is probably wrong in all other cases. TODO! # The +1 and -1 is added as there is always a bit of extra room required to work properly. scale_to_max_bounds = AxisAlignedBox( - minimum = Vector(min_w + bed_adhesion_size + 1, min_h, min_d + self._disallowed_area_size - bed_adhesion_size + 1).scale(self._scale_vector), - maximum = Vector(max_w - bed_adhesion_size - 1, max_h - self._raft_thickness - self._extra_z_clearance, max_d - self._disallowed_area_size + bed_adhesion_size - 1).scale(self._scale_vector) + minimum = Vector(min_w + bed_adhesion_size + 1, min_h, min_d + self._disallowed_area_size - bed_adhesion_size + 1), + maximum = Vector(max_w - bed_adhesion_size - 1, max_h - self._raft_thickness - self._extra_z_clearance, max_d - self._disallowed_area_size + bed_adhesion_size - 1) ) self._application.getController().getScene()._maximum_bounds = scale_to_max_bounds # type: ignore @@ -645,7 +645,7 @@ class BuildVolume(SceneNode): for extruder in extruders: extruder.propertyChanged.connect(self._onSettingPropertyChanged) - self._width = self._global_container_stack.getProperty("machine_width", "value") * self._scale_vector.x + self._width = self._global_container_stack.getProperty("machine_width", "value") machine_height = self._global_container_stack.getProperty("machine_height", "value") if self._global_container_stack.getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1: self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height) @@ -656,7 +656,7 @@ class BuildVolume(SceneNode): else: self._height = self._global_container_stack.getProperty("machine_height", "value") self._build_volume_message.hide() - self._depth = self._global_container_stack.getProperty("machine_depth", "value") * self._scale_vector.y + self._depth = self._global_container_stack.getProperty("machine_depth", "value") self._shape = self._global_container_stack.getProperty("machine_shape", "value") self._updateDisallowedAreas() @@ -752,8 +752,8 @@ class BuildVolume(SceneNode): return self._updateScaleFactor() self._height = self._global_container_stack.getProperty("machine_height", "value") * self._scale_vector.z - self._width = self._global_container_stack.getProperty("machine_width", "value") * self._scale_vector.x - self._depth = self._global_container_stack.getProperty("machine_depth", "value") * self._scale_vector.y + self._width = self._global_container_stack.getProperty("machine_width", "value") + self._depth = self._global_container_stack.getProperty("machine_depth", "value") self._shape = self._global_container_stack.getProperty("machine_shape", "value") def _updateDisallowedAreasAndRebuild(self): @@ -770,14 +770,6 @@ class BuildVolume(SceneNode): self._extra_z_clearance = self._calculateExtraZClearance(ExtruderManager.getInstance().getUsedExtruderStacks()) self.rebuild() - def _scaleAreas(self, result_areas: List[Polygon]) -> None: - if self._global_container_stack is None: - return - for i, polygon in enumerate(result_areas): - result_areas[i] = polygon.scale( - 100.0 / max(100.0, self._global_container_stack.getProperty("material_shrinkage_percentage_xy", "value")) - ) - def _updateDisallowedAreas(self) -> None: if not self._global_container_stack: return @@ -833,11 +825,9 @@ class BuildVolume(SceneNode): self._disallowed_areas = [] for extruder_id in result_areas: - self._scaleAreas(result_areas[extruder_id]) self._disallowed_areas.extend(result_areas[extruder_id]) self._disallowed_areas_no_brim = [] for extruder_id in result_areas_no_brim: - self._scaleAreas(result_areas_no_brim[extruder_id]) self._disallowed_areas_no_brim.extend(result_areas_no_brim[extruder_id]) def _computeDisallowedAreasPrinted(self, used_extruders): @@ -993,6 +983,9 @@ class BuildVolume(SceneNode): half_machine_width = self._global_container_stack.getProperty("machine_width", "value") / 2 half_machine_depth = self._global_container_stack.getProperty("machine_depth", "value") / 2 + # We need at a minimum a very small border around the edge so that models can't go off the build plate + border_size = max(border_size, 0.1) + if self._shape != "elliptic": if border_size - left_unreachable_border > 0: result[extruder_id].append(Polygon(numpy.array([ diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e1805584b0..f690456913 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -115,6 +115,7 @@ from . import CuraActions from . import PlatformPhysics from . import PrintJobPreviewImageProvider from .AutoSave import AutoSave +from .Machines.Models.MachineListModel import MachineListModel from .Machines.Models.ActiveIntentQualitiesModel import ActiveIntentQualitiesModel from .Machines.Models.IntentSelectionModel import IntentSelectionModel from .SingleInstance import SingleInstance @@ -152,6 +153,7 @@ class CuraApplication(QtApplication): super().__init__(name = ApplicationMetadata.CuraAppName, app_display_name = ApplicationMetadata.CuraAppDisplayName, version = ApplicationMetadata.CuraVersion if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType, + latest_url = ApplicationMetadata.CuraLatestURL, api_version = ApplicationMetadata.CuraSDKVersion, build_type = ApplicationMetadata.CuraBuildType, is_debug_mode = ApplicationMetadata.CuraDebugMode, @@ -355,8 +357,14 @@ class CuraApplication(QtApplication): Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) if not hasattr(sys, "frozen"): - resource_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources") - Resources.addSecureSearchPath(resource_path) + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) + + # local Conan cache + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", "resources")) + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", "plugins")) + + # venv site-packages + Resources.addSearchPath(os.path.join(app_root, "..", "share", "cura", "resources")) @classmethod def _initializeSettingDefinitions(cls): @@ -814,6 +822,12 @@ class CuraApplication(QtApplication): def run(self): super().run() + if len(ApplicationMetadata.DEPENDENCY_INFO) > 0: + Logger.debug("Using Conan managed dependencies: " + ", ".join( + [dep["recipe"]["id"] for dep in ApplicationMetadata.DEPENDENCY_INFO["installed"] if dep["recipe"]["version"] != "latest"])) + else: + Logger.warning("Could not find conan_install_info.json") + Logger.log("i", "Initializing machine error checker") self._machine_error_checker = MachineErrorChecker(self) self._machine_error_checker.initialize() @@ -1176,6 +1190,7 @@ class CuraApplication(QtApplication): qmlRegisterType(InstanceContainer, "Cura", 1, 0, "InstanceContainer") qmlRegisterType(ExtrudersModel, "Cura", 1, 0, "ExtrudersModel") qmlRegisterType(GlobalStacksModel, "Cura", 1, 0, "GlobalStacksModel") + qmlRegisterType(MachineListModel, "Cura", 1, 0, "MachineListModel") self.processEvents() qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel") diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index da71021d1f..a8f5b24a7b 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -14,6 +14,7 @@ from cura.Settings.GlobalStack import GlobalStack from UM.PackageManager import PackageManager # The class we're extending. from UM.Resources import Resources # To find storage paths for some resource types. from UM.i18n import i18nCatalog +from urllib.parse import unquote_plus catalog = i18nCatalog("cura") @@ -54,6 +55,14 @@ class CuraPackageManager(PackageManager): def initialize(self) -> None: self._installation_dirs_dict["materials"] = Resources.getStoragePath(CuraApplication.ResourceTypes.MaterialInstanceContainer) self._installation_dirs_dict["qualities"] = Resources.getStoragePath(CuraApplication.ResourceTypes.QualityInstanceContainer) + self._installation_dirs_dict["variants"] = Resources.getStoragePath(CuraApplication.ResourceTypes.VariantInstanceContainer) + + # Due to a bug in Cura 5.1.0 we needed to change the directory structure of the curapackage on the server side (See SD-3871). + # Although the material intent profiles will be installed in the `intent` folder, the curapackage from the server side will + # have an `intents` folder. For completeness, we will look in both locations of in the curapackage and map them both to the + # `intent` folder. + self._installation_dirs_dict["intents"] = Resources.getStoragePath(CuraApplication.ResourceTypes.IntentInstanceContainer) + self._installation_dirs_dict["intent"] = Resources.getStoragePath(CuraApplication.ResourceTypes.IntentInstanceContainer) super().initialize() @@ -80,6 +89,7 @@ class CuraPackageManager(PackageManager): def getMaterialFilePackageId(self, file_name: str, guid: str) -> str: """Get the id of the installed material package that contains file_name""" + file_name = unquote_plus(file_name) for material_package in [f for f in os.scandir(self._installation_dirs_dict["materials"]) if f.is_dir()]: package_id = material_package.name @@ -98,6 +108,7 @@ class CuraPackageManager(PackageManager): return package_id Logger.error("Could not find package_id for file: {} with GUID: {} ".format(file_name, guid)) + Logger.error(f"Bundled paths searched: {list(Resources.getSecureSearchPaths())}") return "" def getMachinesUsingPackage(self, package_id: str) -> Tuple[List[Tuple[GlobalStack, str, str]], List[Tuple[GlobalStack, str, str]]]: diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in deleted file mode 100644 index ce2264f5fc..0000000000 --- a/cura/CuraVersion.py.in +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2020 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -CuraAppName = "@CURA_APP_NAME@" -CuraAppDisplayName = "@CURA_APP_DISPLAY_NAME@" -CuraVersion = "@CURA_VERSION@" -CuraBuildType = "@CURA_BUILDTYPE@" -CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False -CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@" -CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@" -CuraCloudAccountAPIRoot = "@CURA_CLOUD_ACCOUNT_API_ROOT@" -CuraMarketplaceRoot = "@CURA_MARKETPLACE_ROOT@" -CuraDigitalFactoryURL = "@CURA_DIGITAL_FACTORY_URL@" diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index 2cb333d157..b113bd6dd7 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -45,11 +45,7 @@ class MachineErrorChecker(QObject): self._start_time = 0. # measure checking time - # This timer delays the starting of error check so we can react less frequently if the user is frequently - # changing settings. - self._error_check_timer = QTimer(self) - self._error_check_timer.setInterval(100) - self._error_check_timer.setSingleShot(True) + self._setCheckTimer() self._keys_to_check = set() # type: Set[str] @@ -66,6 +62,18 @@ class MachineErrorChecker(QObject): self._onMachineChanged() + def _setCheckTimer(self) -> None: + """A QTimer to regulate error check frequency + + This timer delays the starting of error check + so we can react less frequently if the user is frequently + changing settings. + """ + + self._error_check_timer = QTimer(self) + self._error_check_timer.setInterval(100) + self._error_check_timer.setSingleShot(True) + def _onMachineChanged(self) -> None: if self._global_stack: self._global_stack.propertyChanged.disconnect(self.startErrorCheckPropertyChanged) diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py new file mode 100644 index 0000000000..a758060384 --- /dev/null +++ b/cura/Machines/Models/MachineListModel.py @@ -0,0 +1,99 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +# The MachineListModel is used to display the connected printers in the interface. Both the abstract machines and all +# 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 PyQt6.QtCore import Qt, QTimer + +from UM.Qt.ListModel import ListModel +from UM.Settings.ContainerStack import ContainerStack +from UM.i18n import i18nCatalog +from UM.Util import parseBool + +from cura.Settings.CuraContainerRegistry import CuraContainerRegistry +from cura.Settings.GlobalStack import GlobalStack + + +class MachineListModel(ListModel): + NameRole = Qt.ItemDataRole.UserRole + 1 + IdRole = Qt.ItemDataRole.UserRole + 2 + HasRemoteConnectionRole = Qt.ItemDataRole.UserRole + 3 + MetaDataRole = Qt.ItemDataRole.UserRole + 4 + IsOnlineRole = Qt.ItemDataRole.UserRole + 5 + MachineCountRole = Qt.ItemDataRole.UserRole + 6 + IsAbstractMachine = Qt.ItemDataRole.UserRole + 7 + + def __init__(self, parent=None) -> None: + super().__init__(parent) + + self._catalog = i18nCatalog("cura") + + self.addRoleName(self.NameRole, "name") + self.addRoleName(self.IdRole, "id") + self.addRoleName(self.HasRemoteConnectionRole, "hasRemoteConnection") + self.addRoleName(self.MetaDataRole, "metadata") + self.addRoleName(self.IsOnlineRole, "isOnline") + self.addRoleName(self.MachineCountRole, "machineCount") + self.addRoleName(self.IsAbstractMachine, "isAbstractMachine") + + 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() + + def _onContainerChanged(self, container) -> None: + """Handler for container added/removed events from registry""" + + # We only need to update when the added / removed container GlobalStack + if isinstance(container, GlobalStack): + self._updateDelayed() + + def _updateDelayed(self) -> None: + self._change_timer.start() + + def _update(self) -> None: + self.setItems([]) # Clear items + + other_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine") + + abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True") + abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True) + + for abstract_machine in abstract_machine_stacks: + definition_id = abstract_machine.definition.getId() + from cura.CuraApplication import CuraApplication + machines_manager = CuraApplication.getInstance().getMachineManager() + online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) + + # Create a list item for abstract machine + self.addItem(abstract_machine, len(online_machine_stacks)) + other_machine_stacks.remove(abstract_machine) + + # Create list of machines that are children of the abstract machine + for stack in online_machine_stacks: + self.addItem(stack) + # Remove this machine from the other stack list + other_machine_stacks.remove(stack) + + for stack in other_machine_stacks: + self.addItem(stack) + + def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None: + if parseBool(container_stack.getMetaDataEntry("hidden", False)): + return + + self.appendItem({"name": container_stack.getName(), + "id": container_stack.getId(), + "metadata": container_stack.getMetaData().copy(), + "isOnline": parseBool(container_stack.getMetaDataEntry("is_online", False)), + "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)), + "machineCount": machine_count, + }) diff --git a/cura/PrinterOutput/Models/PrintJobOutputModel.py b/cura/PrinterOutput/Models/PrintJobOutputModel.py index 164dc5cb67..6b8e07b29e 100644 --- a/cura/PrinterOutput/Models/PrintJobOutputModel.py +++ b/cura/PrinterOutput/Models/PrintJobOutputModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional, TYPE_CHECKING, List @@ -6,6 +6,8 @@ from typing import Optional, TYPE_CHECKING, List from PyQt6.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot, QUrl from PyQt6.QtGui import QImage +from cura.CuraApplication import CuraApplication + if TYPE_CHECKING: from cura.PrinterOutput.PrinterOutputController import PrinterOutputController from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel @@ -86,6 +88,18 @@ class PrintJobOutputModel(QObject): self._owner = owner self.ownerChanged.emit() + @pyqtProperty(bool, notify = ownerChanged) + def isMine(self) -> bool: + """ + Returns whether this print job was sent by the currently logged in user. + + This checks the owner of the print job with the owner of the currently + logged in account. Both of these are human-readable account names which + may be duplicate. In practice the harm here is limited, but it's the + best we can do with the information available to the API. + """ + return self._owner == CuraApplication.getInstance().getCuraAPI().account.userName + @pyqtProperty(QObject, notify=assignedPrinterChanged) def assignedPrinter(self): return self._assigned_printer diff --git a/cura/PrinterOutput/Peripheral.py b/cura/PrinterOutput/Peripheral.py index 27d127832b..4613506978 100644 --- a/cura/PrinterOutput/Peripheral.py +++ b/cura/PrinterOutput/Peripheral.py @@ -1,20 +1,19 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from dataclasses import dataclass +@dataclass class Peripheral: """Data class that represents a peripheral for a printer. Output device plug-ins may specify that the printer has a certain set of peripherals. This set is then possibly shown in the interface of the monitor stage. + + Args: + type (string): A unique ID for the type of peripheral. + name (string): A human-readable name for the peripheral. """ - - def __init__(self, peripheral_type: str, name: str) -> None: - """Constructs the peripheral. - - :param peripheral_type: A unique ID for the type of peripheral. - :param name: A human-readable name for the peripheral. - """ - self.type = peripheral_type - self.name = name + type: str + name: str diff --git a/cura/Scene/CuraSceneController.py b/cura/Scene/CuraSceneController.py index 1d604b74b6..54f1cc56f2 100644 --- a/cura/Scene/CuraSceneController.py +++ b/cura/Scene/CuraSceneController.py @@ -139,7 +139,7 @@ class CuraSceneController(QObject): def setActiveBuildPlate(self, nr): if nr == self._active_build_plate: return - Logger.log("d", "Select build plate: %s" % nr) + Logger.debug(f"Selected build plate: {nr}") self._active_build_plate = nr Selection.clear() diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 6ff856efcb..1a711ef919 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -108,7 +108,7 @@ class CuraContainerRegistry(ContainerRegistry): :param container_type: :type{string} Type of the container (machine, quality, ...) :param container_name: :type{string} Name to check """ - container_class = ContainerStack if container_type == "machine" else InstanceContainer + container_class = ContainerStack if "machine" in container_type else InstanceContainer return self.findContainersMetadata(container_type = container_class, id = container_name, type = container_type, ignore_case = True) or \ self.findContainersMetadata(container_type = container_class, name = container_name, type = container_type) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 5348deb4bd..a8a1d780ea 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -427,4 +427,4 @@ class _ContainerIndexes: } # Reverse lookup: type -> index - TypeIndexMap = dict([(v, k) for k, v in IndexTypeMap.items()]) + TypeIndexMap = {v: k for k, v in IndexTypeMap.items()} diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index ff9a795c43..5a745f8f0a 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -27,7 +27,7 @@ class CuraStackBuilder: :return: The new global stack or None if an error occurred. """ - from cura.CuraApplication import CuraApplication + from cura.CuraApplication import CuraApplication # inline import needed due to circular import application = CuraApplication.getInstance() registry = application.getContainerRegistry() container_tree = ContainerTree.getInstance() @@ -91,7 +91,7 @@ class CuraStackBuilder: :param extruder_position: The position of the current extruder. """ - from cura.CuraApplication import CuraApplication + from cura.CuraApplication import CuraApplication # inline import needed due to circular import application = CuraApplication.getInstance() registry = application.getContainerRegistry() @@ -199,13 +199,21 @@ class CuraStackBuilder: :return: A new Global stack instance with the specified parameters. """ - - from cura.CuraApplication import CuraApplication - application = CuraApplication.getInstance() - registry = application.getContainerRegistry() - stack = GlobalStack(new_stack_id) stack.setDefinition(definition) + cls.createUserContainer(new_stack_id, definition, stack, variant_container, material_container, quality_container) + return stack + + @classmethod + def createUserContainer(cls, new_stack_id: str, definition: DefinitionContainerInterface, + stack: GlobalStack, + variant_container: "InstanceContainer", + material_container: "InstanceContainer", + quality_container: "InstanceContainer") -> None: + from cura.CuraApplication import CuraApplication + application = CuraApplication.getInstance() + + registry = application.getContainerRegistry() # Create user container user_container = cls.createUserChangesContainer(new_stack_id + "_user", definition.getId(), new_stack_id, @@ -221,8 +229,6 @@ class CuraStackBuilder: registry.addContainer(user_container) - return stack - @classmethod def createUserChangesContainer(cls, container_name: str, definition_id: str, stack_id: str, is_global_stack: bool) -> "InstanceContainer": @@ -259,3 +265,51 @@ class CuraStackBuilder: container_stack.definitionChanges = definition_changes_container return definition_changes_container + + @classmethod + def createAbstractMachine(cls, definition_id: str) -> Optional[GlobalStack]: + """Create a new instance of an abstract machine. + + :param definition_id: The ID of the machine definition to use. + + :return: The new Abstract Machine or None if an error occurred. + """ + abstract_machine_id = f"{definition_id}_abstract_machine" + + from cura.CuraApplication import CuraApplication + application = CuraApplication.getInstance() + registry = application.getContainerRegistry() + container_tree = ContainerTree.getInstance() + + if registry.findContainerStacks(is_abstract_machine = "True", id = abstract_machine_id): + # This abstract machine already exists + return None + + match registry.findDefinitionContainers(type = "machine", id = definition_id): + case []: + # It should not be possible for the definition to be missing since an abstract machine will only + # be created as a result of a machine with definition_id being created. + Logger.error(f"Definition {definition_id} was not found!") + return None + case [machine_definition, *_definitions]: + machine_node = container_tree.machines[machine_definition.getId()] + name = machine_definition.getName() + + stack = GlobalStack(abstract_machine_id) + stack.setMetaDataEntry("is_abstract_machine", True) + stack.setMetaDataEntry("is_online", True) + stack.setDefinition(machine_definition) + cls.createUserContainer( + name, + machine_definition, + stack, + application.empty_variant_container, + application.empty_material_container, + machine_node.preferredGlobalQuality().container, + ) + + stack.setName(name) + + registry.addContainer(stack) + + return stack diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index f0a6946f88..3c13f236ab 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from collections import defaultdict @@ -8,10 +8,9 @@ import uuid from PyQt6.QtCore import pyqtProperty, pyqtSlot, pyqtSignal -from UM.Decorators import deprecated, override +from UM.Decorators import override from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase from UM.Settings.ContainerStack import ContainerStack -from UM.Settings.SettingInstance import InstanceState from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import PropertyEvaluationContext from UM.Logger import Logger @@ -344,14 +343,12 @@ class GlobalStack(CuraContainerStack): def getName(self) -> str: return self._metadata.get("group_name", self._metadata.get("name", "")) - def setName(self, name: "str") -> None: + def setName(self, name: str) -> None: super().setName(name) nameChanged = pyqtSignal() name = pyqtProperty(str, fget=getName, fset=setName, notify=nameChanged) - - ## private: global_stack_mime = MimeType( name = "application/x-cura-globalstack", diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 64d34d6c3e..389c5ded75 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -19,6 +19,7 @@ from UM.Logger import Logger from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction +from UM.Settings.ContainerStack import ContainerStack from UM.Signal import postponeSignals, CompressTechnique import cura.CuraApplication # Imported like this to prevent circular references. @@ -186,6 +187,32 @@ class MachineManager(QObject): self.outputDevicesChanged.emit() + def getMachinesWithDefinition(self, definition_id: str, online_only=False) -> List[ContainerStack]: + """ Fetches all container stacks that match definition_id. + + :param definition_id: The id of the machine definition. + :return: A list of Containers that match definition_id + """ + from cura.CuraApplication import CuraApplication # In function to avoid circular import + application = CuraApplication.getInstance() + registry = application.getContainerRegistry() + + machines = registry.findContainerStacks(type="machine") + # Filter machines that match definition + machines = filter(lambda machine: machine.definition.id == definition_id, machines) + # Filter only LAN and Cloud printers + machines = filter(lambda machine: ConnectionType.CloudConnection in machine.configuredConnectionTypes or + ConnectionType.NetworkConnection in machine.configuredConnectionTypes, + machines) + if online_only: + # LAN printers can have is_online = False but should still be included, + # their online status is only checked when they are the active printer. + machines = filter(lambda machine: parseBool(machine.getMetaDataEntry("is_online", False) or + ConnectionType.NetworkConnection in machine.configuredConnectionTypes), + machines) + + return list(machines) + @pyqtProperty(QObject, notify = currentConfigurationChanged) def currentConfiguration(self) -> PrinterConfigurationModel: return self._current_printer_configuration diff --git a/cura/TaskManagement/OnExitCallbackManager.py b/cura/TaskManagement/OnExitCallbackManager.py index 7894931e9c..54121a2960 100644 --- a/cura/TaskManagement/OnExitCallbackManager.py +++ b/cura/TaskManagement/OnExitCallbackManager.py @@ -10,10 +10,13 @@ if TYPE_CHECKING: # -# This class manages a all registered upon-exit checks that need to be perform when the application tries to exit. -# For example, to show a confirmation dialog when there is USB printing in progress, etc. All callbacks will be called -# in the order of when they got registered. If all callbacks "passes", that is, for example, if the user clicks "yes" -# on the exit confirmation dialog or nothing that's blocking the exit, then the application will quit after that. +# This class manages all registered upon-exit checks +# that need to be performed when the application tries to exit. +# For example, show a confirmation dialog when there is USB printing in progress. +# All callbacks will be called in the order of when they were registered. +# If all callbacks "pass", for example: +# if the user clicks "yes" on the exit confirmation dialog +# and nothing else is blocking the exit, then the application will quit. # class OnExitCallbackManager: @@ -35,10 +38,12 @@ class OnExitCallbackManager: def getIsAllChecksPassed(self) -> bool: return self._is_all_checks_passed - # Trigger the next callback if available. If not, it means that all callbacks have "passed", which means we should - # not block the application to quit, and it will call the application to actually quit. + # Trigger the next callback if there is one. + # If not, all callbacks have "passed", + # which means we should not prevent the application from quitting, + # and we call the application to actually quit. def triggerNextCallback(self) -> None: - # Get the next callback and schedule that if + # Get the next callback and schedule it this_callback = None if self._current_callback_idx < len(self._on_exit_callback_list): this_callback = self._on_exit_callback_list[self._current_callback_idx] @@ -55,10 +60,11 @@ class OnExitCallbackManager: # Tell the application to exit self._application.callLater(self._application.closeApplication) - # This is the callback function which an on-exit callback should call when it finishes, it should provide the - # "should_proceed" flag indicating whether this check has "passed", or in other words, whether quitting the - # application should be blocked. If the last on-exit callback doesn't block the quitting, it will call the next - # registered on-exit callback if available. + # Callback function which an on-exit callback calls when it finishes. + # It provides a "should_proceed" flag indicating whether the check has "passed", + # or whether quitting the application should be blocked. + # If the last on-exit callback doesn't block quitting, it will call the next + # registered on-exit callback if one is available. def onCurrentCallbackFinished(self, should_proceed: bool = True) -> None: if not should_proceed: Logger.log("d", "on-app-exit callback finished and we should not proceed.") diff --git a/cura/UI/PrintInformation.py b/cura/UI/PrintInformation.py index e18fc38247..2b8e13b09f 100644 --- a/cura/UI/PrintInformation.py +++ b/cura/UI/PrintInformation.py @@ -38,6 +38,8 @@ class PrintInformation(QObject): self.initializeCuraMessagePrintTimeProperties() + self.slice_uuid: Optional[str] = None + # Indexed by build plate number self._material_lengths = {} # type: Dict[int, List[float]] self._material_weights = {} # type: Dict[int, List[float]] diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index 1092ba4852..0000000000 --- a/docker/build.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash - -# Abort at the first error. -set -e - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )" - -# Make sure that environment variables are set properly -export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}" -export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}" -export LD_LIBRARY_PATH="${CURA_BUILD_ENV_PATH}/lib:${LD_LIBRARY_PATH}" - -cd "${PROJECT_DIR}" - - - -# -# Clone Uranium and set PYTHONPATH first -# - -# Check the branch to use for Uranium. -# It tries the following branch names and uses the first one that's available. -# - GITHUB_HEAD_REF: the branch name of a PR. If it's not a PR, it will be empty. -# - GITHUB_BASE_REF: the branch a PR is based on. If it's not a PR, it will be empty. -# - GITHUB_REF: the branch name if it's a branch on the repository; -# refs/pull/123/merge if it's a pull_request. -# - master: the master branch. It should always exist. - -# For debugging. -echo "GITHUB_REF: ${GITHUB_REF}" -echo "GITHUB_HEAD_REF: ${GITHUB_HEAD_REF}" -echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" - -GIT_REF_NAME_LIST=( "${GITHUB_HEAD_REF}" "${GITHUB_BASE_REF}" "${GITHUB_REF}" "master" ) -for git_ref_name in "${GIT_REF_NAME_LIST[@]}" -do - if [ -z "${git_ref_name}" ]; then - continue - fi - git_ref_name="$(basename "${git_ref_name}")" - # Skip refs/pull/1234/merge as pull requests use it as GITHUB_REF - if [[ "${git_ref_name}" == "merge" ]]; then - echo "Skip [${git_ref_name}]" - continue - fi - URANIUM_BRANCH="${git_ref_name}" - output="$(git ls-remote --heads https://github.com/Ultimaker/Uranium.git "${URANIUM_BRANCH}")" - if [ -n "${output}" ]; then - echo "Found Uranium branch [${URANIUM_BRANCH}]." - break - else - echo "Could not find Uranium branch [${URANIUM_BRANCH}], try next." - fi -done - -echo "Using Uranium branch ${URANIUM_BRANCH} ..." -git clone --depth=1 -b "${URANIUM_BRANCH}" https://github.com/Ultimaker/Uranium.git "${PROJECT_DIR}"/Uranium -export PYTHONPATH="${PROJECT_DIR}/Uranium:.:${PYTHONPATH}" - -mkdir build -cd build -cmake \ - -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_PREFIX_PATH="${CURA_BUILD_ENV_PATH}" \ - -DURANIUM_DIR="${PROJECT_DIR}/Uranium" \ - -DBUILD_TESTS=ON \ - -DPRINT_PLUGIN_LIST=OFF \ - -DGENERATE_TRANSLATIONS=OFF \ - .. -make diff --git a/docker/test.sh b/docker/test.sh deleted file mode 100755 index bae2bf785e..0000000000 --- a/docker/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd build -ctest -j4 --output-on-failure -T Test diff --git a/docs/Report.md b/docs/Report.md new file mode 100644 index 0000000000..8b24903878 --- /dev/null +++ b/docs/Report.md @@ -0,0 +1,81 @@ + +# Reporting Issues + +Please attach the following information in case
+you want to report crashing or similar issues. + +
+ +## DxDiag + +### ![Badge Windows] + +The log as produced by **dxdiag**. + +  start    »    run    »    dxdiag    »    save output   + +
+
+ +## Cura GUI Log + +If the Cura user interface still starts, you can also
+reach these directories from the application menu: + +  Help    »    Show settings folder   + +
+ +### ![Badge Windows] + +``` +%APPDATA%\cura\<Cura Version>\cura.log +``` + +or + +``` +C:\Users\\AppData\Roaming\cura\<Cura Version>\cura.log +``` + +
+ +### ![Badge Linux] + +``` +~/.local/share/cura/<Cura Version>/cura.log +``` + +
+ +### ![Badge MacOS] + +``` +~/Library/Application Support/cura/<Cura Version>/cura.log +``` + +
+
+ +## Alternative + +An alternative is to install the **[ExtensiveSupportLogging]**
+plugin this creates a zip folder of the relevant log files. + +If you're experiencing performance issues, we might ask
+you to connect the CPU profiler in this plugin and attach
+the collected data to your support ticket. + +
+ + + + +[ExtensiveSupportLogging]: https://marketplace.ultimaker.com/app/cura/plugins/UltimakerPackages/ExtensiveSupportLogging + + + + +[Badge Windows]: https://img.shields.io/badge/Windows-0078D6?style=for-the-badge&logoColor=white&logo=Windows +[Badge Linux]: https://img.shields.io/badge/Linux-00A95C?style=for-the-badge&logoColor=white&logo=Linux +[Badge MacOS]: https://img.shields.io/badge/MacOS-403C3D?style=for-the-badge&logoColor=white&logo=MacOS diff --git a/docs/profiles/setting_properties.md b/docs/profiles/setting_properties.md index 84fb458c63..27a0d17c4d 100644 --- a/docs/profiles/setting_properties.md +++ b/docs/profiles/setting_properties.md @@ -2,32 +2,77 @@ Setting Properties ==== Each setting in Cura has a number of properties. It's not just a key and a value. This page lists the properties that a setting can define. -* `key` (string): The identifier by which the setting is referenced. This is not a human-readable name, but just a reference string, such as `layer_height_0`. Typically these are named with the most significant category first, in order to sort them better, such as `material_print_temperature`. This is not actually a real property but just an identifier; it can't be changed. -* `value` (optional): The current value of the setting. This can be a function, an arbitrary Python expression that depends on the values of other settings. If it's not present, the `default_value` is used. -* `default_value`: A default value for the setting if `value` is undefined. This property is required however. It can't be a Python expression, but it can be any JSON type. This is made separate so that CuraEngine can read it out as well for its debugging mode via the command line, without needing a complete Python interpreter. -* `label` (string): The human-readable name for the setting. This label is translated. -* `description` (string): A longer description of what the setting does when you change it. This description is translated as well. -* `type` (string): The type of value that this setting contains. Allowed types are: `bool`, `str`, `float`, `int`, `enum`, `category`, `[int]`, `vec3`, `polygon` and `polygons`. -* `unit` (optional string): A unit that is displayed at the right-hand side of the text field where the user enters the setting value. -* `resolve` (optional string): A Python expression that resolves disagreements for global settings if multiple per-extruder profiles define different values for a setting. Typically this takes the values for the setting from all stacks and computes one final value for it that will be used for the global setting. For instance, the `resolve` function for the build plate temperature is `max(extruderValues('material_bed_temperature')`, meaning that it will use the hottest bed temperature of all materials of the extruders in use. -* `limit_to_extruder` (optional): A Python expression that indicates which extruder a setting will be obtained from. This is used for settings that may be extruder-specific but the extruder is not necessarily the current extruder. For instance, support settings need to be evaluated for the support extruder. Infill settings need to be evaluated for the infill extruder if the infill extruder is changed. -* `enabled` (optional string or boolean): Whether the setting can currently be made visible for the user. This can be a simple true/false, or a Python expression that depends on other settings. Typically used for settings that don't apply when another setting is disabled, such as to hide the support settings if support is disabled. -* `minimum_value` (optional): The lowest acceptable value for this setting. If it's any lower, Cura will not allow the user to slice. By convention this is used to prevent setting values that are technically or physically impossible, such as a layer height of 0mm. This property only applies to numerical settings. -* `maximum_value` (optional): The highest acceptable value for this setting. If it's any higher, Cura will not allow the user to slice. By convention this is used to prevent setting values that are technically or physically impossible, such as a support overhang angle of more than 90 degrees. This property only applies to numerical settings. -* `minimum_value_warning` (optional): The threshold under which a warning is displayed to the user. By convention this is used to indicate that it will probably not print very nicely with such a low setting value. This property only applies to numerical settings. -* `maximum_value_warning` (optional): The threshold above which a warning is displayed to the user. By convention this is used to indicate that it will probably not print very nicely with such a high setting value. This property only applies to numerical settings. -* `settable_globally` (optional boolean): Whether the setting can be changed globally. For some mesh-type settings such as `support_mesh` this doesn't make sense, so those can't be changed globally. They are not displayed in the main settings list then. -* `settable_per_meshgroup` (optional boolean): Whether a setting can be changed per group of meshes. Currently unused in Cura. -* `settable_per_extruder` (optional boolean): Whether a setting can be changed per extruder. Some settings, like the build plate temperature, can't be adjusted separately for each extruder. An icon is shown in the interface to indicate this. If the user changes these settings they are stored in the global stack. -* `settable_per_mesh` (optional boolean): Whether a setting can be changed per mesh. The settings that can be changed per mesh are shown in the list of available settings in the per-object settings tool. -* `children` (optional list): A list of child settings. These are displayed with an indentation. If all child settings are overridden by the user, the parent setting gets greyed out to indicate that the parent setting has no effect any more. This is not strictly always the case though, because that would depend on the inheritance functions in the `value`. -* `icon` (optional string): A path to an icon to be displayed. Only applies to setting categories. -* `allow_empty` (optional bool): Whether the setting is allowed to be empty. If it's not, this will be treated as a setting error and Cura will not allow the user to slice. Only applies to string-type settings. -* `warning_description` (optional string): A warning message to display when the setting has a warning value. This is currently unused by Cura. -* `error_description` (optional string): An error message to display when the setting has an error value. This is currently unused by Cura. -* `options` (dictionary): A list of values that the user can choose from. The keys of this dictionary are keys that CuraEngine identifies the option with. The values are human-readable strings and will be translated. Only applies to (and only required for) enum-type settings. -* `comments` (optional string): Comments to other programmers about the setting. This is not used by Cura. -* `is_uuid` (optional boolean): Whether or not this setting indicates a UUID-4. If it is, the setting will indicate an error if it's not in the correct format. Only applies to string-type settings. -* `regex_blacklist_pattern` (optional string): A regular expression, where if the setting value matches with this regular expression, it gets an error state. Only applies to string-type settings. -* `error_value` (optional): If the setting value is equal to this value, it will show a setting error. This is used to display errors for non-numerical settings such as checkboxes. -* `warning_value` (optional): If the setting value is equal to this value, it will show a setting warning. This is used to display warnings for non-numerical settings such as checkboxes. \ No newline at end of file +* `key` (string): __The identifier by which the setting is referenced.__ + * This is not a human-readable name, but just a reference string, such as `layer_height_0`. + * This is not actually a real property but just an identifier; it can't be changed. + * Typically these are named with the most significant category first, in order to sort them better, such as `material_print_temperature`. +* `value` (optional): __The current value of the setting.__ + * This can be a function (an arbitrary Python expression) that depends on the values of other settings. + * If it's not present, the `default_value` is used. +* `default_value`: __A default value for the setting if `value` is undefined.__ + * This property is required. + * It can't be a Python expression, but it can be any JSON type. + * This is made separate so that CuraEngine can read it out for its debugging mode via the command line, without needing a complete Python interpreter. +* `label` (string): __The human-readable name for the setting.__ + * This label is translated. +* `description` (string): __A longer description of what the setting does when you change it.__ + * This description is translated. +* `type` (string): __The type of value that this setting contains.__ + * Allowed types are: `bool`, `str`, `float`, `int`, `enum`, `category`, `[int]`, `vec3`, `polygon` and `polygons`. +* `unit` (optional string): __A unit that is displayed at the right-hand side of the text field where the user enters the setting value.__ +* `resolve` (optional string): __A Python expression that resolves disagreements for global settings if multiple per-extruder profiles define different values for a setting.__ + * Typically this takes the values for the setting from all stacks and computes one final value for it that will be used for the global setting. For instance, the `resolve` function for the build plate temperature is `max(extruderValues('material_bed_temperature')`, meaning that it will use the hottest bed temperature of all materials of the extruders in use. +* `limit_to_extruder` (optional): __A Python expression that indicates which extruder a setting will be obtained from.__ + * This is used for settings that may be extruder-specific but the extruder is not necessarily the current extruder. For instance, support settings need to be evaluated for the support extruder. Infill settings need to be evaluated for the infill extruder if the infill extruder is changed. +* `enabled` (optional string or boolean): __Whether the setting can currently be made visible for the user.__ + * This can be a simple true/false, or a Python expression that depends on other settings. + * Typically used for settings that don't apply when another setting is disabled, such as to hide the support settings if support is disabled. +* `minimum_value` (optional): __The lowest acceptable value for this setting.__ + * If it's any lower, Cura will not allow the user to slice. + * This property only applies to numerical settings. + * By convention this is used to prevent setting values that are technically or physically impossible, such as a layer height of 0mm. +* `maximum_value` (optional): __The highest acceptable value for this setting.__ + * If it's any higher, Cura will not allow the user to slice. + * This property only applies to numerical settings. + * By convention this is used to prevent setting values that are technically or physically impossible, such as a support overhang angle of more than 90 degrees. +* `minimum_value_warning` (optional): __The threshold under which a warning is displayed to the user.__ + * This property only applies to numerical settings. + * By convention this is used to indicate that it will probably not print very nicely with such a low setting value. +* `maximum_value_warning` (optional): __The threshold above which a warning is displayed to the user.__ + * This property only applies to numerical settings. + * By convention this is used to indicate that it will probably not print very nicely with such a high setting value. +* `settable_globally` (optional boolean): __Whether the setting can be changed globally.__ + * For some mesh-type settings such as `support_mesh` this doesn't make sense, so those can't be changed globally. They are not displayed in the main settings list then. +* `settable_per_meshgroup` (optional boolean): __Whether a setting can be changed per group of meshes.__ + * *This is currently unused by Cura.* +* `settable_per_extruder` (optional boolean): __Whether a setting can be changed per extruder.__ + * Some settings, like the build plate temperature, can't be adjusted separately for each extruder. An icon is shown in the interface to indicate this. + * If the user changes these settings they are stored in the global stack. +* `settable_per_mesh` (optional boolean): __Whether a setting can be changed per mesh.__ + * The settings that can be changed per mesh are shown in the list of available settings in the per-object settings tool. +* `children` (optional list): __A list of child settings.__ + * These are displayed with an indentation. If all child settings are overridden by the user, the parent setting gets greyed out to indicate that the parent setting has no effect any more. This is not strictly always the case though, because that would depend on the inheritance functions in the `value`. +* `icon` (optional string): __A path to an icon to be displayed.__ + * Only applies to setting categories. +* `allow_empty` (optional bool): __Whether the setting is allowed to be empty.__ + * If it's not, this will be treated as a setting error and Cura will not allow the user to slice. + * Only applies to string-type settings. +* `warning_description` (optional string): __A warning message to display when the setting has a warning value.__ + * *This is currently unused by Cura.* +* `error_description` (optional string): __An error message to display when the setting has an error value.__ + * *This is currently unused by Cura.* +* `options` (dictionary): __A list of values that the user can choose from.__ + * The keys of this dictionary are keys that CuraEngine identifies the option with. + * The values are human-readable strings and will be translated. + * Only applies to (and only required for) enum-type settings. +* `comments` (optional string): __Comments to other programmers about the setting.__ + * *This is currently unused by Cura.* +* `is_uuid` (optional boolean): __Whether or not this setting indicates a UUID-4.__ + * If it is, the setting will indicate an error if it's not in the correct format. + * Only applies to string-type settings. +* `regex_blacklist_pattern` (optional string): __A regular expression, where if the setting value matches with this regular expression, it gets an error state.__ + * Only applies to string-type settings. +* `error_value` (optional): __If the setting value is equal to this value, it will show a setting error.__ + * This is used to display errors for non-numerical settings such as checkboxes. +* `warning_value` (optional): __If the setting value is equal to this value, it will show a setting warning.__ + * This is used to display warnings for non-numerical settings such as checkboxes. diff --git a/docs/repositories.md b/docs/repositories.md index 3b4c4bc317..0d882c44b2 100644 --- a/docs/repositories.md +++ b/docs/repositories.md @@ -1,21 +1,33 @@ Repositories ==== Cura uses a number of repositories where parts of our source code are separated, in order to get a cleaner architecture. Those repositories are: -* [Cura](https://github.com/Ultimaker/Cura), the main repository for the front-end of Cura. This contains all of the business logic for the front-end, including the specific types of profiles that are available, the concept of 3D printers and materials, specific tools for handling 3D printed models, pretty much all of the GUI, as well as Ultimaker services such as the Marketplace and accounts. -* The Cura repository is built on [Uranium](https://github.com/Ultimaker/Uranium), a framework for desktop applications that handle 3D models and have a separate back-end. This provides Cura with a basic GUI framework ([Qt](https://www.qt.io/)), a 3D scene, a rendering system, a plug-in system and a system for stacked profiles that change settings. -* In order to slice, Cura starts [CuraEngine](https://github.com/Ultimaker/CuraEngine) in the background. This does the actual process that converts 3D models into a toolpath for the printer. -* Communication to CuraEngine goes via [libArcus](https://github.com/Ultimaker/libArcus), a small library that wraps around [Protobuf](https://developers.google.com/protocol-buffers/) in order to make it run over a local socket. -* Cura's build scripts are in [cura-build](https://github.com/Ultimaker/cura-build) and build scripts for building dependencies are in [cura-build-environment](https://github.com/Ultimaker/cura-build-environment). +* [Cura](https://github.com/Ultimaker/Cura) is the main repository for the front-end of Cura. This contains: + - all of the business logic for the front-end, including the specific types of profiles that are available + - the concept of 3D printers and materials + - specific tools for handling 3D printed models + - pretty much all of the GUI + - Ultimaker services such as the Marketplace and accounts. +* [Uranium](https://github.com/Ultimaker/Uranium) is the underlying framework the Cura repository is built on. [Uranium](https://github.com/Ultimaker/Uranium) is a framework for desktop applications that handle 3D models. It has a separate back-end. This provides Cura with: + - a basic GUI framework ([Qt](https://www.qt.io/)) + - a 3D scene, a rendering system + - a plug-in system + - a system for stacked profiles that change settings. +* [CuraEngine](https://github.com/Ultimaker/CuraEngine) is the slicer used by Cura in the background. This does the actual process that converts 3D models into a toolpath for the printer. +* [libArcus](https://github.com/Ultimaker/libArcus) handles the communication to CuraEngine. [libArcus](https://github.com/Ultimaker/libArcus) is a small library that wraps around [Protobuf](https://developers.google.com/protocol-buffers/) in order to make it run over a local socket. +* [cura-build](https://github.com/Ultimaker/cura-build): Cura's build scripts. +* [cura-build-environment](https://github.com/Ultimaker/cura-build-environment) build scripts for building dependencies. There are also a number of repositories under our control that are not integral parts of Cura's architecture, but more like separated side-gigs: -* Loading and writing 3MF files is done through [libSavitar](https://github.com/Ultimaker/libSavitar). -* Loading and writing UFP files is done through [libCharon](https://github.com/Ultimaker/libCharon). -* To make the build system a bit simpler, some parts are pre-compiled in [cura-binary-data](https://github.com/Ultimaker/cura-binary-data). This holds things like the machine-readable translation files and the Marlin builds for firmware updates, which would require considerable tooling to build automatically. -* There are automated GUI tests in [Cura-squish-tests](https://github.com/Ultimaker/Cura-squish-tests). -* Material profiles are stored in [fdm_materials](https://github.com/Ultimaker/fdm_materials). This is separated out and combined in our build process, so that the firmware for Ultimaker's printers can use the same set of profiles too. +* [libSavitar](https://github.com/Ultimaker/libSavitar) is used for loading and writing 3MF files. +* [libCharon](https://github.com/Ultimaker/libCharon) is used for loading and writing UFP files. +* [cura-binary-data](https://github.com/Ultimaker/cura-binary-data) pre-compiled parts to make the build system a bit simpler. This holds things which would require considerable tooling to build automatically like: + - the machine-readable translation files + - the Marlin builds for firmware updates +* [Cura-squish-tests](https://github.com/Ultimaker/Cura-squish-tests): automated GUI tests. +* [fdm_materials](https://github.com/Ultimaker/fdm_materials) stores Material profiles. This is separated out and combined in our build process, so that the firmware for Ultimaker's printers can use the same set of profiles too. Interplay ---- At a very high level, Cura's repositories interconnect as follows: -![Overview of interplay between repositories](resources/repositories.svg) \ No newline at end of file +![Overview of interplay between repositories](resources/repositories.svg) diff --git a/docs/resources/deps.dot b/docs/resources/deps.dot new file mode 100644 index 0000000000..dbfe8f4530 --- /dev/null +++ b/docs/resources/deps.dot @@ -0,0 +1,54 @@ +digraph { + "cpython/3.10.4@ultimaker/testing" -> "zlib/1.2.12" + "cpython/3.10.4@ultimaker/testing" -> "openssl/1.1.1l" + "cpython/3.10.4@ultimaker/testing" -> "expat/2.4.1" + "cpython/3.10.4@ultimaker/testing" -> "libffi/3.2.1" + "cpython/3.10.4@ultimaker/testing" -> "mpdecimal/2.5.0@ultimaker/testing" + "cpython/3.10.4@ultimaker/testing" -> "libuuid/1.0.3" + "cpython/3.10.4@ultimaker/testing" -> "libxcrypt/4.4.25" + "cpython/3.10.4@ultimaker/testing" -> "bzip2/1.0.8" + "cpython/3.10.4@ultimaker/testing" -> "gdbm/1.19" + "cpython/3.10.4@ultimaker/testing" -> "sqlite3/3.36.0" + "cpython/3.10.4@ultimaker/testing" -> "tk/8.6.10" + "cpython/3.10.4@ultimaker/testing" -> "ncurses/6.2" + "cpython/3.10.4@ultimaker/testing" -> "xz_utils/5.2.5" + "pynest2d/5.1.0-beta+3@ultimaker/stable" -> "libnest2d/5.1.0-beta+3@ultimaker/stable" + "pynest2d/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing" + "freetype/2.12.1" -> "libpng/1.6.37" + "freetype/2.12.1" -> "zlib/1.2.12" + "freetype/2.12.1" -> "bzip2/1.0.8" + "freetype/2.12.1" -> "brotli/1.0.9" + "savitar/5.1.0-beta+3@ultimaker/stable" -> "pugixml/1.12.1" + "savitar/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing" + "arcus/5.1.0-beta+3@ultimaker/stable" -> "protobuf/3.17.1" + "arcus/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing" + "arcus/5.1.0-beta+3@ultimaker/stable" -> "zlib/1.2.12" + "libpng/1.6.37" -> "zlib/1.2.12" + "curaengine/5.1.0-beta+3@ultimaker/stable" -> "clipper/6.4.2" + "curaengine/5.1.0-beta+3@ultimaker/stable" -> "boost/1.78.0" + "curaengine/5.1.0-beta+3@ultimaker/stable" -> "rapidjson/1.1.0" + "curaengine/5.1.0-beta+3@ultimaker/stable" -> "stb/20200203" + "curaengine/5.1.0-beta+3@ultimaker/stable" -> "protobuf/3.17.1" + "curaengine/5.1.0-beta+3@ultimaker/stable" -> "arcus/5.1.0-beta+3@ultimaker/stable" + "tcl/8.6.10" -> "zlib/1.2.12" + "uranium/5.1.0-beta+3@ultimaker/stable" -> "arcus/5.1.0-beta+3@ultimaker/stable" + "uranium/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing" + "libnest2d/5.1.0-beta+3@ultimaker/stable" -> "boost/1.78.0" + "libnest2d/5.1.0-beta+3@ultimaker/stable" -> "clipper/6.4.2" + "libnest2d/5.1.0-beta+3@ultimaker/stable" -> "nlopt/2.7.0" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "arcus/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "curaengine/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "savitar/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "pynest2d/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "uranium/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "fdm_materials/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "cura_binary_data/5.1.0-beta+3@ultimaker/stable" + "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "cpython/3.10.4@ultimaker/testing" + "fontconfig/2.13.93" -> "freetype/2.12.1" + "fontconfig/2.13.93" -> "expat/2.4.1" + "fontconfig/2.13.93" -> "libuuid/1.0.3" + "tk/8.6.10" -> "tcl/8.6.10" + "tk/8.6.10" -> "fontconfig/2.13.93" + "tk/8.6.10" -> "xorg/system" + "protobuf/3.17.1" -> "zlib/1.2.12" +} diff --git a/icons/cura.icns b/icons/cura.icns deleted file mode 100644 index 51d8ea71e8..0000000000 Binary files a/icons/cura.icns and /dev/null differ diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun new file mode 100644 index 0000000000..d2beac8745 --- /dev/null +++ b/packaging/AppImage/AppRun @@ -0,0 +1,20 @@ +#!/bin/sh + +scriptdir=$(dirname $0) + +export PYTHONPATH="$scriptdir/lib/python3.10" +export LD_LIBRARY_PATH=$scriptdir +export QT_PLUGIN_PATH="$scriptdir/qt/plugins" +export QML2_IMPORT_PATH="$scriptdir/qt/qml" +export QT_QPA_FONTDIR=/usr/share/fonts +export QT_QPA_PLATFORMTHEME=xdgdesktopportal +export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb + +# Use the openssl.cnf packaged in the AppImage +export OPENSSL_CONF="$scriptdir/openssl.cnf" + +$scriptdir/Ultimaker-Cura "$@" + +# If this variable is set on Zorin OS 16 Cura would crash +# unset `QT_STYLE_OVERRIDE` as a precaution +unset QT_STYLE_OVERRIDE \ No newline at end of file diff --git a/packaging/AppImage/create_appimage.py b/packaging/AppImage/create_appimage.py new file mode 100644 index 0000000000..bb8396f43c --- /dev/null +++ b/packaging/AppImage/create_appimage.py @@ -0,0 +1,76 @@ +# Copyright (c) 2022 Ultimaker B.V. +# 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. +import os.path # Finding files. +import shutil # Copying files. +import stat # For setting file permissions. +import subprocess # For calling system commands. + +def build_appimage(dist_path, version, appimage_filename): + """ + Creates an AppImage file from the build artefacts created so far. + """ + copy_metadata_files(dist_path, version) + + try: + os.remove(os.path.join(dist_path, appimage_filename)) # Ensure any old file is removed, if it exists. + except FileNotFoundError: + pass # If it didn't exist, that's even better. + + generate_appimage(dist_path, appimage_filename) + + sign_appimage(dist_path, appimage_filename) + +def copy_metadata_files(dist_path, version): + """ + Copy metadata files for the metadata of the AppImage. + """ + copied_files = { + os.path.join("..", "icons", "cura-icon_256x256.png"): "cura-icon.png", + "cura.appdata.xml": "cura.appdata.xml", + "AppRun": "AppRun" + } + + packaging_dir = os.path.dirname(__file__) + for source, dest in copied_files.items(): + print("Copying", os.path.join(packaging_dir, source), "to", os.path.join(dist_path, dest)) + shutil.copyfile(os.path.join(packaging_dir, source), os.path.join(dist_path, dest)) + + # Ensure that AppRun has the proper permissions: 755 (user reads, writes and executes, group reads and executes, world reads and executes). + print("Changing permissions for AppRun") + os.chmod(os.path.join(dist_path, "AppRun"), stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) + + # Provision the Desktop file with the correct version number. + template_path = os.path.join(packaging_dir, "cura.desktop.jinja") + desktop_path = os.path.join(dist_path, "cura.desktop") + print("Provisioning desktop file from", template_path, "to", desktop_path) + with open(template_path, "r") as f: + desktop_file = Template(f.read()) + with open(desktop_path, "w") as f: + f.write(desktop_file.render(cura_version = version)) + +def generate_appimage(dist_path, appimage_filename): + appimage_path = os.path.join(dist_path, "..", appimage_filename) + appimagetool = os.getenv("APPIMAGETOOL_LOCATION", "appimagetool") + command = [appimagetool, "--appimage-extract-and-run", f"{dist_path}/", appimage_path] + result = subprocess.call(command) + if result != 0: + raise RuntimeError(f"The AppImageTool command returned non-zero: {result}") + +def sign_appimage(dist_path, appimage_filename): + appimage_path = os.path.join(dist_path, "..", appimage_filename) + command = ["gpg", "--yes", "--armor", "--detach-sig", appimage_path] + result = subprocess.call(command) + if result != 0: + raise RuntimeError(f"The GPG command returned non-zero: {result}") + +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')") + 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 new file mode 100644 index 0000000000..de940af939 --- /dev/null +++ b/packaging/AppImage/cura.appdata.xml @@ -0,0 +1,18 @@ + + + com.ultimaker.cura + CC0-1.0 + LGPL-3.0 + 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.

+
+ https://ultimaker.com/en/software/ultimaker-cura + + + Print preparation screen + https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png + + +
diff --git a/packaging/AppImage/cura.desktop.jinja b/packaging/AppImage/cura.desktop.jinja new file mode 100644 index 0000000000..1026d10cb0 --- /dev/null +++ b/packaging/AppImage/cura.desktop.jinja @@ -0,0 +1,15 @@ +[Desktop Entry] +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 +Icon=cura-icon +Terminal=false +Type=Application +MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip; +Categories=Graphics; +Keywords=3D;Printing; +X-AppImage-Version={{ cura_version }} diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja new file mode 100644 index 0000000000..9a51b81110 --- /dev/null +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -0,0 +1,194 @@ +# 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 }}" +!define COMP_NAME "{{ company }}" +!define WEB_SITE "{{ web_site }}" +!define VERSION "{{ version }}" +!define VIVERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.0" +!define COPYRIGHT "Copyright (c) {{ year }} {{ company }}" +!define DESCRIPTION "Application" +!define LICENSE_TXT "{{ cura_license_file }}" +!define INSTALLER_NAME "{{ destination }}" +!define MAIN_APP_EXE "{{ main_app }}" +!define INSTALL_TYPE "SetShellVarContext all" +!define REG_ROOT "HKCR" +!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}" +!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" + +!define REG_START_MENU "Start Menu Folder" + +;Require administrator access +RequestExecutionLevel admin + +var SM_Folder + +###################################################################### + +VIProductVersion "${VIVERSION}" +VIAddVersionKey "ProductName" "{{ app_name }}" +VIAddVersionKey "CompanyName" "${COMP_NAME}" +VIAddVersionKey "LegalCopyright" "${COPYRIGHT}" +VIAddVersionKey "FileDescription" "${DESCRIPTION}" +VIAddVersionKey "FileVersion" "${VIVERSION}" + +###################################################################### + +SetCompressor {{ compression_method }} +Name "${APP_NAME}" +Caption "${APP_NAME}" +OutFile "${INSTALLER_NAME}" +BrandingText "${APP_NAME}" +InstallDir "$PROGRAMFILES64\${APP_NAME}" + +###################################################################### + +!include "MUI2.nsh" +!include fileassoc.nsh + +!define MUI_ABORTWARNING +!define MUI_UNABORTWARNING + +!define MUI_ICON "{{ cura_icon }}" + +!define MUI_WELCOMEFINISHPAGE_BITMAP "{{ cura_banner_img }}" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "{{ cura_banner_img }}" + +!insertmacro MUI_PAGE_WELCOME + +!ifdef LICENSE_TXT +!insertmacro MUI_PAGE_LICENSE "${LICENSE_TXT}" +!endif + +!insertmacro MUI_PAGE_DIRECTORY + +!ifdef REG_START_MENU +!define MUI_STARTMENUPAGE_NODISABLE +!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}" +!insertmacro MUI_PAGE_STARTMENU Application $SM_Folder +!endif + +!insertmacro MUI_PAGE_INSTFILES + +# Set up explorer to run Cura instead of directly, so it's not executed elevated (with all negative consequences that brings for an unelevated user). +!define MUI_FINISHPAGE_RUN "$WINDIR\explorer.exe" +!define MUI_FINISHPAGE_RUN_PARAMETERS "$INSTDIR\${MAIN_APP_EXE}" +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_CONFIRM + +!insertmacro MUI_UNPAGE_INSTFILES + +!insertmacro MUI_UNPAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" + +###################################################################### + +Section -MainProgram +${INSTALL_TYPE} +SetOverwrite ifnewer +{% for out_path, files in mapped_out_paths.items() %}SetOutPath "{{ out_path }}"{% for file in files %} +File "{{ file[0] }}"{% endfor %} +{% endfor %}SectionEnd + +###################################################################### + +Section -Extension_Reg +!insertmacro APP_ASSOCIATE "stl" "Cura.model" "Standard Tessellation Language (STL) files" "$INSTDIR\${MAIN_APP_EXE},0" "Open with {{ app_name }}" "$INSTDIR\${MAIN_APP_EXE} $\"%1$\"" +!insertmacro APP_ASSOCIATE "3mf" "Cura.project" "3D Manufacturing Format (3MF) files" "$INSTDIR\${MAIN_APP_EXE},0" "Open with {{ app_name }}" "$INSTDIR\${MAIN_APP_EXE} $\"%1$\"" +SectionEnd + +Section -Icons_Reg +SetOutPath "$INSTDIR" +WriteUninstaller "$INSTDIR\uninstall.exe" + +!ifdef REG_START_MENU +!insertmacro MUI_STARTMENU_WRITE_BEGIN Application +CreateDirectory "$SMPROGRAMS\$SM_Folder" +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" +!endif +!insertmacro MUI_STARTMENU_WRITE_END +!endif + +!ifndef REG_START_MENU +CreateDirectory "$SMPROGRAMS\{{ app_name }}" +CreateShortCut "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}" +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" +!endif +!endif + +WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" + +!ifdef WEB_SITE +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "${WEB_SITE}" +!endif +SectionEnd + +###################################################################### + +Section Uninstall +${INSTALL_TYPE}{% for files in mapped_out_paths.values() %}{% for file in files %} +Delete "{{ file[1] }}"{% endfor %}{% endfor %}{% for rem_dir in rmdir_paths %} +RmDir "{{ rem_dir }}"{% endfor %} + +# FIXME: dirty solution, but for some reason these directories aren't removed +RmDir "$INSTDIR\share\cura\resources\scripts" +RmDir "$INSTDIR\share\cura\resources" +RmDir "$INSTDIR\share\cura" +RmDir "$INSTDIR\share\uranium\resources\scripts" +RmDir "$INSTDIR\share\uranium\resources" +RmDir "$INSTDIR\share\uranium" +RmDir "$INSTDIR\share" + +Delete "$INSTDIR\uninstall.exe" +!ifdef WEB_SITE +Delete "$INSTDIR\${APP_NAME} website.url" +!endif + +RmDir "$INSTDIR" + +!ifdef REG_START_MENU +!insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder +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" +!endif +RmDir "$SMPROGRAMS\$SM_Folder" +!endif + +!ifndef REG_START_MENU +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" +!endif +RmDir "$SMPROGRAMS\{{ app_name }}" +!endif + +!insertmacro APP_UNASSOCIATE "stl" "Cura.model" +!insertmacro APP_UNASSOCIATE "3mf" "Cura.project" + +DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}" +DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" +SectionEnd + +###################################################################### diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py new file mode 100644 index 0000000000..c8d28c82a4 --- /dev/null +++ b/packaging/NSIS/create_windows_installer.py @@ -0,0 +1,80 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import os +import argparse # Command line arguments parsing and help. +import subprocess + +import shutil +from datetime import datetime + +from pathlib import Path + +from jinja2 import Template + + +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()] + 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))] + else: + 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(): + for _, rmdir_p in rmdir_f: + for rmdir in rmdir_p.parents: + rmdir_paths.add(rmdir) + + rmdir_paths = sorted(list(rmdir_paths), reverse = True)[:-2] # Removes the `.` and `..` from the list + + jinja_template_path = Path(source_loc.joinpath("packaging", "NSIS", "Ultimaker-Cura.nsi.jinja")) + with open(jinja_template_path, "r") as f: + template = Template(f.read()) + + + nsis_content = template.render( + 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.", + web_site = "https://ultimaker.com", + year = datetime.now().year, + cura_license_file = str(source_loc.joinpath("packaging", "cura_license.txt")), + compression_method = "LZMA", # ZLIB, BZIP2 or LZMA + cura_banner_img = str(source_loc.joinpath("packaging", "NSIS", "cura_banner_nsis.bmp")), + cura_icon = str(source_loc.joinpath("packaging", "icons", "Cura.ico")), + mapped_out_paths = mapped_out_paths, + rmdir_paths = rmdir_paths, + destination = filename + ) + + 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")) + + +def build(dist_path: str): + dist_loc = Path(os.getcwd(), dist_path) + command = ["makensis", "/V2", "/P4", str(dist_loc.joinpath("Ultimaker-Cura.nsi"))] + subprocess.run(command) + + +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')") + 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 new file mode 100644 index 0000000000..8643510664 Binary files /dev/null and b/packaging/NSIS/cura_banner_nsis.bmp differ diff --git a/packaging/NSIS/fileassoc.nsh b/packaging/NSIS/fileassoc.nsh new file mode 100644 index 0000000000..cb0fb2fe65 --- /dev/null +++ b/packaging/NSIS/fileassoc.nsh @@ -0,0 +1,134 @@ +; fileassoc.nsh +; File association helper macros +; Written by Saivert +; +; Improved by Nikku. +; +; Features automatic backup system and UPDATEFILEASSOC macro for +; shell change notification. +; +; |> How to use <| +; To associate a file with an application so you can double-click it in explorer, use +; the APP_ASSOCIATE macro like this: +; +; Example: +; !insertmacro APP_ASSOCIATE "txt" "myapp.textfile" "Description of txt files" \ +; "$INSTDIR\myapp.exe,0" "Open with myapp" "$INSTDIR\myapp.exe $\"%1$\"" +; +; Never insert the APP_ASSOCIATE macro multiple times, it is only ment +; to associate an application with a single file and using the +; the "open" verb as default. To add more verbs (actions) to a file +; use the APP_ASSOCIATE_ADDVERB macro. +; +; Example: +; !insertmacro APP_ASSOCIATE_ADDVERB "myapp.textfile" "edit" "Edit with myapp" \ +; "$INSTDIR\myapp.exe /edit $\"%1$\"" +; +; To have access to more options when registering the file association use the +; APP_ASSOCIATE_EX macro. Here you can specify the verb and what verb is to be the +; standard action (default verb). +; +; Note, that this script takes into account user versus global installs. +; To properly work you must initialize the SHELL_CONTEXT variable via SetShellVarContext. +; +; And finally: To remove the association from the registry use the APP_UNASSOCIATE +; macro. Here is another example just to wrap it up: +; !insertmacro APP_UNASSOCIATE "txt" "myapp.textfile" +; +; |> Note <| +; When defining your file class string always use the short form of your application title +; then a period (dot) and the type of file. This keeps the file class sort of unique. +; Examples: +; Winamp.Playlist +; NSIS.Script +; Photoshop.JPEGFile +; +; |> Tech info <| +; The registry key layout for a global file association is: +; +; HKEY_LOCAL_MACHINE\Software\Classes +; <".ext"> = +; = <"description"> +; shell +; = <"menu-item text"> +; command = <"command string"> +; +; +; The registry key layout for a per-user file association is: +; +; HKEY_CURRENT_USER\Software\Classes +; <".ext"> = +; = <"description"> +; shell +; = <"menu-item text"> +; command = <"command string"> +; + +!macro APP_ASSOCIATE EXT FILECLASS DESCRIPTION ICON COMMANDTEXT COMMAND + ; Backup the previously associated file class + ReadRegStr $R0 SHELL_CONTEXT "Software\Classes\.${EXT}" "" + WriteRegStr SHELL_CONTEXT "Software\Classes\.${EXT}" "${FILECLASS}_backup" "$R0" + + WriteRegStr SHELL_CONTEXT "Software\Classes\.${EXT}" "" "${FILECLASS}" + + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}" "" `${DESCRIPTION}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\DefaultIcon" "" `${ICON}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell" "" "open" + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell\open" "" `${COMMANDTEXT}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell\open\command" "" `${COMMAND}` +!macroend + +!macro APP_ASSOCIATE_EX EXT FILECLASS DESCRIPTION ICON VERB DEFAULTVERB SHELLNEW COMMANDTEXT COMMAND + ; Backup the previously associated file class + ReadRegStr $R0 SHELL_CONTEXT "Software\Classes\.${EXT}" "" + WriteRegStr SHELL_CONTEXT "Software\Classes\.${EXT}" "${FILECLASS}_backup" "$R0" + + WriteRegStr SHELL_CONTEXT "Software\Classes\.${EXT}" "" "${FILECLASS}" + StrCmp "${SHELLNEW}" "0" +2 + WriteRegStr SHELL_CONTEXT "Software\Classes\.${EXT}\ShellNew" "NullFile" "" + + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}" "" `${DESCRIPTION}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\DefaultIcon" "" `${ICON}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell" "" `${DEFAULTVERB}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell\${VERB}" "" `${COMMANDTEXT}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell\${VERB}\command" "" `${COMMAND}` +!macroend + +!macro APP_ASSOCIATE_ADDVERB FILECLASS VERB COMMANDTEXT COMMAND + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell\${VERB}" "" `${COMMANDTEXT}` + WriteRegStr SHELL_CONTEXT "Software\Classes\${FILECLASS}\shell\${VERB}\command" "" `${COMMAND}` +!macroend + +!macro APP_ASSOCIATE_REMOVEVERB FILECLASS VERB + DeleteRegKey SHELL_CONTEXT `Software\Classes\${FILECLASS}\shell\${VERB}` +!macroend + + +!macro APP_UNASSOCIATE EXT FILECLASS + ; Backup the previously associated file class + ReadRegStr $R0 SHELL_CONTEXT "Software\Classes\.${EXT}" `${FILECLASS}_backup` + WriteRegStr SHELL_CONTEXT "Software\Classes\.${EXT}" "" "$R0" + + DeleteRegKey SHELL_CONTEXT `Software\Classes\${FILECLASS}` +!macroend + +!macro APP_ASSOCIATE_GETFILECLASS OUTPUT EXT + ReadRegStr ${OUTPUT} SHELL_CONTEXT "Software\Classes\.${EXT}" "" +!macroend + + +; !defines for use with SHChangeNotify +!ifdef SHCNE_ASSOCCHANGED +!undef SHCNE_ASSOCCHANGED +!endif +!define SHCNE_ASSOCCHANGED 0x08000000 +!ifdef SHCNF_FLUSH +!undef SHCNF_FLUSH +!endif +!define SHCNF_FLUSH 0x1000 + +!macro UPDATEFILEASSOC +; Using the system.dll plugin to call the SHChangeNotify Win32 API function so we +; can update the shell. + System::Call "shell32::SHChangeNotify(i,i,i,i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_FLUSH}, 0, 0)" +!macroend \ No newline at end of file diff --git a/packaging/cura_license.txt b/packaging/cura_license.txt new file mode 100644 index 0000000000..07b1d92c0e --- /dev/null +++ b/packaging/cura_license.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/packaging/dmg/cura.entitlements b/packaging/dmg/cura.entitlements new file mode 100644 index 0000000000..3b95f077c9 --- /dev/null +++ b/packaging/dmg/cura.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.cs.disable-executable-page-protection + + com.apple.security.cs.disable-library-validation + + + diff --git a/packaging/dmg/cura_background_dmg.png b/packaging/dmg/cura_background_dmg.png new file mode 100644 index 0000000000..e838608293 Binary files /dev/null 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 new file mode 100644 index 0000000000..8baf58e43c --- /dev/null +++ b/packaging/dmg/dmg_sign_noterize.py @@ -0,0 +1,67 @@ +import os +import argparse # Command line arguments parsing and help. +import subprocess + +ULTIMAKER_CURA_DOMAIN = os.environ.get("ULTIMAKER_CURA_DOMAIN", "nl.ultimaker.cura") + + +def build_dmg(source_path: str, dist_path: str, filename: str) -> None: + create_dmg_executable = os.environ.get("CREATE_DMG_EXECUTABLE", "create-dmg") + + arguments = [create_dmg_executable, + "--window-pos", "640", "360", + "--window-size", "690", "503", + "--app-drop-link", "520", "272", + "--volicon", f"{source_path}/packaging/icons/VolumeIcons_Cura.icns", + "--icon-size", "90", + "--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"] + + subprocess.run(arguments) + + +def sign(dist_path: str, filename: str) -> None: + codesign_executable = os.environ.get("CODESIGN", "codesign") + codesign_identity = os.environ.get("CODESIGN_IDENTITY") + + arguments = [codesign_executable, + "-s", codesign_identity, + "--timestamp", + "-i", f"{ULTIMAKER_CURA_DOMAIN}.dmg", # TODO: check if this really should have the extra dmg. We seem to be doing this also in the old Rundeck scripts + f"{dist_path}/{filename}"] + + subprocess.run(arguments) + + +def notarize(dist_path: str, filename: str) -> None: + notarize_user = os.environ.get("MAC_NOTARIZE_USER") + notarize_password = os.environ.get("MAC_NOTARIZE_PASS") + altool_executable = os.environ.get("ALTOOL_EXECUTABLE", "altool") + + arguments = [ + "xcrun", altool_executable, + "--notarize-app", + "--primary-bundle-id", ULTIMAKER_CURA_DOMAIN, + "--username", notarize_user, + "--password", notarize_password, + "--file", f"{dist_path}/{filename}" + ] + + subprocess.run(arguments) + + +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')") + args = parser.parse_args() + build_dmg(args.source_path, args.dist_path, args.filename) + sign(args.dist_path, args.filename) + + notarize_dmg = bool(os.environ.get("NOTARIZE_DMG", "TRUE")) + if notarize_dmg: + notarize(args.dist_path, args.filename) diff --git a/icons/cura.ico b/packaging/icons/Cura.ico similarity index 100% rename from icons/cura.ico rename to packaging/icons/Cura.ico diff --git a/packaging/icons/VolumeIcons_Cura.icns b/packaging/icons/VolumeIcons_Cura.icns new file mode 100644 index 0000000000..6ea4526293 Binary files /dev/null and b/packaging/icons/VolumeIcons_Cura.icns differ diff --git a/icons/cura-128.png b/packaging/icons/cura-128.png similarity index 100% rename from icons/cura-128.png rename to packaging/icons/cura-128.png diff --git a/icons/cura-32.png b/packaging/icons/cura-32.png similarity index 100% rename from icons/cura-32.png rename to packaging/icons/cura-32.png diff --git a/icons/cura-48.png b/packaging/icons/cura-48.png similarity index 100% rename from icons/cura-48.png rename to packaging/icons/cura-48.png diff --git a/icons/cura-64.png b/packaging/icons/cura-64.png similarity index 100% rename from icons/cura-64.png rename to packaging/icons/cura-64.png diff --git a/packaging/icons/cura-icon_128x128.png b/packaging/icons/cura-icon_128x128.png new file mode 100644 index 0000000000..7f70fe330e Binary files /dev/null and b/packaging/icons/cura-icon_128x128.png differ diff --git a/packaging/icons/cura-icon_256x256.png b/packaging/icons/cura-icon_256x256.png new file mode 100644 index 0000000000..a9ddbd94c4 Binary files /dev/null and b/packaging/icons/cura-icon_256x256.png differ diff --git a/packaging/icons/cura-icon_64x64.png b/packaging/icons/cura-icon_64x64.png new file mode 100644 index 0000000000..5bfbf782ce Binary files /dev/null and b/packaging/icons/cura-icon_64x64.png differ diff --git a/packaging/icons/cura.icns b/packaging/icons/cura.icns new file mode 100644 index 0000000000..8e8e09b389 Binary files /dev/null and b/packaging/icons/cura.icns differ diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index d0250abfd8..4899c6873a 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -17,6 +17,7 @@ UM.Dialog 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 @@ -486,7 +487,7 @@ UM.Dialog UM.Label { id: warningText - text: "The material used in this project is currently not installed in Cura.
Install the material profile and reopen the project." + text: catalog.i18nc("@label", "The material used in this project is currently not installed in Cura.
Install the material profile and reopen the project.") } } diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index c507703823..57c667145e 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -12,6 +12,8 @@ from UM.Application import Application from UM.Message import Message from UM.Resources import Resources from UM.Scene.SceneNode import SceneNode +from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.EmptyInstanceContainer import EmptyInstanceContainer from cura.CuraApplication import CuraApplication from cura.CuraPackageManager import CuraPackageManager @@ -268,6 +270,10 @@ class ThreeMFWriter(MeshWriter): # Don't export materials not in use continue + if isinstance(extruder.material, type(ContainerRegistry.getInstance().getEmptyInstanceContainer())): + # This is an empty material container, no material to export + continue + if package_manager.isMaterialBundled(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")): # Don't export bundled materials continue @@ -275,14 +281,9 @@ class ThreeMFWriter(MeshWriter): package_id = package_manager.getMaterialFilePackageId(extruder.material.getFileName(), extruder.material.getMetaDataEntry("GUID")) package_data = package_manager.getInstalledPackageInfo(package_id) + # We failed to find the package for this material if not package_data: - # We failed to find the package for this material - - message = Message(catalog.i18nc("@error:material", - "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems.".format(material=extruder.getName())), - title=catalog.i18nc("@info:title", "Failed to save material package information"), - message_type=Message.MessageType.WARNING) - message.show() + Logger.info(f"Could not find package for material in extruder {extruder.id}, skipping.") continue material_metadata = {"id": package_id, diff --git a/plugins/CuraEngineBackend/Cura.proto b/plugins/CuraEngineBackend/Cura.proto index 2eabe62366..b420a6ecc2 100644 --- a/plugins/CuraEngineBackend/Cura.proto +++ b/plugins/CuraEngineBackend/Cura.proto @@ -139,5 +139,9 @@ message GCodePrefix { bytes data = 2; //Header string to be prepended before the rest of the g-code sent from the engine. } +message SliceUUID { + string slice_uuid = 1; //The UUID of the slice. +} + message SlicingFinished { } diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 18088a99c6..db27f8a6a3 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -124,6 +124,7 @@ class CuraEngineBackend(QObject, Backend): self._message_handlers["cura.proto.Progress"] = self._onProgressMessage self._message_handlers["cura.proto.GCodeLayer"] = self._onGCodeLayerMessage self._message_handlers["cura.proto.GCodePrefix"] = self._onGCodePrefixMessage + self._message_handlers["cura.proto.SliceUUID"] = self._onSliceUUIDMessage self._message_handlers["cura.proto.PrintTimeMaterialEstimates"] = self._onPrintTimeMaterialEstimates self._message_handlers["cura.proto.SlicingFinished"] = self._onSlicingFinishedMessage @@ -812,6 +813,10 @@ class CuraEngineBackend(QObject, Backend): except KeyError: # Can occur if the g-code has been cleared while a slice message is still arriving from the other end. pass # Throw the message away. + def _onSliceUUIDMessage(self, message: Arcus.PythonMessage) -> None: + application = CuraApplication.getInstance() + application.getPrintInformation().slice_uuid = message.slice_uuid + def _createSocket(self, protocol_file: str = None) -> None: """Creates a new socket connection.""" diff --git a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py index de09ea2a09..13c65f79c4 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py @@ -71,8 +71,6 @@ class DigitalFactoryApiClient: has_access = response.library_max_private_projects == -1 or response.library_max_private_projects > 0 callback(has_access) self._library_max_private_projects = response.library_max_private_projects - # update the account with the additional user rights - self._account.updateAdditionalRight(df_access = has_access) else: Logger.warning(f"Digital Factory: Response is not a feature budget, likely an error: {str(response)}") callback(False) diff --git a/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py b/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py index a511a11bd5..bef90e5125 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py @@ -1,11 +1,14 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from datetime import datetime from typing import Optional, List, Dict, Any from .BaseModel import BaseModel from .DigitalFactoryFileResponse import DIGITAL_FACTORY_RESPONSE_DATETIME_FORMAT +from UM.i18n import i18nCatalog +catalog = i18nCatalog("cura") class DigitalFactoryProjectResponse(BaseModel): """Class representing a cloud project.""" @@ -13,8 +16,8 @@ class DigitalFactoryProjectResponse(BaseModel): def __init__(self, library_project_id: str, display_name: str, - username: str, - organization_shared: bool, + username: str = catalog.i18nc("@text Placeholder for the username if it has been deleted", "deleted user"), + organization_shared: bool = False, last_updated: Optional[str] = None, created_at: Optional[str] = None, thumbnail_url: Optional[str] = None, diff --git a/plugins/ModelChecker/model_checker.svg b/plugins/ModelChecker/model_checker.svg index ce9594302e..e63e082e27 100644 --- a/plugins/ModelChecker/model_checker.svg +++ b/plugins/ModelChecker/model_checker.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index c252f13c68..a80f304aaa 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -19,7 +19,7 @@ UM.Dialog height: 500 * screenScaleFactor minimumWidth: 400 * screenScaleFactor minimumHeight: 250 * screenScaleFactor - + backgroundColor: UM.Theme.getColor("main_background") onVisibleChanged: { // Whenever the window is closed (either via the "Close" button or the X on the window frame), we want to update it in the stack. @@ -286,6 +286,7 @@ UM.Dialog { id: definitionsModel containerId: manager.selectedScriptDefinitionId + onContainerIdChanged: definitionsModel.setAllVisible(true) showAll: true } diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py index 924563d305..8d35f68822 100644 --- a/plugins/PostProcessingPlugin/scripts/Stretch.py +++ b/plugins/PostProcessingPlugin/scripts/Stretch.py @@ -432,7 +432,7 @@ class Stretcher: """ dist_palp = self.line_width # Palpation distance to seek for a wall mrot = np.array([[0, -1], [1, 0]]) # Rotation matrix for a quarter turn - for i in range(len(orig_seq)): + for i, _ in enumerate(orig_seq): ibeg = i # Index of the first point of the segment iend = i + 1 # Index of the last point of the segment if iend == len(orig_seq): diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 0bf76f8423..0c9a2e35f4 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -133,6 +133,7 @@ class SliceInfo(QObject, Extension): data["is_logged_in"] = self._application.getCuraAPI().account.isLoggedIn data["organization_id"] = org_id if org_id else None data["subscriptions"] = user_profile.get("subscriptions", []) if user_profile else [] + data["slice_uuid"] = print_information.slice_uuid active_mode = self._application.getPreferences().getValue("cura/active_mode") if active_mode == 0: diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index 85a9f554ff..75cc48b55c 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -9,6 +9,7 @@ Using Custom Settings: No
Is Logged In: Yes
Organization ID (if any): ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=
+ Slice ID: aBcDeF01-2345-6789-aBcD-eF0123456789
Subscriptions (if any):
  • Level: 10, Type: Enterprise, Plan: Basic
  • diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml index 03e9477d08..33fdb0eb38 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml @@ -13,10 +13,98 @@ import Cura 1.6 as Cura */ Item { + id: monitorContextMenu property alias target: popUp.target property var printJob: null + //Everything in the pop-up only gets evaluated when showing the pop-up. + //However we want to show the button for showing the pop-up only if there is anything visible inside it. + //So compute here the visibility of the menu items, so that we can use it for the visibility of the button. + property bool sendToTopVisible: + { + if (printJob && printJob.state in ("queued", "error") && !isAssigned(printJob)) { + if (OutputDevice && OutputDevice.queuedPrintJobs[0] && OutputDevice.canWriteOthersPrintJobs) { + return OutputDevice.queuedPrintJobs[0].key != printJob.key; + } + } + return false; + } + + property bool deleteVisible: + { + if(!printJob) + { + return false; + } + if(printJob.isMine) + { + if(!OutputDevice.canWriteOwnPrintJobs) + { + return false; + } + } + else + { + if(!OutputDevice.canWriteOthersPrintJobs) + { + return false; + } + } + var states = ["queued", "error", "sent_to_printer"]; + return states.indexOf(printJob.state) !== -1; + } + + property bool pauseVisible: + { + if(!printJob) + { + return false; + } + if(printJob.isMine) + { + if(!OutputDevice.canWriteOwnPrintJobs) + { + return false; + } + } + else + { + if(!OutputDevice.canWriteOthersPrintJobs) + { + return false; + } + } + var states = ["printing", "pausing", "paused", "resuming"]; + return states.indexOf(printJob.state) !== -1; + } + + property bool abortVisible: + { + if(!printJob) + { + return false; + } + if(printJob.isMine) + { + if(!OutputDevice.canWriteOwnPrintJobs) + { + return false; + } + } + else + { + if(!OutputDevice.canWriteOthersPrintJobs) + { + return false; + } + } + var states = ["pre_print", "printing", "pausing", "paused", "resuming"]; + return states.indexOf(printJob.state) !== -1; + } + + property bool hasItems: sendToTopVisible || deleteVisible || pauseVisible || abortVisible + GenericPopUp { id: popUp @@ -46,56 +134,54 @@ Item spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2) - PrintJobContextMenuItem { - onClicked: { + PrintJobContextMenuItem + { + onClicked: + { sendToTopConfirmationDialog.visible = true; popUp.close(); } text: catalog.i18nc("@label", "Move to top"); - visible: { - if (printJob && (printJob.state == "queued" || printJob.state == "error") && !isAssigned(printJob)) { - if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { - return OutputDevice.queuedPrintJobs[0].key != printJob.key; - } - } - return false; - } + visible: monitorContextMenu.sendToTopVisible } - PrintJobContextMenuItem { - onClicked: { + PrintJobContextMenuItem + { + onClicked: + { deleteConfirmationDialog.visible = true; popUp.close(); } text: catalog.i18nc("@label", "Delete"); - visible: { - if (!printJob) { - return false; - } - var states = ["queued", "error", "sent_to_printer"]; - return states.indexOf(printJob.state) !== -1; - } + visible: monitorContextMenu.deleteVisible } - PrintJobContextMenuItem { + PrintJobContextMenuItem + { enabled: visible && !(printJob.state == "pausing" || printJob.state == "resuming"); - onClicked: { - if (printJob.state == "paused") { + onClicked: + { + if (printJob.state == "paused") + { printJob.setState("resume"); popUp.close(); return; } - if (printJob.state == "printing") { + if (printJob.state == "printing") + { printJob.setState("pause"); popUp.close(); return; } } - text: { - if (!printJob) { + text: + { + if(!printJob) + { return ""; } - switch(printJob.state) { + switch(printJob.state) + { case "paused": return catalog.i18nc("@label", "Resume"); case "pausing": @@ -106,29 +192,19 @@ Item catalog.i18nc("@label", "Pause"); } } - visible: { - if (!printJob) { - return false; - } - var states = ["printing", "pausing", "paused", "resuming"]; - return states.indexOf(printJob.state) !== -1; - } + visible: monitorContextMenu.pauseVisible } - PrintJobContextMenuItem { + PrintJobContextMenuItem + { enabled: visible && printJob.state !== "aborting"; - onClicked: { + onClicked: + { abortConfirmationDialog.visible = true; popUp.close(); } text: printJob && printJob.state == "aborting" ? catalog.i18nc("@label", "Aborting...") : catalog.i18nc("@label", "Abort"); - visible: { - if (!printJob) { - return false; - } - var states = ["pre_print", "printing", "pausing", "paused", "resuming"]; - return states.indexOf(printJob.state) !== -1; - } + visible: monitorContextMenu.abortVisible } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index 2974e5ce6b..64aa4e7a9c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -206,7 +206,11 @@ Item onClicked: enabled ? contextMenu.switchPopupState() : {} visible: { - if (!printJob) + if(!printJob) + { + return false; + } + if(!contextMenu.hasItems) { return false; } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 0069d017f6..67f308a64e 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -209,8 +209,13 @@ Item onClicked: enabled ? contextMenu.switchPopupState() : {} visible: { - if (!printer || !printer.activePrintJob) { - return false + if(!printer || !printer.activePrintJob) + { + return false; + } + if(!contextMenu.hasItems) + { + return false; } var states = ["queued", "error", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"] return states.indexOf(printer.activePrintJob.state) !== -1 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 3fd500cfca..d559e99cc1 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -39,6 +39,7 @@ Item } height: 18 * screenScaleFactor // TODO: Theme! width: childrenRect.width + visible: OutputDevice.canReadPrinterDetails UM.ColorImage { diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index 9e73662e1d..6e8f6b4ebd 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -69,7 +69,7 @@ Component top: printers.bottom topMargin: 48 * screenScaleFactor // TODO: Theme! } - visible: OutputDevice.supportsPrintJobQueue + visible: OutputDevice.supportsPrintJobQueue && OutputDevice.canReadPrintJobs } PrinterVideoStream diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 8c45ce537f..6431d09b7b 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from time import time @@ -96,6 +96,8 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): # Trigger the printersChanged signal when the private signal is triggered. self.printersChanged.connect(self._cloudClusterPrintersChanged) + # Trigger the permissionsChanged signal when the account's permissions change. + self._account.permissionsChanged.connect(self.permissionsChanged) # Keep server string of the last generated time to avoid updating models more than once for the same response self._received_printers = None # type: Optional[List[ClusterPrinterStatus]] @@ -340,6 +342,37 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): def openPrinterControlPanel(self) -> None: QDesktopServices.openUrl(QUrl(self.clusterCloudUrl + "?utm_source=cura&utm_medium=software&utm_campaign=monitor-manage-printer")) + permissionsChanged = pyqtSignal() + + @pyqtProperty(bool, notify = permissionsChanged) + def canReadPrintJobs(self) -> bool: + """ + Whether this user can read the list of print jobs and their properties. + """ + return "digital-factory.print-job.read" in self._account.permissions + + @pyqtProperty(bool, notify = permissionsChanged) + def canWriteOthersPrintJobs(self) -> bool: + """ + Whether this user can change things about print jobs made by other + people. + """ + return "digital-factory.print-job.write" in self._account.permissions + + @pyqtProperty(bool, notify = permissionsChanged) + def canWriteOwnPrintJobs(self) -> bool: + """ + Whether this user can change things about print jobs made by themself. + """ + return "digital-factory.print-job.write.own" in self._account.permissions + + @pyqtProperty(bool, constant = True) + def canReadPrinterDetails(self) -> bool: + """ + Whether this user can read the status of the printer. + """ + return "digital-factory.printer.read" in self._account.permissions + @property def clusterData(self) -> CloudClusterResponse: """Gets the cluster response from which this device was created.""" diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index f7f659124c..30bbf68f6c 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -400,11 +400,13 @@ class CloudOutputDeviceManager: # We do not use use MachineManager.addMachine here because we need to set the cluster ID before activating it. new_machine = CuraStackBuilder.createMachine(device.name, device.printerType, show_warning_message=False) if not new_machine: - Logger.log("e", "Failed creating a new machine") + Logger.error(f"Failed creating a new machine for {device.name}") return False self._setOutputDeviceMetadata(device, new_machine) + _abstract_machine = CuraStackBuilder.createAbstractMachine(device.printerType) + if activate: CuraApplication.getInstance().getMachineManager().setActiveMachine(new_machine.getId()) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py index 2d27b7c3be..f5afb0b14e 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2020 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os from typing import Optional, Dict, List, Callable, Any diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py index 0cd5304cf9..bddd383b23 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -232,6 +232,9 @@ class LocalClusterOutputDeviceManager: self._connectToOutputDevice(device, new_machine) self._showCloudFlowMessage(device) + _abstract_machine = CuraStackBuilder.createAbstractMachine(device.printerType) + + def _storeManualAddress(self, address: str) -> None: """Add an address to the stored preferences.""" diff --git a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py index 769e92610a..8f25df37db 100644 --- a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py @@ -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 os from time import time @@ -184,6 +184,42 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): def forceSendJob(self, print_job_uuid: str) -> None: raise NotImplementedError("forceSendJob must be implemented") + @pyqtProperty(bool, constant = True) + def supportsPrintJobQueue(self) -> bool: + """ + Whether this printer knows about queueing print jobs. + """ + return True # This API always supports print job queueing. + + @pyqtProperty(bool, constant = True) + def canReadPrintJobs(self) -> bool: + """ + Whether this user can read the list of print jobs and their properties. + """ + return True + + @pyqtProperty(bool, constant = True) + def canWriteOthersPrintJobs(self) -> bool: + """ + Whether this user can change things about print jobs made by other + people. + """ + return True + + @pyqtProperty(bool, constant = True) + def canWriteOwnPrintJobs(self) -> bool: + """ + Whether this user can change things about print jobs made by themself. + """ + return True + + @pyqtProperty(bool, constant = True) + def canReadPrinterDetails(self) -> bool: + """ + Whether this user can read the status of the printer. + """ + return True + @pyqtSlot(name="openPrintJobControlPanel") def openPrintJobControlPanel(self) -> None: raise NotImplementedError("openPrintJobControlPanel must be implemented") diff --git a/plugins/X3DReader/X3DReader.py b/plugins/X3DReader/X3DReader.py index 548c9f44e6..0b41578a05 100644 --- a/plugins/X3DReader/X3DReader.py +++ b/plugins/X3DReader/X3DReader.py @@ -134,7 +134,7 @@ class X3DReader(MeshReader): geometry = self.resolveDefUse(sub_node) # TODO: appearance is completely ignored. At least apply the material color... - if not geometry is None: + if geometry is not None: try: self.verts = self.faces = [] # Safeguard self.geometry_importers[geometry.tag](self, geometry) @@ -493,12 +493,12 @@ class X3DReader(MeshReader): # Columns are the unit vectors for the xz plane for the cross-section if orient: mrot = orient[i] if len(orient) > 1 else orient[0] - if not mrot is None: + if mrot is not None: m = m.dot(mrot) # Tested against X3DOM, the result matches, still not sure :( if scale: mscale = scale[i] if len(scale) > 1 else scale[0] - if not mscale is None: + if mscale is not None: m = m.dot(mscale) # First the cross-section 2-vector is scaled, @@ -703,7 +703,7 @@ class X3DReader(MeshReader): for c in node: if c.tag == "Coordinate": c = self.resolveDefUse(c) - if not c is None: + if c is not None: pt = c.attrib.get("point") if pt: # allow the list of float values in 'point' attribute to diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index d7d11a1f44..527fa4ec13 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -152,12 +152,15 @@ class XmlMaterialProfile(InstanceContainer): ## Begin Metadata Block builder.start("metadata", {}) # type: ignore - metadata = copy.deepcopy(self.getMetaData()) + + # Get the to reserialize keys from the metadata before they are deleted. + reserialize_settings = copy.deepcopy(metadata["reserialize_settings"]) + # setting_version is derived from the "version" tag in the schema, so don't serialize it into a file if ignored_metadata_keys is None: ignored_metadata_keys = set() - ignored_metadata_keys |= {"setting_version", "definition", "status", "variant", "type", "base_file", "approximate_diameter", "id", "container_type", "name", "compatible"} + ignored_metadata_keys |= {"setting_version", "definition", "status", "variant", "type", "base_file", "approximate_diameter", "id", "container_type", "name", "compatible", "reserialize_settings"} # remove the keys that we want to ignore in the metadata for key in ignored_metadata_keys: if key in metadata: @@ -304,6 +307,12 @@ class XmlMaterialProfile(InstanceContainer): buildplate_dict["buildplate_recommended"] = material_container.getMetaDataEntry("buildplate_recommended") buildplate_dict["material_container"] = material_container + hotend_reserialize_settings = material_container.getMetaDataEntry("reserialize_settings") + for key, value in hotend_reserialize_settings.items(): + builder.start("setting", {"key": key}) + builder.data(value) + builder.end("setting") + builder.end("hotend") if buildplate_dict: @@ -325,10 +334,27 @@ class XmlMaterialProfile(InstanceContainer): builder.data("yes" if recommended else "no") builder.end("setting") + buildplate_reserialize_settings = material_container.getMetaDataEntry("reserialize_settings") + for key, value in buildplate_reserialize_settings.items(): + builder.start("setting", {"key": key}) + builder.data(value) + builder.end("setting") + builder.end("buildplate") + machine_reserialize_settings = container.getMetaDataEntry("reserialize_settings") + for key, value in machine_reserialize_settings.items(): + builder.start("setting", {"key": key}) + builder.data(value) + builder.end("setting") + builder.end("machine") + for key, value in reserialize_settings.items(): + builder.start("setting", {"key": key}) + builder.data(value) + builder.end("setting") + builder.end("settings") ## End Settings Block @@ -512,6 +538,7 @@ class XmlMaterialProfile(InstanceContainer): meta_data["status"] = "unknown" # TODO: Add material verification meta_data["id"] = old_id meta_data["container_type"] = XmlMaterialProfile + meta_data["reserialize_settings"] = {} common_setting_values = {} @@ -598,6 +625,8 @@ class XmlMaterialProfile(InstanceContainer): elif key in self.__unmapped_settings: if key == "hardware compatible": common_compatibility = self._parseCompatibleValue(entry.text) + elif key in self.__keep_serialized_settings: + meta_data["reserialize_settings"][key] = entry.text # Add namespaced Cura-specific settings settings = data.iterfind("./um:settings/cura:setting", self.__namespaces) @@ -624,6 +653,7 @@ class XmlMaterialProfile(InstanceContainer): machine_compatibility = common_compatibility machine_setting_values = {} settings = machine.iterfind("./um:setting", self.__namespaces) + machine_reserialize_settings = {} for entry in settings: key = entry.get("key") if key in self.__material_settings_setting_map: @@ -640,6 +670,8 @@ class XmlMaterialProfile(InstanceContainer): elif key in self.__unmapped_settings: if key == "hardware compatible": machine_compatibility = self._parseCompatibleValue(entry.text) + elif key in self.__keep_serialized_settings: + machine_reserialize_settings[key] = entry.text else: Logger.log("d", "Unsupported material setting %s", key) @@ -694,6 +726,7 @@ class XmlMaterialProfile(InstanceContainer): new_material.getMetaData()["compatible"] = machine_compatibility new_material.getMetaData()["machine_manufacturer"] = machine_manufacturer new_material.getMetaData()["definition"] = machine_id + new_material.getMetaData()["reserialize_settings"] = machine_reserialize_settings new_material.setCachedValues(cached_machine_setting_properties) @@ -709,7 +742,7 @@ class XmlMaterialProfile(InstanceContainer): if hotend_name is None: continue - hotend_mapped_settings, hotend_unmapped_settings = self._getSettingsDictForNode(hotend) + hotend_mapped_settings, hotend_unmapped_settings, hotend_reserialize_settings = self._getSettingsDictForNode(hotend) hotend_compatibility = hotend_unmapped_settings.get("hardware compatible", machine_compatibility) # Generate container ID for the hotend-specific material container @@ -732,6 +765,7 @@ class XmlMaterialProfile(InstanceContainer): new_hotend_material.getMetaData()["compatible"] = hotend_compatibility new_hotend_material.getMetaData()["machine_manufacturer"] = machine_manufacturer new_hotend_material.getMetaData()["definition"] = machine_id + new_hotend_material.getMetaData()["reserialize_settings"] = hotend_reserialize_settings cached_hotend_setting_properties = cached_machine_setting_properties.copy() cached_hotend_setting_properties.update(hotend_mapped_settings) @@ -753,9 +787,10 @@ class XmlMaterialProfile(InstanceContainer): ContainerRegistry.getInstance().addContainer(container_to_add) @classmethod - def _getSettingsDictForNode(cls, node) -> Tuple[Dict[str, Any], Dict[str, Any]]: - node_mapped_settings_dict = dict() # type: Dict[str, Any] - node_unmapped_settings_dict = dict() # type: Dict[str, Any] + def _getSettingsDictForNode(cls, node) -> Tuple[Dict[str, Any], Dict[str, Any], Dict[str, Any]]: + node_mapped_settings_dict: Dict[str, Any] = dict() + node_unmapped_settings_dict: Dict[str, Any] = dict() + node_reserialize_settings_dict: Dict[str, Any] = dict() # Fetch settings in the "um" namespace um_settings = node.iterfind("./um:setting", cls.__namespaces) @@ -781,6 +816,10 @@ class XmlMaterialProfile(InstanceContainer): if setting_key in ("hardware compatible", "hardware recommended"): node_unmapped_settings_dict[setting_key] = cls._parseCompatibleValue(um_setting_entry.text) + # Settings unused by Cura itself, but which need reserialization since they might be important to others. + elif setting_key in cls.__keep_serialized_settings: + node_reserialize_settings_dict[setting_key] = um_setting_entry.text + # Unknown settings else: Logger.log("w", "Unsupported material setting %s", setting_key) @@ -798,7 +837,7 @@ class XmlMaterialProfile(InstanceContainer): # Cura settings are all mapped node_mapped_settings_dict[key] = value - return node_mapped_settings_dict, node_unmapped_settings_dict + return node_mapped_settings_dict, node_unmapped_settings_dict, node_reserialize_settings_dict @classmethod def deserializeMetadata(cls, serialized: str, container_id: str) -> List[Dict[str, Any]]: @@ -988,7 +1027,7 @@ class XmlMaterialProfile(InstanceContainer): if buildplate_name is None: continue - buildplate_mapped_settings, buildplate_unmapped_settings = cls._getSettingsDictForNode(buildplate) + buildplate_mapped_settings, buildplate_unmapped_settings, buildplate_reserialize_settings = cls._getSettingsDictForNode(buildplate) buildplate_compatibility = buildplate_unmapped_settings.get("hardware compatible", buildplate_map["buildplate_compatible"]) buildplate_recommended = buildplate_unmapped_settings.get("hardware recommended", @@ -1005,6 +1044,7 @@ class XmlMaterialProfile(InstanceContainer): new_hotend_and_buildplate_material_metadata["compatible"] = buildplate_compatibility new_hotend_and_buildplate_material_metadata["buildplate_compatible"] = buildplate_compatibility new_hotend_and_buildplate_material_metadata["buildplate_recommended"] = buildplate_recommended + new_hotend_and_buildplate_material_metadata["reserialize_settings"] = buildplate_reserialize_settings result_metadata.append(new_hotend_and_buildplate_material_metadata) @@ -1145,6 +1185,29 @@ class XmlMaterialProfile(InstanceContainer): "hardware compatible", "hardware recommended" ] + __keep_serialized_settings = { # Settings irrelevant to Cura, but that could be present in the files so we must store them and keep them serialized. + "relative extrusion", + "flow sensor detection margin", + "different material purge volume", + "same material purge volume", + "end of print purge volume", + "end of filament purge volume", + "purge anti ooze retract position", + "purge drop retract position", + "purge retract speed", + "purge unretract speed", + "purge anti ooze dwell time", + "purge drop dwell time", + "dwell time before break preparation move", + "pressure release dwell time", + "tainted print core max temperature", + "recommend cleaning after n prints", + "maximum heated bed temperature", + "material bed adhesion temperature", + "maximum heated chamber temperature", + "shrinkage percentage", + "move to die distance", + } __material_properties_setting_map = { "diameter": "material_diameter" } diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000000..819943e8b7 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,5 @@ +pytest +pyinstaller +pyinstaller-hooks-contrib +sip==6.5.1 +jinja2 diff --git a/requirements-ultimaker.txt b/requirements-ultimaker.txt new file mode 100644 index 0000000000..ae158516f2 --- /dev/null +++ b/requirements-ultimaker.txt @@ -0,0 +1 @@ +git+https://github.com/ultimaker/libcharon@master#egg=charon diff --git a/requirements.txt b/requirements.txt index dc14e2e041..c8bb861814 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,36 +1,240 @@ -appdirs==1.4.3 -certifi==2019.11.28 -cffi==1.14.1 -chardet==3.0.4 -colorlog -cryptography==3.4.8 -decorator==4.4.0 -idna==2.8 -importlib-metadata==4.10.0 -keyring==23.0.1 -lxml==4.7.1 -mypy==0.740 -netifaces==0.10.9 -networkx==2.6.2 -numpy==1.21.5 -numpy-stl==2.10.1 -packaging==18.0 -pyclipper==1.3.0.post2 -pycollada==0.6 -pycparser==2.20 -pyparsing==2.4.2 -PyQt5==5.15.6 -PyQt5-sip==12.9.0 -pyserial==3.4 -pytest -python-dateutil==2.8.0 -python-utils==2.3.0 -pywin32==303 -scipy==1.8.0rc2 -sentry-sdk==0.13.5 -six==1.12.0 -trimesh==3.9.36 -twisted==21.2.0 -typing -urllib3==1.25.9 -zeroconf==0.31.0 +### Direct requirements for Uranium and libCharon ### +PyQt6-sip==13.2.1 \ + --hash=sha256:b7bce59900b2e0a04f70246de2ccf79ee7933036b6b9183cf039b62eeae2b858 \ + --hash=sha256:8b52d42e42e6e9f934ac7528cd154ac0210a532bb33fa1edfb4a8bbfb73ff88b \ + --hash=sha256:0314d011633bc697e99f3f9897b484720e81a5f4ba0eaa5f05c5811e2e74ea53 \ + --hash=sha256:226e9e349aa16dc1132f106ca01fa99cf7cb8e59daee29304c2fea5fa33212ec +PyQt6==6.2.3 \ + --hash=sha256:a9bfcac198fe4b703706f809bb686c7cef5f60a7c802fc145c6b57929c7a6a34 \ + --hash=sha256:11c039b07962b29246de2da0912f4f663786185fd74d48daac7a270a43c8d92a \ + --hash=sha256:8a2f357b86fec8598f52f16d5f93416931017ca1986d5f68679c9565bfc21fff \ + --hash=sha256:577334c9d4518022a4cb6f9799dfbd1b996167eb31404b5a63d6c43d603e6418 +PyQt6-Qt6==6.2.4 \ + --hash=sha256:42c37475a50ec7e06e0445ac9ce39465f69a86af407ad9b28b183da178d401ee \ + --hash=sha256:b68543e5d5a4f5d24c26b517569da3cd30b0fbe75390b841e142c160399b3c0a \ + --hash=sha256:0aa93581b92e01deaf2dcaad88ed6718996a6d84de59ee88316bcba143f008c9 \ + --hash=sha256:48bc5b7400d6bca13d8c0a145f82295a6da317952ee1a3f107f1cd7d078c8140 +PyQt6-NetworkAuth==6.2.0 \ + --hash=sha256:23e730cc0d6b828bec2f92d9fac3607871e6033a8af4620e5d4e3afc13bd6c3c \ + --hash=sha256:b85ee25b01d6cb38d6141df0052b96de2df7f6e69066eaddb22ae238f56be40b \ + --hash=sha256:e637781a00dd2032d0fd2025af09274898335033763e1dc765a5a99348f60c3b \ + --hash=sha256:542e9d9a8a5bb78e1f26fa3d35ee01f45209bcf5a35b0cc367aaa85932c29750 +PyQt6-NetworkAuth-Qt6==6.2.4 \ + --hash=sha256:c7996a9d8c4ce024529ec37981fbfd525ab1a2d497af1281f81f2b6054452d2e \ + --hash=sha256:1ae9e08e03bd9d5ebdb42dfaccf484a9cc62eeea7504621fe42c005ff1745e66 \ + --hash=sha256:8ed4e5e0eaaa42a6f91aba6745eea23fb3ffcbddc6b162016936530ed28dd0ad +PyQt6-sip==13.2.1 \ + --hash=sha256:b7bce59900b2e0a04f70246de2ccf79ee7933036b6b9183cf039b62eeae2b858 \ + --hash=sha256:8b52d42e42e6e9f934ac7528cd154ac0210a532bb33fa1edfb4a8bbfb73ff88b \ + --hash=sha256:0314d011633bc697e99f3f9897b484720e81a5f4ba0eaa5f05c5811e2e74ea53 \ + --hash=sha256:226e9e349aa16dc1132f106ca01fa99cf7cb8e59daee29304c2fea5fa33212ec +certifi==2021.10.8 \ + --hash=sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 \ + --hash=sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569 +cryptography==3.4.8; \ + --hash=sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14 \ + --hash=sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc \ + --hash=sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b +zeroconf==0.31.0 \ + --hash=sha256:53a180248471c6f81bd1fffcbce03ed93d7d8eaf10905c9121ac1ea996d19844 \ + --hash=sha256:5a468da018bc3f04bbce77ae247924d802df7aeb4c291bbbb5a9616d128800b0 +importlib-metadata==4.10.0 \ + --hash=sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 \ + --hash=sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 +keyring==23.0.1 \ + --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ + --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 + +# Use Numpy wheel that is compiled with Intel optimizations (MKL). Obtained from https://www.lfd.uci.edu/~gohlke/pythonlibs/#numpy +# We cache this at software.ultimaker.com since this website tends to remove older versions rather quickly. +https://software.ultimaker.com/cura-binary-dependencies/numpy-1.21.5+mkl-cp310-cp310-win_amd64.whl; \ + sys_platform=="win32" \ + --hash=sha256:fbd5d5126b730a151134d21994a951fe28df06464e0c9a2cba2a4132e542a5fc +numpy==1.21.5; \ + sys_platform!="win32" \ + --hash=sha256:301e408a052fdcda5cdcf03021ebafc3c6ea093021bf9d1aa47c54d48bdad166 \ + --hash=sha256:a7e8f6216f180f3fd4efb73de5d1eaefb5f5a1ee5b645c67333033e39440e63a \ + --hash=sha256:fc7a7d7b0ed72589fd8b8486b9b42a564f10b8762be8bd4d9df94b807af4a089 \ + --hash=sha256:58ca1d7c8aef6e996112d0ce873ac9dfa1eaf4a1196b4ff7ff73880a09923ba7 \ + --hash=sha256:dc4b2fb01f1b4ddbe2453468ea0719f4dbb1f5caa712c8b21bb3dd1480cd30d9 \ + --hash=sha256:6a5928bc6241264dce5ed509e66f33676fc97f464e7a919edc672fb5532221ee +pyclipper==1.3.0.post2; \ + --hash=sha256:c096703dc32f2e4700a1f7054e8b58c29fe86212fa7a2c2adecb0102cb639fb2 \ + --hash=sha256:a1525051ced1ab74e8d32282299c24c68f3e31cd4b64e0b368720b5da65aad67 \ + --hash=sha256:5960aaa012cb925ef44ecabe69528809564a3c95ceac874d95c6600f207138d3 \ + --hash=sha256:d3954330c02a19f7566651a909ec4bc5733ba6c62a228ab26db4a90305748430 \ + --hash=sha256:5175ee50772a7dcc0feaab19ccf5b979b6066f4753edb330700231cf70d0c918 \ + --hash=sha256:19a6809d9cbd535d0fe922e9315babb8d70b5c7dcd43e0f89740d09c406b40f8 \ + --hash=sha256:5c5d50498e335d7f969ca5ad5886e77c40088521dcabab4feb2f93727140251e +scipy==1.8.1; \ + --hash=sha256:9e3fb1b0e896f14a85aa9a28d5f755daaeeb54c897b746df7a55ccb02b340f33 \ + --hash=sha256:4e53a55f6a4f22de01ffe1d2f016e30adedb67a699a310cdcac312806807ca81 \ + --hash=sha256:a0aa8220b89b2e3748a2836fbfa116194378910f1a6e78e4675a095bcd2c762d \ + --hash=sha256:02b567e722d62bddd4ac253dafb01ce7ed8742cf8031aea030a41414b86c1125 \ + --hash=sha256:65b77f20202599c51eb2771d11a6b899b97989159b7975e9b5259594f1d35ef4 \ + --hash=sha256:9dd4012ac599a1e7eb63c114d1eee1bcfc6dc75a29b589ff0ad0bb3d9412034f \ + --hash=sha256:70de2f11bf64ca9921fda018864c78af7147025e467ce9f4a11bc877266900a6 \ + --hash=sha256:83606129247e7610b58d0e1e93d2c5133959e9cf93555d3c27e536892f1ba1f2 \ + --hash=sha256:f3e7a8867f307e3359cc0ed2c63b61a1e33a19080f92fe377bc7d49f646f2ec1 +trimesh==3.9.36 \ + --hash=sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e \ + --hash=sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 +sentry-sdk==0.13.5 \ + --hash=sha256:05285942901d38c7ce2498aba50d8e87b361fc603281a5902dda98f3f8c5e145 \ + --hash=sha256:c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82 +mypy==0.931 \ + --hash=sha256:0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce \ + --hash=sha256:1171f2e0859cfff2d366da2c7092b06130f232c636a3f7301e3feb8b41f6377d \ + --hash=sha256:1b06268df7eb53a8feea99cbfff77a6e2b205e70bf31743e786678ef87ee8069 \ + --hash=sha256:1b65714dc296a7991000b6ee59a35b3f550e0073411ac9d3202f6516621ba66c \ + --hash=sha256:1bf752559797c897cdd2c65f7b60c2b6969ffe458417b8d947b8340cc9cec08d \ + --hash=sha256:300717a07ad09525401a508ef5d105e6b56646f7942eb92715a1c8d610149714 \ + --hash=sha256:3c5b42d0815e15518b1f0990cff7a705805961613e701db60387e6fb663fe78a \ + --hash=sha256:4365c60266b95a3f216a3047f1d8e3f895da6c7402e9e1ddfab96393122cc58d \ + --hash=sha256:50c7346a46dc76a4ed88f3277d4959de8a2bd0a0fa47fa87a4cde36fe247ac05 \ + --hash=sha256:5b56154f8c09427bae082b32275a21f500b24d93c88d69a5e82f3978018a0266 \ + --hash=sha256:74f7eccbfd436abe9c352ad9fb65872cc0f1f0a868e9d9c44db0893440f0c697 \ + --hash=sha256:7b3f6f557ba4afc7f2ce6d3215d5db279bcf120b3cfd0add20a5d4f4abdae5bc \ + --hash=sha256:8c11003aaeaf7cc2d0f1bc101c1cc9454ec4cc9cb825aef3cafff8a5fdf4c799 \ + --hash=sha256:8ca7f8c4b1584d63c9a0f827c37ba7a47226c19a23a753d52e5b5eddb201afcd \ + --hash=sha256:c89702cac5b302f0c5d33b172d2b55b5df2bede3344a2fbed99ff96bddb2cf00 \ + --hash=sha256:d8f1ff62f7a879c9fe5917b3f9eb93a79b78aad47b533911b853a757223f72e7 \ + --hash=sha256:d9d2b84b2007cea426e327d2483238f040c49405a6bf4074f605f0156c91a47a \ + --hash=sha256:e839191b8da5b4e5d805f940537efcaa13ea5dd98418f06dc585d2891d228cf0 \ + --hash=sha256:f9fe20d0872b26c4bba1c1be02c5340de1019530302cf2dcc85c7f9fc3252ae0 \ + --hash=sha256:ff3bf387c14c805ab1388185dd22d6b210824e164d4bb324b195ff34e322d166 +pyserial==3.4 \ + --hash=sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 \ + --hash=sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8 + +### Indirect requirements ### +chardet==3.0.4 \ + --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ + --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 +idna==2.8 \ + --hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \ + --hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c +attrs==21.2.0 \ + --hash=sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1 \ + --hash=sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb +requests==2.22.0 \ + --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \ + --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 +# twisted +Twisted==21.2.0 \ + --hash=sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 \ + --hash=sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e +constantly==15.1.0 \ + --hash=sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 \ + --hash=sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d +hyperlink==21.0.0 \ + --hash=sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b \ + --hash=sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4 +incremental==21.3.0 \ + --hash=sha256:02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57 \ + --hash=sha256:92014aebc6a20b78a8084cdd5645eeaa7f74b8933f70fa3ada2cfbd1e3b54321 +zope.interface==5.4.0 \ + --hash=sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3 \ + --hash=sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54 \ + --hash=sha256:5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e \ + --hash=sha256:bf68f4b2b6683e52bec69273562df15af352e5ed25d1b6641e7efddc5951d1a7 \ + --hash=sha256:db1fa631737dab9fa0b37f3979d8d2631e348c3b4e8325d6873c2541d0ae5a48 \ + --hash=sha256:f44e517131a98f7a76696a7b21b164bcb85291cee106a23beccce454e1f433a4 +Automat==20.2.0 \ + --hash=sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 \ + --hash=sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111 +twisted-iocpsupport==1.0.2; \ + sys_platform=="win32" \ + --hash=sha256:306becd6e22ab6e8e4f36b6bdafd9c92e867c98a5ce517b27fdd27760ee7ae41 \ + --hash=sha256:3c61742cb0bc6c1ac117a7e5f422c129832f0c295af49e01d8a6066df8cfc04d \ + --hash=sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 \ + --hash=sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf \ + --hash=sha256:81b3abe3527b367da0220482820cb12a16c661672b7bcfcde328902890d63323 \ + --hash=sha256:851b3735ca7e8102e661872390e3bce88f8901bece95c25a0c8bb9ecb8a23d32 \ + --hash=sha256:985c06a33f5c0dae92c71a036d1ea63872ee86a21dd9b01e1f287486f15524b4 \ + --hash=sha256:9dbb8823b49f06d4de52721b47de4d3b3026064ef4788ce62b1a21c57c3fff6f \ + --hash=sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 \ + --hash=sha256:b76b4eed9b27fd63ddb0877efdd2d15835fdcb6baa745cb85b66e5d016ac2878 \ + --hash=sha256:b9fed67cf0f951573f06d560ac2f10f2a4bbdc6697770113a2fc396ea2cb2565 \ + --hash=sha256:bf4133139d77fc706d8f572e6b7d82871d82ec7ef25d685c2351bdacfb701415 +numpy-stl==2.10.1 \ + --hash=sha256:f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c +python-utils==2.3.0 \ + --hash=sha256:34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3 \ + --hash=sha256:e25f840564554eaded56eaa395bca507b0b9e9f0ae5ecb13a8cb785305c56d25 +six==1.12.0 \ + --hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c \ + --hash=sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 +shapely==1.8.2 \ + --hash=sha256:572af9d5006fd5e3213e37ee548912b0341fb26724d6dc8a4e3950c10197ebb6 \ + --hash=sha256:c60f3758212ec480675b820b13035dda8af8f7cc560d2cc67999b2717fb8faef \ + --hash=sha256:6bdc7728f1e5df430d8c588661f79f1eed4a2728c8b689e12707cfec217f68f8 \ + --hash=sha256:ce0b5c5f7acbccf98b3460eecaa40e9b18272b2a734f74fcddf1d7696e047e95 \ + --hash=sha256:7c9e3400b716c51ba43eea1678c28272580114e009b6c78cdd00c44df3e325fa \ + --hash=sha256:3423299254deec075e79fb7dc7909d702104e4167149de7f45510c3a6342eeea \ + --hash=sha256:3423299254deec075e79fb7dc7909d702104e4167149de7f45510c3a6342eeea \ + --hash=sha256:44d2832c1b706bf43101fda92831a083467cc4b4923a7ed17319ab599c1025d8 \ + --hash=sha256:44d2832c1b706bf43101fda92831a083467cc4b4923a7ed17319ab599c1025d8 \ + --hash=sha256:75042e8039c79dd01f102bb288beace9dc2f49fc44a2dea875f9b697aa8cd30d \ + --hash=sha256:75042e8039c79dd01f102bb288beace9dc2f49fc44a2dea875f9b697aa8cd30d \ + --hash=sha256:5254240eefc44139ab0d128faf671635d8bdd9c23955ee063d4d6b8f20073ae0 +cython==0.29.26 \ + --hash=sha256:af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 \ + --hash=sha256:f5e15ff892c8afad64931ee3dd723c4755c2c516606f9aae7613bebfac62b0f6 \ + --hash=sha256:2b834ff6e4d10ba6d7a0d676dd71c1b427a181ddbbbbf79e91d1861557aab59f \ + --hash=sha256:c813799d533194b7d85203d881d8b4f567a8c644a67f50d47f1ffbf316df412f \ + --hash=sha256:6773cce9d4b3b6168d8feb2b6f06b658ef1e11cbfec075041745666d8e2a5e45 \ + --hash=sha256:362fbb9cb4627c7786231429768b54aaba5459a2a0e46c25e59f202ca6155437 +pybind11==2.6.2 \ + --hash=sha256:2d8aebe1709bc367e34e3b23d8eccbf3f387ee9d5640548c6260d33b59f02405 \ + --hash=sha256:d0e0aed9279656f21501243b707eb6e3b951e89e10c3271dedf3ae41c365e5ed +wheel==0.37.1 \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a +setuptools==62.0.0 \ + --hash=sha256:7999cbd87f1b6e1f33bf47efa368b224bed5e27b5ef2c4d46580186cbcb1a86a \ + --hash=sha256:a65e3802053e99fc64c6b3b29c11132943d5b8c8facbcc461157511546510967 +ifaddr==0.1.7 \ + --hash=sha256:1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 \ + --hash=sha256:d1f603952f0a71c9ab4e705754511e4e03b02565bc4cec7188ad6415ff534cd3 +pycparser==2.20 \ + --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 +zipp==3.5.0 \ + --hash=sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 \ + --hash=sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 +cffi==1.15.0 \ + --hash=sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 \ + --hash=sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 \ + --hash=sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 \ + --hash=sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 +urllib3==1.25.9 \ + --hash=sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 \ + --hash=sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 +mypy-extensions==0.4.3 \ + --hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \ + --hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8 +tomli==2.0.1 \ + --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ + --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f +typing-extensions==3.10.0.2 \ + --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e \ + --hash=sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34 +jeepney==0.7.1; \ + --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ + --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f +SecretStorage==3.3.1 \ + --hash=sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f \ + --hash=sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195 +keyring==23.0.1 \ + --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ + --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 +pywin32==303; \ + sys_platform=="win32" \ + --hash=sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 +pywin32-ctypes==0.2.0; \ + sys_platform=="win32" \ + --hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \ + --hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 + +charset-normalizer==2.1.0; \ + --hash=sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 6ec6d5a7b9..df89a0e2d1 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -6,7 +6,7 @@ "display_name": "3MF Reader", "description": "Provides support for reading 3MF files.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -23,7 +23,7 @@ "display_name": "3MF Writer", "description": "Provides support for writing 3MF files.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -40,7 +40,7 @@ "display_name": "AMF Reader", "description": "Provides support for reading AMF files.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -57,7 +57,7 @@ "display_name": "Cura Backups", "description": "Backup and restore your configuration.", "package_version": "1.2.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -74,7 +74,7 @@ "display_name": "CuraEngine Backend", "description": "Provides the link to the CuraEngine slicing backend.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -91,7 +91,7 @@ "display_name": "Cura Profile Reader", "description": "Provides support for importing Cura profiles.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -108,7 +108,7 @@ "display_name": "Cura Profile Writer", "description": "Provides support for exporting Cura profiles.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -125,7 +125,7 @@ "display_name": "Ultimaker Digital Library", "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.", "package_version": "1.1.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -142,7 +142,7 @@ "display_name": "Firmware Update Checker", "description": "Checks for firmware updates.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -159,7 +159,7 @@ "display_name": "Firmware Updater", "description": "Provides a machine actions for updating firmware.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -176,7 +176,7 @@ "display_name": "Compressed G-code Reader", "description": "Reads g-code from a compressed archive.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -193,7 +193,7 @@ "display_name": "Compressed G-code Writer", "description": "Writes g-code to a compressed archive.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -210,7 +210,7 @@ "display_name": "G-Code Profile Reader", "description": "Provides support for importing profiles from g-code files.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -227,7 +227,7 @@ "display_name": "G-Code Reader", "description": "Allows loading and displaying G-code files.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "VictorLarchenko", @@ -244,7 +244,7 @@ "display_name": "G-Code Writer", "description": "Writes g-code to a file.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -261,7 +261,7 @@ "display_name": "Image Reader", "description": "Enables ability to generate printable geometry from 2D image files.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -278,7 +278,7 @@ "display_name": "Legacy Cura Profile Reader", "description": "Provides support for importing profiles from legacy Cura versions.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -295,7 +295,7 @@ "display_name": "Machine Settings Action", "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -312,7 +312,7 @@ "display_name": "Model Checker", "description": "Checks models and print configuration for possible printing issues and give suggestions.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -329,7 +329,7 @@ "display_name": "Monitor Stage", "description": "Provides a monitor stage in Cura.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -346,7 +346,7 @@ "display_name": "Per-Object Settings Tool", "description": "Provides the per-model settings.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -363,7 +363,7 @@ "display_name": "Post Processing", "description": "Extension that allows for user created scripts for post processing.", "package_version": "2.2.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -380,7 +380,7 @@ "display_name": "Prepare Stage", "description": "Provides a prepare stage in Cura.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -397,7 +397,7 @@ "display_name": "Preview Stage", "description": "Provides a preview stage in Cura.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -414,7 +414,7 @@ "display_name": "Removable Drive Output Device", "description": "Provides removable drive hotplugging and writing support.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -431,7 +431,7 @@ "display_name": "Sentry Logger", "description": "Logs certain events so that they can be used by the crash reporter", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -448,7 +448,7 @@ "display_name": "Simulation View", "description": "Provides the Simulation view.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -465,7 +465,7 @@ "display_name": "Slice Info", "description": "Submits anonymous slice info. Can be disabled through preferences.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -482,7 +482,7 @@ "display_name": "Solid View", "description": "Provides a normal solid mesh view.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -499,7 +499,7 @@ "display_name": "Support Eraser Tool", "description": "Creates an eraser mesh to block the printing of support in certain places.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -516,7 +516,7 @@ "display_name": "Trimesh Reader", "description": "Provides support for reading model files.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -533,7 +533,7 @@ "display_name": "Marketplace", "description": "Find, manage and install new Cura packages.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -550,7 +550,7 @@ "display_name": "UFP Reader", "description": "Provides support for reading Ultimaker Format Packages.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -567,7 +567,7 @@ "display_name": "UFP Writer", "description": "Provides support for writing Ultimaker Format Packages.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -584,7 +584,7 @@ "display_name": "Ultimaker Machine Actions", "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -601,7 +601,7 @@ "display_name": "UM3 Network Printing", "description": "Manages network connections to Ultimaker 3 printers.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -618,7 +618,7 @@ "display_name": "USB Printing", "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.", "package_version": "1.0.2", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -635,7 +635,7 @@ "display_name": "Version Upgrade 2.1 to 2.2", "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -652,7 +652,7 @@ "display_name": "Version Upgrade 2.2 to 2.4", "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -669,7 +669,7 @@ "display_name": "Version Upgrade 2.5 to 2.6", "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -686,7 +686,7 @@ "display_name": "Version Upgrade 2.6 to 2.7", "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -703,7 +703,7 @@ "display_name": "Version Upgrade 2.7 to 3.0", "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -720,7 +720,7 @@ "display_name": "Version Upgrade 3.0 to 3.1", "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -737,7 +737,7 @@ "display_name": "Version Upgrade 3.2 to 3.3", "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -754,7 +754,7 @@ "display_name": "Version Upgrade 3.3 to 3.4", "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -771,7 +771,7 @@ "display_name": "Version Upgrade 3.4 to 3.5", "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -788,7 +788,7 @@ "display_name": "Version Upgrade 3.5 to 4.0", "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -805,7 +805,7 @@ "display_name": "Version Upgrade 4.0 to 4.1", "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -822,7 +822,7 @@ "display_name": "Version Upgrade 4.1 to 4.2", "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -839,7 +839,7 @@ "display_name": "Version Upgrade 4.2 to 4.3", "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -856,7 +856,7 @@ "display_name": "Version Upgrade 4.3 to 4.4", "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -873,7 +873,7 @@ "display_name": "Version Upgrade 4.4 to 4.5", "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -890,7 +890,7 @@ "display_name": "Version Upgrade 4.5 to 4.6", "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -907,7 +907,7 @@ "display_name": "Version Upgrade 4.6.0 to 4.6.2", "description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -924,7 +924,7 @@ "display_name": "Version Upgrade 4.6.2 to 4.7", "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -941,7 +941,7 @@ "display_name": "Version Upgrade 4.7.0 to 4.8.0", "description": "Upgrades configurations from Cura 4.7.0 to Cura 4.8.0", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -958,7 +958,7 @@ "display_name": "Version Upgrade 4.8.0 to 4.9.0", "description": "Upgrades configurations from Cura 4.8.0 to Cura 4.9.0", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -975,7 +975,7 @@ "display_name": "Version Upgrade 4.9 to 4.10", "description": "Upgrades configurations from Cura 4.9 to Cura 4.10", "package_version": "1.0.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -1010,7 +1010,7 @@ "display_name": "X3D Reader", "description": "Provides support for reading X3D files.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "SevaAlekseyev", @@ -1027,7 +1027,7 @@ "display_name": "XML Material Profiles", "description": "Provides capabilities to read and write XML-based material profiles.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -1044,7 +1044,7 @@ "display_name": "X-Ray View", "description": "Provides the X-Ray view.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -1061,7 +1061,7 @@ "display_name": "Generic ABS", "description": "The generic ABS profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1079,7 +1079,7 @@ "display_name": "Generic BAM", "description": "The generic BAM profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1097,7 +1097,7 @@ "display_name": "Generic CFF CPE", "description": "The generic CFF CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1115,7 +1115,7 @@ "display_name": "Generic CFF PA", "description": "The generic CFF PA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1133,7 +1133,7 @@ "display_name": "Generic CPE", "description": "The generic CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1151,7 +1151,7 @@ "display_name": "Generic CPE+", "description": "The generic CPE+ profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1169,7 +1169,7 @@ "display_name": "Generic GFF CPE", "description": "The generic GFF CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1187,7 +1187,7 @@ "display_name": "Generic GFF PA", "description": "The generic GFF PA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1205,7 +1205,7 @@ "display_name": "Generic HIPS", "description": "The generic HIPS profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1223,7 +1223,7 @@ "display_name": "Generic Nylon", "description": "The generic Nylon profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1241,7 +1241,7 @@ "display_name": "Generic PC", "description": "The generic PC profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1259,7 +1259,7 @@ "display_name": "Generic PETG", "description": "The generic PETG profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1277,7 +1277,7 @@ "display_name": "Generic PLA", "description": "The generic PLA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1295,7 +1295,7 @@ "display_name": "Generic PP", "description": "The generic PP profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1313,7 +1313,7 @@ "display_name": "Generic PVA", "description": "The generic PVA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1331,7 +1331,7 @@ "display_name": "Generic Tough PLA", "description": "The generic Tough PLA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1349,7 +1349,7 @@ "display_name": "Generic TPU", "description": "The generic TPU profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1367,7 +1367,7 @@ "display_name": "Dagoma Chromatik PLA", "description": "Filament testé et approuvé pour les imprimantes 3D Dagoma. Chromatik est l'idéal pour débuter et suivre les tutoriels premiers pas. Il vous offre qualité et résistance pour chacune de vos impressions.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://dagoma.fr/boutique/filaments.html", "author": { "author_id": "Dagoma", @@ -1384,7 +1384,7 @@ "display_name": "FABtotum ABS", "description": "This material is easy to be extruded but it is not the simplest to use. It is one of the most used in 3D printing to get very well finished objects. It is not sustainable and its smoke can be dangerous if inhaled. The reason to prefer this filament to PLA is mainly because of its precision and mechanical specs. ABS (for plastic) stands for Acrylonitrile Butadiene Styrene and it is a thermoplastic which is widely used in everyday objects. It can be printed with any FFF 3D printer which can get to high temperatures as it must be extruded in a range between 220° and 245°, so it’s compatible with all versions of the FABtotum Personal fabricator.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=40", "author": { "author_id": "FABtotum", @@ -1401,7 +1401,7 @@ "display_name": "FABtotum Nylon", "description": "When 3D printing started this material was not listed among the extrudable filaments. It is flexible as well as resistant to tractions. It is well known for its uses in textile but also in industries which require a strong and flexible material. There are different kinds of Nylon: 3D printing mostly uses Nylon 6 and Nylon 6.6, which are the most common. It requires higher temperatures to be printed, so a 3D printer must be able to reach them (around 240°C): the FABtotum, of course, can.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=53", "author": { "author_id": "FABtotum", @@ -1418,7 +1418,7 @@ "display_name": "FABtotum PLA", "description": "It is the most common filament used for 3D printing. It is studied to be bio-degradable as it comes from corn starch’s sugar mainly. It is completely made of renewable sources and has no footprint on polluting. PLA stands for PolyLactic Acid and it is a thermoplastic that today is still considered the easiest material to be 3D printed. It can be extruded at lower temperatures: the standard range of FABtotum’s one is between 185° and 195°.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=39", "author": { "author_id": "FABtotum", @@ -1435,7 +1435,7 @@ "display_name": "FABtotum TPU Shore 98A", "description": "", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=66", "author": { "author_id": "FABtotum", @@ -1452,7 +1452,7 @@ "display_name": "Fiberlogy HD PLA", "description": "With our HD PLA you have many more options. You can use this material in two ways. Choose the one you like best. You can use it as a normal PLA and get prints characterized by a very good adhesion between the layers and high precision. You can also make your prints acquire similar properties to that of ABS – better impact resistance and high temperature resistance. All you need is an oven. Yes, an oven! By annealing our HD PLA in an oven, in accordance with the manual, you will avoid all the inconveniences of printing with ABS, such as unpleasant odour or hazardous fumes.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/", "author": { "author_id": "Fiberlogy", @@ -1469,7 +1469,7 @@ "display_name": "Filo3D PLA", "description": "Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://dagoma.fr", "author": { "author_id": "Dagoma", @@ -1486,7 +1486,7 @@ "display_name": "IMADE3D JellyBOX PETG", "description": "", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1503,7 +1503,7 @@ "display_name": "IMADE3D JellyBOX PLA", "description": "", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1520,7 +1520,7 @@ "display_name": "Octofiber PLA", "description": "PLA material from Octofiber.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://nl.octofiber.com/3d-printing-filament/pla.html", "author": { "author_id": "Octofiber", @@ -1537,7 +1537,7 @@ "display_name": "PolyFlex™ PLA", "description": "PolyFlex™ is a highly flexible yet easy to print 3D printing material. Featuring good elasticity and a large strain-to- failure, PolyFlex™ opens up a completely new realm of applications.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://www.polymaker.com/shop/polyflex/", "author": { "author_id": "Polymaker", @@ -1554,7 +1554,7 @@ "display_name": "PolyMax™ PLA", "description": "PolyMax™ PLA is a 3D printing material with excellent mechanical properties and printing quality. PolyMax™ PLA has an impact resistance of up to nine times that of regular PLA, and better overall mechanical properties than ABS.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://www.polymaker.com/shop/polymax/", "author": { "author_id": "Polymaker", @@ -1571,7 +1571,7 @@ "display_name": "PolyPlus™ PLA True Colour", "description": "PolyPlus™ PLA is a premium PLA designed for all desktop FDM/FFF 3D printers. It is produced with our patented Jam-Free™ technology that ensures consistent extrusion and prevents jams.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://www.polymaker.com/shop/polyplus-true-colour/", "author": { "author_id": "Polymaker", @@ -1588,7 +1588,7 @@ "display_name": "PolyWood™ PLA", "description": "PolyWood™ is a wood mimic printing material that contains no actual wood ensuring a clean Jam-Free™ printing experience.", "package_version": "1.0.1", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "http://www.polymaker.com/shop/polywood/", "author": { "author_id": "Polymaker", @@ -1605,7 +1605,7 @@ "display_name": "Ultimaker ABS", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1624,7 +1624,7 @@ "display_name": "Ultimaker Breakaway", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/breakaway", "author": { "author_id": "UltimakerPackages", @@ -1643,7 +1643,7 @@ "display_name": "Ultimaker CPE", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1662,7 +1662,7 @@ "display_name": "Ultimaker CPE+", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/cpe", "author": { "author_id": "UltimakerPackages", @@ -1681,7 +1681,7 @@ "display_name": "Ultimaker Nylon", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1700,7 +1700,7 @@ "display_name": "Ultimaker PC", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/pc", "author": { "author_id": "UltimakerPackages", @@ -1719,7 +1719,7 @@ "display_name": "Ultimaker PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1738,7 +1738,7 @@ "display_name": "Ultimaker PP", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/pp", "author": { "author_id": "UltimakerPackages", @@ -1757,7 +1757,7 @@ "display_name": "Ultimaker PVA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1776,7 +1776,7 @@ "display_name": "Ultimaker TPU 95A", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/tpu-95a", "author": { "author_id": "UltimakerPackages", @@ -1795,7 +1795,7 @@ "display_name": "Ultimaker Tough PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://ultimaker.com/products/materials/tough-pla", "author": { "author_id": "UltimakerPackages", @@ -1814,7 +1814,7 @@ "display_name": "Vertex Delta ABS", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1831,7 +1831,7 @@ "display_name": "Vertex Delta PET", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1848,7 +1848,7 @@ "display_name": "Vertex Delta PLA", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1865,7 +1865,7 @@ "display_name": "Vertex Delta TPU", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "8.0.0", + "sdk_version": "8.1.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", diff --git a/resources/definitions/alfawise_u30.def.json b/resources/definitions/alfawise_u30.def.json index 3bfc1aaa4e..b76a1773c5 100644 --- a/resources/definitions/alfawise_u30.def.json +++ b/resources/definitions/alfawise_u30.def.json @@ -40,6 +40,7 @@ "machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_z": { "default_value": 5 }, "machine_max_feedrate_e": { "default_value": 100 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, "machine_max_acceleration_x": { "default_value": 500 }, "machine_max_acceleration_y": { "default_value": 500 }, "machine_max_acceleration_z": { "default_value": 10 }, diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index bf14aed04c..2e972c78b6 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: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: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 X120 F4000 ; 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 \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 }, @@ -47,10 +47,17 @@ "machine_max_jerk_e": { "value": 5 }, "material_diameter": { "default_value": 1.75 }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5"}, + "material_print_temperature": { "maximum_value_warning": 260 }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 260 }, "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + "material_bed_temperature_layer_0": { "maximum_value_warning": 110 }, + "material_flow": { "value": 100 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" }, + "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" }, + "acceleration_print": { "value": 1500 }, "acceleration_enabled": { "value": false }, "acceleration_travel": { "value": 3000 }, @@ -71,8 +78,8 @@ "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 }, "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" }, - "speed_print_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" }, - "speed_travel_layer_0": { "value": 100.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "speed_travel" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, @@ -104,7 +111,7 @@ "travel_retract_before_outer_wall": { "value": true }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_speed": { "value": 70 }, + "cool_fan_speed": { "value": 100 }, "cool_fan_speed_0": { "value": 30 }, "cool_fan_enabled": { "value": true }, @@ -137,8 +144,6 @@ "support_interface_pattern": { "value": "'grid'" }, "support_interface_skip_height": { "value": 0.2 }, "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" }, - "wall_thickness": { "value": "line_width * 3" } + "minimum_interface_area": { "value": 10 } } } diff --git a/resources/definitions/anycubic_kobra.def.json b/resources/definitions/anycubic_kobra.def.json new file mode 100644 index 0000000000..cb80d0e248 --- /dev/null +++ b/resources/definitions/anycubic_kobra.def.json @@ -0,0 +1,54 @@ +{ + "version": 2, + "name": "Anycubic Kobra", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Jason Chen", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "has_materials": true, + "preferred_material": "generic_pla", + "has_machine_quality": true, + "quality_definition": "anycubic_kobra", + "preferred_quality_type": "pla", + "machine_extruder_trains": + { + "0": "anycubic_kobra_extruder_0" + }, + "firmware_file": "MarlinChiron.hex" + }, + + "overrides": + { + "machine_name": + { + "default_value": "Anycubic Kobra" + }, + "machine_heated_bed": + { + "default_value": true + }, + "machine_width": + { + "default_value": 222 + }, + "machine_height": + { + "default_value": 252 + }, + "machine_depth": + { + "default_value": 222 + }, + "machine_gcode_flavor": + { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": + { + "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + } + } +} diff --git a/resources/definitions/anycubic_kobra_max.def.json b/resources/definitions/anycubic_kobra_max.def.json new file mode 100644 index 0000000000..034fc3db2b --- /dev/null +++ b/resources/definitions/anycubic_kobra_max.def.json @@ -0,0 +1,54 @@ +{ + "version": 2, + "name": "Anycubic Kobra Max", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Jason Chen", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "has_materials": true, + "preferred_material": "generic_pla", + "has_machine_quality": true, + "quality_definition": "anycubic_kobra_max", + "preferred_quality_type": "pla", + "machine_extruder_trains": + { + "0": "anycubic_kobra_max_extruder_0" + }, + "firmware_file": "MarlinChiron.hex" + }, + + "overrides": + { + "machine_name": + { + "default_value": "Anycubic Kobra Max" + }, + "machine_heated_bed": + { + "default_value": true + }, + "machine_width": + { + "default_value": 402 + }, + "machine_height": + { + "default_value": 452 + }, + "machine_depth": + { + "default_value": 402 + }, + "machine_gcode_flavor": + { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": + { + "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + } + } +} diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index c10c74c52f..6b13efcb1e 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -1,5 +1,5 @@ { - "name": "Creality Ender-3", + "name": "Creality Ender-3 / Ender-3 v2", "version": 2, "inherits": "creality_base", "metadata": { diff --git a/resources/definitions/creality_ender3s1.def.json b/resources/definitions/creality_ender3s1.def.json new file mode 100644 index 0000000000..a9a052e973 --- /dev/null +++ b/resources/definitions/creality_ender3s1.def.json @@ -0,0 +1,38 @@ +{ + "name": "Creality Ender-3 S1", + "version": 2, + "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, + "overrides": { + "machine_name": { "default_value": "Creality Ender-3 S1" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 270 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 }, + + "speed_print": {"value": 50}, + "speed_layer_0": {"value": 25}, + "speed_travel": { "value": 150 }, + "retraction_amount": {"value": 0.8}, + "retraction_speed": { "default_value": 40}, + + "acceleration_enabled": {"value": true}, + "acceleration_travel": {"value": 2000}, + "retraction_extrusion_window": {"value": 1.5}, + + "machine_start_gcode": { + "default_value": "; Ender 3 S1 Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM104 S{material_print_temperature_layer_0}\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" + } + } +} diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c34216572d..4a40d1855a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1190,7 +1190,7 @@ "inside_out": "Inside To Outside", "outside_in": "Outside To Inside" }, - "default_value": "outside_in", + "default_value": "inside_out", "settable_per_mesh": true }, "alternate_extra_perimeter": @@ -1225,45 +1225,19 @@ "default_value": 0.3, "value": "min_wall_line_width", "type": "float", - "settable_per_mesh": true, - "children": - { - "wall_split_middle_threshold": { - "label": "Split Middle Line Threshold", - "description": "The smallest line width, as a factor of the normal line width, above which the middle line (if there is one) will be split into two. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.", - "type": "float", - "unit": "%", - "default_value": 50, - "value": "max(1, min(99, 100 * (2 * min_even_wall_line_width - wall_line_width_0) / wall_line_width_0))", - "minimum_value": "1", - "maximum_value": "99" - } - } + "settable_per_mesh": true }, "min_odd_wall_line_width": { "label": "Minimum Odd Wall Line Width", - "description": "The minimum line width for middle line gap filler polyline walls. This setting determines at which model thickness we switch from printing two wall lines, to printing two outer walls and a single central wall in the middle. A higher Minimum Odd Wall Line Width leads to a higher maximum even wall line width. The maximum odd wall line width is calculated as 2 * Minimum Even Wall Line Width,", + "description": "The minimum line width for middle line gap filler polyline walls. This setting determines at which model thickness we switch from printing two wall lines, to printing two outer walls and a single central wall in the middle. A higher Minimum Odd Wall Line Width leads to a higher maximum even wall line width. The maximum odd wall line width is calculated as 2 * Minimum Even Wall Line Width.", "unit": "mm", "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)", "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)", "default_value": 0.3, "value": "min_wall_line_width", "type": "float", - "settable_per_mesh": true, - "children": - { - "wall_add_middle_threshold": { - "label": "Add Middle Line Threshold", - "description": "The smallest line width, as a factor of the normal line width, above which a middle line (if there wasn't one already) will be added. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.", - "type": "float", - "unit": "%", - "default_value": 75, - "value": "max(1, min(99, 100 * min_odd_wall_line_width / wall_line_width_x))", - "minimum_value": "1", - "maximum_value": "99" - } - } + "settable_per_mesh": true } } }, @@ -4910,7 +4884,7 @@ "default_value": 0, "type": "int", "minimum_value": "0", - "maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'zigzag' or support_pattern == 'concentric') else 5", + "maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'concentric') else 5", "maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))", "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", @@ -4939,7 +4913,7 @@ "type": "float", "default_value": 0.0, "minimum_value": "0", - "maximum_value_warning": "5", + "maximum_value_warning": "10", "enabled": "(support_enable or support_meshes_present) and support_structure == 'normal'", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": true @@ -5191,7 +5165,6 @@ "type": "float", "default_value": 1.0, "minimum_value": "0", - "minimum_value_warning": "minimum_support_area", "limit_to_extruder": "support_interface_extruder_nr", "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true, @@ -5206,7 +5179,6 @@ "default_value": 1.0, "value": "extruderValue(support_roof_extruder_nr, 'minimum_interface_area')", "minimum_value": "0", - "minimum_value_warning": "minimum_support_area", "limit_to_extruder": "support_roof_extruder_nr", "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true @@ -5220,7 +5192,6 @@ "default_value": 1.0, "value": "extruderValue(support_bottom_extruder_nr, 'minimum_interface_area')", "minimum_value": "0", - "minimum_value_warning": "minimum_support_area", "limit_to_extruder": "support_bottom_extruder_nr", "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true @@ -6471,10 +6442,10 @@ "description": "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller.", "type": "float", "unit": "μm²", - "default_value": 2000, + "default_value": 50000, "minimum_value": "0", "minimum_value_warning": "500", - "maximum_value_warning": "50000", + "maximum_value_warning": "100000", "settable_per_mesh": true } } @@ -8043,7 +8014,7 @@ "description": "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing.", "type": "bool", "default_value": false, - "enabled": false, + "enabled": true, "settable_per_mesh": true, "settable_per_extruder": true }, @@ -8052,7 +8023,8 @@ "label": "Remove Raft Inside Corners", "description": "Remove inside corners from the raft, causing the raft to become convex.", "type": "bool", - "default_value": false, + "default_value": true, + "resolve": "any(extruderValues('raft_remove_inside_corners'))", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": false @@ -8064,6 +8036,7 @@ "type": "int", "default_value": 1, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "max(extruderValues('raft_base_wall_count'))", "settable_per_mesh": false, "settable_per_extruder": false } diff --git a/resources/definitions/hctech_hc300-m1&m1h.def.json b/resources/definitions/hctech_hc300-m1&m1h.def.json new file mode 100644 index 0000000000..188ed3e7e7 --- /dev/null +++ b/resources/definitions/hctech_hc300-m1&m1h.def.json @@ -0,0 +1,57 @@ +{ + "version": 2, + "name": "HCTECH_HC300-M1&M1H", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "HCTECH", + "manufacturer": "HCTECH", + "file_formats": "text/x-gcode", + "platform": "hctech_hc300-m1&m1h.3mf", + "has_machine_quality": false, + "machine_extruder_trains": { + "0": "hctech_hc300-m1&m1h_extruder_0" + } + }, + + "overrides": { + "machine_head_with_fans_polygon": { "default_value": [ + [-61, 86], + [-61, -31], + [21, -31], + [21, 86] + ] }, + "machine_name": { "default_value": "HCTECH HC300-M1&M1H" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "retraction_amount": { + "default_value": 0.3, + "maximum_value_warning": 2.0 + }, + "adhesion_type": { "default_value": "skirt" }, + "retraction_speed": { "default_value": 35}, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "retraction_enable": { "value": true }, + + "gantry_height": { "value": "55" }, + "speed_print": { "default_value": 60.0 } , + + "material_diameter": { "default_value": 1.75 }, + + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": "G1 Z2 ;Raise Z\nG28 X Y ;Home XY\nG92 E0 ;Reset Extruder\nG1 E-1 F2400 ;Retract\nG92 E0 ;Reset Extruder\nG28 Z ;home Z\nG29 ; Measure the bed\nM500 ; Store to EEPROM\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.36 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.36 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.36 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.36 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 P1;clean nozzle\nG1 X5 Y300 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" }, + + "cool_fan_speed": { "value": 75 }, + "cool_fan_enabled": { "value": true }, + + "line_width": { "value": 0.38 }, + "travel_avoid_distance": { "value": 1 }, + "infill_before_walls": { "value": false } + } +} diff --git a/resources/definitions/hctech_hc300-m2h.def.json b/resources/definitions/hctech_hc300-m2h.def.json new file mode 100644 index 0000000000..d08258c7c6 --- /dev/null +++ b/resources/definitions/hctech_hc300-m2h.def.json @@ -0,0 +1,58 @@ +{ + "version": 2, + "name": "HCTECH_HC300-M2H", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "HCTECH", + "manufacturer": "HCTECH", + "file_formats": "text/x-gcode", + "platform": "hctech_hc300-m2h.3mf", + "has_machine_quality": false, + "machine_extruder_trains": { + "0": "hctech_hc300-m2h_extruder_0", + "1": "hctech_hc300-m2h_extruder_1" + } + }, + + "overrides": { + "machine_head_with_fans_polygon": { "default_value": [ + [-61, 86], + [-61, -37], + [85, -37], + [85, 86] + ] }, + "machine_name": { "default_value": "HCTECH HC300-M2H" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "retraction_amount": { + "default_value": 0.3, + "maximum_value_warning": 2.0 + }, + "adhesion_type": { "default_value": "skirt" }, + "retraction_speed": { "default_value": 35}, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "retraction_enable": { "value": true }, + + "gantry_height": { "value": "55" }, + "speed_print": { "default_value": 60.0 } , + + "material_diameter": { "default_value": 1.75 }, + + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": "G1 Z2 ;Raise Z\nG28 X Y ;Home XY\nT1 ;switch to right extruder\nG1 X5 Y319 F4000 ;Move to Start Position\nG92 E0 ;Reset Extruder\nG1 E20 F60 ;extrude\nM400 ;Wait move\nG92 E0 ;Reset Extruder\nG1 E-2 F2700 ;Retract\nG92 E0 ;Reset Extruder\nG1 X150 F5000 ;Clean Nozzle\nG1 X5 ;Clean Nozzle\nG1 X220 ;Repeat\nG1 X5 ;Back to start posotion\nT0 ;switch to left extruder\nG1 X5 Y319 F4000 ;Move to Start Position\nG92 E0 ;Reset Extruder\nG1 E20 F60 ;extrude\nM400 ;Wait move\nG92 E0 ;Reset Extruder\nG4 S15 ;Wait 15s\nG1 E-2 F2700; Retract\nG92 E0 ;Reset Extruder\nG1 X150 F5000 ;Clean Nozzle\nG1 X5 ;Clean nozzle\nG1 X220 ;Repeat\nG1 X5 ;Back to start position\nG28 Z ;home Z\nG29 ;Measure the bed\nM500 ;Store parameters\nG1 X0 Y300 F4000 ;Move to corner" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 ;clean nozzle\nG1 X5 Y319 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" }, + + "cool_fan_speed": { "value": 75 }, + "cool_fan_enabled": { "value": true }, + + "line_width": { "value": 0.38 }, + "travel_avoid_distance": { "value": 1 }, + "infill_before_walls": { "value": false } + } +} diff --git a/resources/definitions/hctech_hc300-m3.def.json b/resources/definitions/hctech_hc300-m3.def.json new file mode 100644 index 0000000000..cbbae35cfa --- /dev/null +++ b/resources/definitions/hctech_hc300-m3.def.json @@ -0,0 +1,58 @@ +{ + "version": 2, + "name": "HCTECH_HC300-M3", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "HCTECH", + "manufacturer": "HCTECH", + "file_formats": "text/x-gcode", + "platform": "hctech_hc300-m3.3mf", + "has_machine_quality": false, + "machine_extruder_trains": { + "0": "hctech_hc300-m3_extruder_0" + } + }, + + "overrides": { + "machine_head_with_fans_polygon": + { "default_value": [ + [-49, 36], + [-36, -29], + [36, -29], + [36, 49] + ] + }, + "machine_name": { "default_value": "HCTECH HC300-M3" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "retraction_amount": { + "default_value": 3, + "maximum_value_warning": 8 + }, + "adhesion_type": { "default_value": "skirt" }, + "retraction_speed": { "default_value": 35}, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "retraction_enable": { "value": true }, + + "gantry_height": { "value": "55" }, + "speed_print": { "default_value": 60.0 } , + + "material_diameter": { "default_value": 1.75 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": "G28 X Y ;Home XY\nG92 E0 ;Reset Extruder\nG1 E-1 F2400 ;Retract\nG92 E0 ;Reset Extruder\nG28 Z ;home Z\nG29 ; Measure the bed\nM500 ; Store to EEPROM\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.36 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.36 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.36 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.36 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 Z1 E-2 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG1 X5 Y290 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z" }, + + "cool_fan_speed": { "value": 75 }, + "cool_fan_enabled": { "value": true }, + + "line_width": { "value": 0.38 }, + "travel_avoid_distance": { "value": 1 }, + "infill_before_walls": { "value": false } + } +} diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 1484935191..f9f686c69b 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -53,6 +53,9 @@ "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, + "inset_direction": { + "value": "'outside_in'" + }, "retraction_combing": { "value": "'no_outer_surfaces'" }, @@ -221,7 +224,13 @@ "value": true }, "support_infill_rate": { - "value": "80 if gradual_support_infill_steps != 0 else 15" + "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" + }, + "support_line_distance": { + "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" + }, + "support_initial_layer_line_distance": { + "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "gradual_support_infill_steps": { "value": "2 if support_interface_enable else 0" @@ -233,13 +242,13 @@ "value": "2*layer_height" }, "support_offset": { - "value": "2*line_width if support_interface_enable else 0" + "value": "support_xy_distance if support_interface_enable else 0" }, "support_xy_distance": { "value": "1" }, "support_xy_distance_overhang": { - "value": "wall_line_width_0" + "value": "0.2" }, "minimum_support_area": { "value": "(2 + support_offset)**2" diff --git a/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json b/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json new file mode 100644 index 0000000000..f00ab8b0c2 --- /dev/null +++ b/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json @@ -0,0 +1,86 @@ +{ + "version": 2, + "name": "XYZprinting da Vinci Pro EVO", + "inherits": "xyzprinting_base", + "metadata": { + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", + "visible": true, + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "supports_usb_connection": true, + "preferred_quality_type": "normal", + "quality_definition": "xyzprinting_da_vinci_pro_evo", + "preferred_variant_name": "Hardened Steel 0.4mm Nozzle", + "variants_name": "Nozzle Type", + "machine_extruder_trains": { + "0": "xyzprinting_da_vinci_pro_evo_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "XYZprinting da Vinci Pro EVO" }, + "machine_shape": { "default_value": "rectangular"}, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 220.00 }, + "machine_depth": { "default_value": 200.00 }, + "machine_height": { "default_value":200.00 }, + "machine_center_is_zero": { "default_value": false }, + "machine_head_with_fans_polygon": { + "default_value": [ + [ -20, -10 ], + [ -20, 10 ], + [ 10, 10 ], + [ 10, -10 ] + ] + }, + "retraction_extrusion_window": { "value": "1" }, + "retraction_count_max": { "value": "25" }, + "speed_layer_0" : {"value" : 10 }, + "speed_wall_x" : { "value": "speed_print" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, + "skin_overlap": { "value": "15" }, + "skin_monotonic" : { "value": true }, + "skin_material_flow": { "value": "97" }, + "brim_width": { "value": "10" }, + "line_width" : { "value": "0.35" }, + "wall_line_width_x" : { "value": "0.35" }, + "infill_before_walls": { "value": false }, + "infill_line_width" : { "value": "0.4" }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, + "infill_wipe_dist": { "value": "0" }, + "infill_wipe_dist": { "value": "0" }, + "wall_thickness" : { "value": "1" }, + "acceleration_enabled" : {"value" : true}, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3000)" }, + "acceleration_print": { "value": "3000" }, + "acceleration_travel": { "value": "3000" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3000)" }, + "acceleration_support_interface": { "value": "acceleration_topbottom" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 3000)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, + "jerk_enabled" : {"value" : true}, + "material_flow_layer_0": {"value": 120}, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, + "cool_min_speed" : {"value" : 5 }, + "brim_line_count": { "value" : 5 }, + "infill_before_walls": { "value": false }, + "optimize_wall_printing_order": { "value": "True" }, + "skirt_line_count": { "default_value" : 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "M191\nG28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" + }, + "machine_end_gcode": { + "default_value": "M106 P1 S255 ; turn on fan\nG92 E0\nG28; home X,Y,Z axis\nM84 ; disable motors\n" + }, + "multiple_mesh_overlap": { "value": "0" }, + "wall_0_inset": { "value": "0" } + } +} diff --git a/resources/extruders/anycubic_kobra_extruder_0.def.json b/resources/extruders/anycubic_kobra_extruder_0.def.json new file mode 100644 index 0000000000..c9053ffa2e --- /dev/null +++ b/resources/extruders/anycubic_kobra_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "anycubic_kobra", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/anycubic_kobra_max_extruder_0.def.json b/resources/extruders/anycubic_kobra_max_extruder_0.def.json new file mode 100644 index 0000000000..69cdddf370 --- /dev/null +++ b/resources/extruders/anycubic_kobra_max_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "anycubic_kobra_max", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json b/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json new file mode 100644 index 0000000000..c950db18ec --- /dev/null +++ b/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hctech_hc300-m1&m1h", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 } + } +} diff --git a/resources/extruders/hctech_hc300-m2h_extruder_0.def.json b/resources/extruders/hctech_hc300-m2h_extruder_0.def.json new file mode 100644 index 0000000000..1a718401cb --- /dev/null +++ b/resources/extruders/hctech_hc300-m2h_extruder_0.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "hctech_hc300-m2h", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_extruder_start_code": { + "default_value": "G1 X5 Y319 ;move to wait posiotion\nT0 ;switch to extruder 1\nM109 S{material_print_temperature}\nG1 F5000\nG12 ;clean nozzle\nG1 X0 Y300 F4800 ;move to start point" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-1 ;retract\nG92 E0 ;reset extruder distance\nG1 X0 Y300 F4800 ;move to start position\nG1 X5 Y319 ;move to wait posiotion" + }, + "machine_extruder_cooling_fan_number": { "default_value": 0 } + } +} diff --git a/resources/extruders/hctech_hc300-m2h_extruder_1.def.json b/resources/extruders/hctech_hc300-m2h_extruder_1.def.json new file mode 100644 index 0000000000..616f2c2d27 --- /dev/null +++ b/resources/extruders/hctech_hc300-m2h_extruder_1.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "hctech_hc300-m2h", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_extruder_start_code": { + "default_value": "G1 X5 Y319 ;move to wait posiotion\nT1 ;switch to extruder 2\nM109 S{material_print_temperature}\nG1 F5000\nG12 ;clean nozzle\nG1 X0 Y300 F4800 ;move to start point" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-1 ;retract\nG92 E0 ;reset extruder distance\nG1 X0 Y300 F4800 ;move to start position\nG1 X5 Y319 ;move to wait posiotion" + }, + "machine_extruder_cooling_fan_number": { "default_value": 0 } + } +} diff --git a/resources/extruders/hctech_hc300-m3_extruder_0.def.json b/resources/extruders/hctech_hc300-m3_extruder_0.def.json new file mode 100644 index 0000000000..b7923672a5 --- /dev/null +++ b/resources/extruders/hctech_hc300-m3_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hctech_hc300-m3", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 } + } +} diff --git a/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json new file mode 100644 index 0000000000..268a911af2 --- /dev/null +++ b/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "xyzprinting_da_vinci_pro_evo", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index 7ebe7251af..eae87bcdaf 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: 2022-04-25 20:15+0200\n" +"PO-Revision-Date: 2022-07-07 19:34+0200\n" "Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" "Language: cs_CZ\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n>=2 && n<=4 ? 1 : 2);\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -306,7 +306,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Neinicializováno" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -886,17 +886,17 @@ msgstr "Vlastní" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "Materiál použitý v tomto projektu závisí na jiných definicích materiálů, které nejsou dostupné v Cuře. To může způsobit nečekané problémy při tisku. Důrazně doporučujeme nainstalovat kompletní balíček materiálů z Obchodu." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Materiálové profily nejsou nainstalovány" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Instalovat materiály" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -934,12 +934,12 @@ msgstr "Chyba při zápisu 3mf file." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Nepodařilo se uložit informace o balíčku materiálů v souboru projektu: {material}. Tento projekt se nemusí otevřít správně na jiných systémech." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Nepodařilo se uložit informace o balíčku materiálů" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -1293,7 +1293,7 @@ msgstr "Nelze přečíst odpověď serveru." #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/RemotePackageList.py:148 msgctxt "@info:error" msgid "Could not reach Marketplace." -msgstr "Nelze se připojit k Obchodu" +msgstr "Nelze se připojit k Obchodu." #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" @@ -2013,12 +2013,12 @@ msgstr "Otevřít" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Přesto otevřít projekt" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Nainstalovat chybějící materiál" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2126,12 +2126,12 @@ msgstr "Přihlásit se" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Uložit projekt Cura a tiskový soubor UFP" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Uložit projekt Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2503,7 +2503,7 @@ msgstr "Následující balíčky nelze nainstalovat z důvodu nekompatibilní ve #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Nainstalovat chybějící materiály" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2590,7 +2590,7 @@ msgstr "Zjistit Více" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Od" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4063,28 +4063,28 @@ msgstr "Knihovna pro výstřižky z mnohoúhelníků" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON parser" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Pomocné funkce zahrnující načítání obrázků" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Pomocná knihovna zahrnující Voronoi generátor" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Kořenové certifikáty pro ověření důvěryhodnosti SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Kompatibilita mezi Python 2 a 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4134,17 +4134,17 @@ msgstr "Knihovna ZeroConf discovery" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Univerzální konfigurace překladu programů" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Správce závislostí a balíčků" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Vytváření balíčků Python aplikací" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4154,7 +4154,7 @@ msgstr "Linux cross-distribution application deployment" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Generování instalátorů pro Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5671,17 +5671,17 @@ msgstr "Experimentální" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "– vlastní profil je aktivní a přepsali jste některá nastavení." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "– vlastní profil přepisuje některá nastavení." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Některá nastavení byly změněna." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5706,7 +5706,7 @@ msgstr "Postupná výplň postupně zvyšuje množství výplně směrem nahoru. #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Rozlišení" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5721,17 +5721,17 @@ msgstr "Vytvořte struktury pro podporu částí modelu, které mají přesahy. #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Konfigurace není podporována" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Pro vybranou konfiguraci materiál/%1 není dostupný žádný profil. Prosím změňte svou konfiguraci." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Zjistit více" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -6385,7 +6385,7 @@ msgstr "Záznamník hlavy" #: SimulationView/plugin.json msgctxt "description" msgid "Provides the preview of sliced layerdata." -msgstr "Poskytuje náhled slicovaných dat vrstev" +msgstr "Poskytuje náhled slicovaných dat vrstev." #: SimulationView/plugin.json msgctxt "name" diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index 48abe57ff5..d82228811b 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: 2022-05-02 22:27+0200\n" +"PO-Revision-Date: 2022-07-07 21:04+0200\n" "Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" "Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -2810,12 +2810,12 @@ msgstr "Umožňuje nastavení zrychlení tiskové hlavy. Zvýšení zrychlení m #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Změnit akceleraci cestování" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Použít jiné samostatné akcelerace pro cestovní pohyby. Pokud je vypnuto, pak budou cestovní pohyby používat hodnotu akcelerace podle tištěné čáry v cíli pohybu." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3010,12 @@ msgstr "Umožňuje nastavení trhnutí tiskové hlavy, když se mění rychlost #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Změnit okamžitou rychlost cestování" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Použít samostatné nastavení okamžité rychlosti pro cestovní pohyby. Pokud je vypnuto, pak budou cestovní pohyby používat hodnotu okamžité rychlosti podle tištěné čáry v cíli pohybu." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 1136320350..c5127f28bd 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2022-07-15 11:18+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 3.1.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -36,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Nicht überschrieben" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "Verbundene Drucker" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "Voreingestellte Drucker" @@ -54,52 +53,38 @@ 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 "Möchten Sie {0} wirklich entfernen? Der Vorgang kann nicht rückgängig gemacht werden!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visuell" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Das visuelle Profil wurde für den Druck visueller Prototypen und Modellen entwickelt, bei denen das Ziel eine hohe visuelle Qualität und eine hohe Oberflächenqualität ist." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Das Engineering-Profil ist für den Druck von Funktionsprototypen und Endnutzungsteilen gedacht, bei denen Präzision gefragt ist und engere Toleranzen gelten." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Entwurf" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Das Entwurfsprofil wurde für erste Prototypen und die Konzeptvalidierung entwickelt, um einen deutlich schnelleren Druck zu ermöglichen." @@ -109,8 +94,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Benutzerdefiniertes Material" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "Benutzerdefiniert" @@ -151,8 +135,7 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "Position finden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Innerhalb der Druckabmessung für alle Objekte konnte keine Position gefunden werden" @@ -167,10 +150,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Konnte kein Archiv von Benutzer-Datenverzeichnis {} erstellen" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "Backup" @@ -304,7 +284,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Noch nicht initialisiert" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -391,9 +371,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Es kann nur jeweils ein G-Code gleichzeitig geladen werden. Wichtige {0} werden übersprungen." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "Warnhinweis" @@ -404,11 +382,8 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Wenn G-Code geladen wird, kann keine weitere Datei geöffnet werden. Wichtige {0} werden übersprungen." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" msgstr "Fehler" @@ -473,8 +448,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "Die Erstellung eines Materialarchivs zur Synchronisierung mit Druckern ist fehlgeschlagen." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "Das Archiv der Materialien konnte nicht geladen werden, um es mit Druckern zu synchronisieren." @@ -484,9 +458,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "Die Antwort von Digital Factory scheint beschädigt zu sein." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "In der Antwort von Digital Factory fehlen wichtige Informationen." @@ -501,21 +473,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "Es konnte keine Verbindung zu Digital Factory hergestellt werden." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "Datei bereits vorhanden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Die Datei {0} ist bereits vorhanden. Soll die Datei wirklich überschrieben werden?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ungültige Datei-URL:" @@ -567,8 +536,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Import des Profils aus Datei {0} fehlgeschlagen:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -640,8 +608,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "Düse" @@ -661,28 +628,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder deaktiviert" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "Hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "Beenden" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "Abbrechen" @@ -753,29 +711,23 @@ msgctxt "@tooltip" msgid "Other" msgstr "Sonstige" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "Die Versionshinweise konnten nicht geöffnet werden." -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "Weiter" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "Überspringen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" msgstr "Schließen" @@ -795,9 +747,7 @@ msgctxt "@action:button" msgid "Sync materials" msgstr "Materialien synchronisieren" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "Mehr erfahren" @@ -853,8 +803,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Auf Projektdatei {0} kann plötzlich nicht mehr zugegriffen werden: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Projektdatei kann nicht geöffnet werden" @@ -884,20 +833,19 @@ msgstr "Benutzerdefiniert" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "Das in diesem Projekt verwendete Material basiert auf einigen Materialdefinitionen, die in Cura nicht verfügbar sind. Dies kann zu unerwünschten Druckergebnissen führen. Wir empfehlen dringend, das komplette Materialpaket aus dem Marketplace zu installieren." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Materialprofile nicht installiert" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Materialien installieren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-Datei" @@ -912,8 +860,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "Es ist noch kein Workspace zum Speichern vorhanden. Bitte fügen Sie zuerst einen Drucker hinzu." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Keine Erlaubnis zum Beschreiben dieses Arbeitsbereichs." @@ -932,12 +879,12 @@ msgstr "Fehler beim Schreiben von 3MF-Datei." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Speichern der Materialpaketinformationen in der Projektdatei nicht möglich: {material}. Dieses Projekt kann auf anderen Systemen möglicherweise nicht korrekt geöffnet werden." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Speichern der Materialpaketinformationen fehlgeschlagen" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -989,8 +936,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Das Backup überschreitet die maximale Dateigröße." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Beim Versuch, Ihr Backup wiederherzustellen, trat ein Fehler auf." @@ -1025,12 +971,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Slicing mit dem aktuellen Material nicht möglich, da es mit der gewählten Maschine oder Konfiguration nicht kompatibel ist." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "Slicing nicht möglich" @@ -1071,8 +1013,7 @@ msgstr "" "- Einem aktiven Extruder zugewiesen sind\n" "- Nicht alle als Modifier Meshes eingerichtet sind" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Schichten werden verarbeitet" @@ -1082,8 +1023,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informationen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-Profil" @@ -1115,8 +1055,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Firmware aktualisieren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Komprimierte G-Code-Datei" @@ -1126,9 +1065,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeWriter unterstützt keinen Textmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-Code-Datei" @@ -1138,8 +1075,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-Code parsen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "G-Code-Details" @@ -1159,8 +1095,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter unterstützt keinen Nicht-Textmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Vor dem Exportieren bitte G-Code vorbereiten." @@ -1205,8 +1140,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Möchten Sie Material- und Softwarepakete mit Ihrem Konto synchronisieren?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Von Ihrem Ultimaker-Konto erkannte Änderungen" @@ -1221,14 +1155,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "Synchronisierung läuft..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "Ablehnen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "Stimme zu" @@ -1251,7 +1183,7 @@ msgstr "Sie müssen das Programm beenden und neu starten {}, bevor Änderungen w #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" -msgstr "Sie müssen das Programm beenden und neu starten {}, bevor Änderungen wirksam werden." +msgstr "Sie müssen das Programm beenden und neu starten {}, bevor Änderungen wirksam werden" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/LocalPackageList.py:28 msgctxt "@label" @@ -1339,8 +1271,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Auf Wechseldatenträger speichern {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Es sind keine Dateiformate zum Schreiben vorhanden!" @@ -1356,8 +1287,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Wird gespeichert" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1369,8 +1299,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Bei dem Versuch, auf {device} zu schreiben, wurde ein Dateiname nicht gefunden." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1440,8 +1369,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "Keine anzeigbaren Schichten vorhanden" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Diese Meldung nicht mehr anzeigen" @@ -1511,16 +1439,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Compressed COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 #: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" @@ -1607,8 +1531,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Dieser Drucker ist nicht mit der Digital Factory verbunden:" msgstr[1] "Diese Drucker sind nicht mit der Digital Factory verbunden:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1663,10 +1586,10 @@ msgid_plural "" "Are you sure you want to continue?" msgstr[0] "" "Es wird gleich {0} Drucker aus Cura entfernt. Der Vorgang kann nicht rückgängig gemacht werden. \n" -"Möchten Sie wirklich fortfahren." +"Möchten Sie wirklich fortfahren?" msgstr[1] "" "Es werden gleich {0} Drucker aus Cura entfernt. Der Vorgang kann nicht rückgängig gemacht werden. \n" -"Möchten Sie wirklich fortfahren." +"Möchten Sie wirklich fortfahren?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:489 msgctxt "@label" @@ -1877,8 +1800,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Neu erstellen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Zusammenfassung – Cura-Projekt" @@ -1888,20 +1810,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Wie soll der Konflikt im Gerät gelöst werden?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "Druckereinstellungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "Typ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "Druckergruppe" @@ -1911,34 +1830,28 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Wie soll der Konflikt im Profil gelöst werden?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profileinstellungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Name" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Nicht im Profil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2000,12 +1913,12 @@ msgstr "Öffnen" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Projekt trotzdem öffnen" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Fehlendes Material installieren" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2102,9 +2015,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Ihre Cura-Einstellungen sichern und synchronisieren." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" @@ -2113,12 +2024,12 @@ msgstr "Anmelden" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Cura-Projekt speichern und Datei drucken" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Cura-Projekt speichern" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2295,10 +2206,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "Die Stärke der Glättung, die für das Bild angewendet wird." -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -2318,18 +2226,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Düsengröße" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2469,9 +2369,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "Verwerfen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2490,7 +2388,7 @@ msgstr "Die folgenden Pakete können nicht hinzugefügt werden, weil die Cura-Ve #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Fehlende Materialien installieren" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2552,8 +2450,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "%1 beenden" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "Materialien installieren" @@ -2568,8 +2465,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "Sie müssen die Lizenz akzeptieren, um das Paket zu installieren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "Mehr Erfahren" @@ -2577,7 +2473,7 @@ msgstr "Mehr Erfahren" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Von" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -2664,14 +2560,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "Kompatibel mit Material Station" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "Ja" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "Nein" @@ -2833,8 +2727,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Einstellungen für die benutzerdefinierte Anpassung dieses Modells wählen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtern..." @@ -2876,8 +2769,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "Die folgenden Skript ist aktiv:" msgstr[1] "Die folgenden Skripte sind aktiv:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "Farbschema" @@ -2932,8 +2824,7 @@ msgctxt "@label" msgid "Shell" msgstr "Gehäuse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "Füllung" @@ -3048,9 +2939,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Bearbeiten" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" @@ -3066,20 +2955,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Wenn Ihr Drucker nicht aufgeführt ist, lesen Sie die Anleitung für Fehlerbehebung für Netzwerkdruck" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "Typ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "Firmware-Version" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "Adresse" @@ -3109,8 +2995,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Ungültige IP-Adresse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Bitte eine gültige IP-Adresse eingeben." @@ -3120,8 +3005,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Druckeradresse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Geben Sie die IP-Adresse Ihres Druckers in das Netzwerk ein." @@ -3173,8 +3057,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Überschreiben verwendet die definierten Einstellungen mit der vorhandenen Druckerkonfiguration. Dies kann zu einem fehlgeschlagenen Druck führen." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" @@ -3195,8 +3078,7 @@ msgctxt "@label" msgid "Delete" msgstr "Löschen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "Zurückkehren" @@ -3211,9 +3093,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Wird fortgesetzt..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "Pausieren" @@ -3253,8 +3133,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Möchten Sie %1 wirklich abbrechen?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "Drucken abbrechen" @@ -3264,9 +3143,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Drucker verwalten" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Damit Sie die Warteschlange aus der Ferne verwalten können, müssen Sie die Druckfirmware aktualisieren." @@ -3296,8 +3173,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "Leerlauf" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." @@ -3338,17 +3214,14 @@ msgctxt "@label" msgid "First available" msgstr "Zuerst verfügbar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "Abgebrochen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "Beendet" @@ -3358,10 +3231,8 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "Wird abgebrochen..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" msgstr "Fehlgeschlagen" @@ -3441,8 +3312,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Anmelden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "Bei der Ultimaker-Plattform anmelden" @@ -3788,8 +3658,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Konfigurationsordner anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Sichtbarkeit einstellen wird konfiguriert..." @@ -3874,8 +3743,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Dieses Paket wird nach einem Neustart installiert." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "Allgemein" @@ -3885,20 +3753,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Einstellungen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "Drucker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "Materialien" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" @@ -3908,14 +3773,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1 wird geschlossen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Möchten Sie %1 wirklich beenden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "Datei(en) öffnen" @@ -4047,28 +3910,27 @@ msgstr "Bibliothek für Polygon-Beschneidung" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON-Parser" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Utility-Funktionen, einschließlich Bildlader" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Utility-Bibliothek, einschließlich Voronoi-Generierung" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Root-Zertifikate zur Validierung der SSL-Vertrauenswürdigkeit" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Kompatibilität zwischen Python 2 und 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4118,17 +3980,17 @@ msgstr "Bibliothek für ZeroConf-Erkennung" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Universelle Build-Systemkonfiguration" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Abhängigkeits- und Paketmanager" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Verpacken von Python-Anwendungen" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4138,7 +4000,7 @@ msgstr "Distributionsunabhängiges Format für Linux-Anwendungen" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Generieren von Windows-Installern" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -4188,8 +4050,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Aktuelle Änderungen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Stets nachfragen" @@ -4266,8 +4127,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Unbenannt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Einstellungen" @@ -4603,8 +4463,7 @@ msgctxt "@label" msgid "Object list" msgstr "Objektliste" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "Standardeinstellungen" @@ -4877,8 +4736,7 @@ msgctxt "@info:tooltip" 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 "Wenn Sie Änderungen für ein Profil vorgenommen haben und zu einem anderen Profil gewechselt sind, wird ein Dialog angezeigt, der hinterfragt, ob Sie Ihre Änderungen beibehalten möchten oder nicht; optional können Sie ein Standardverhalten wählen, sodass dieser Dialog nicht erneut angezeigt wird." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "Profile" @@ -4963,15 +4821,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "Neue hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "Aktivieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "Umbenennen" @@ -4981,14 +4836,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "Mit aktivem Drucker kompatible Materialien:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "Neu erstellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "Import" @@ -4998,32 +4851,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "Mit Druckern synchronisieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplizieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "Export" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Entfernen bestätigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Möchten Sie %1 wirklich entfernen? Dies kann nicht rückgängig gemacht werden!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "Material importieren" @@ -5038,8 +4886,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Material konnte nicht importiert werden %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "Material exportieren" @@ -5089,9 +4936,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "Um die Materialprofile automatisch mit all Ihren mit Digital Factory verbundenen Druckern zu synchronisieren, müssen Sie in Cura angemeldet sein." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "Materialien über USB snchronisieren" @@ -5111,8 +4956,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "Materialprofile wurden erfolgreich mit den folgenden Druckern synchronisiert:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "Störungen beheben" @@ -5137,14 +4981,12 @@ msgctxt "@button" msgid "Try again" msgstr "Erneut versuchen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "Fertig" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "Synchronisieren" @@ -5204,8 +5046,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "How to load new material profiles to my printer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "Zurück" @@ -5315,9 +5156,7 @@ msgctxt "@title" msgid "Information" msgstr "Informationen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "Druckeinstellungen" @@ -5340,15 +5179,14 @@ msgstr "Einige Einstellungen des aktuellen Profils wurden überschrieben." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:140 msgctxt "@action:button" msgid "Update profile." -msgstr "Profil aktualisieren" +msgstr "Profil aktualisieren." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:143 msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" msgstr "Profil mit aktuellen Einstellungen/Überschreibungen aktualisieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "Aktuelle Änderungen verwerfen" @@ -5378,8 +5216,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geben Sie bitte einen Namen für dieses Profil an." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "Profil exportieren" @@ -5394,8 +5231,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "Profil umbenennen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "Profil importieren" @@ -5452,14 +5288,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "Die Temperatur, auf die das Hotend vorgeheizt wird." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Abbrechen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "Vorheizen" @@ -5653,17 +5487,17 @@ msgstr "Experimentell" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "benutzerdefiniertes Profil ist aktiv und einige Einstellungen wurden überschrieben." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "benutzerdefiniertes Profil überschreibt einige Einstellungen." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Einige Einstellungen wurden geändert." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5688,7 +5522,7 @@ msgstr "Die graduelle Füllung steigert die Menge der Füllung nach oben hin sch #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Auflösung" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5703,17 +5537,17 @@ msgstr "Damit werden Strukturen zur Unterstützung von Modellteilen mit Überhä #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Konfiguration wird nicht unterstützt" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Für die ausgewählte Material-/%1-Konfiguration sind keine Profile verfügbar. Bitte ändern Sie Ihre Konfiguration." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Mehr erfahren" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -5963,8 +5797,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Verbindung mit Drucker nicht möglich." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/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?" @@ -7907,7 +7740,8 @@ msgstr "Röntgen-Ansicht" #~ "\n" #~ "Select your printer from the list below:" #~ msgstr "" -#~ "Um über das Netzwerk direkt auf Ihrem Drucker zu drucken, stellen Sie bitte sicher, dass der Drucker mit dem Netzwerkkabel verbunden ist oder verbinden Sie Ihren Drucker mit Ihrem WLAN-Netzwerk. Wenn Sie Cura nicht mit Ihrem Drucker verbinden, können Sie dennoch ein USB-Laufwerk für die Übertragung von G-Code-Dateien auf Ihren Drucker verwenden.\n" +#~ "Um über das Netzwerk direkt auf Ihrem Drucker zu drucken, stellen Sie bitte sicher, dass der Drucker mit dem Netzwerkkabel verbunden ist oder verbinden Sie Ihren Drucker mit Ihrem WLAN-Netzwerk. Wenn Sie Cura nicht mit Ihrem Drucker verbinden, können Sie dennoch ein USB-Laufwerk für die Übertragung " +#~ "von G-Code-Dateien auf Ihren Drucker verwenden.\n" #~ "\n" #~ "Wählen Sie Ihren Drucker aus der folgenden Liste:" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index e0722f2cf0..72b55121f6 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:17+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 707866adb5..dd402803d5 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:04+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -746,7 +747,7 @@ msgstr "Skalierung der Lüftergeschwindigkeit auf 0–1" #: fdmprinter.def.json msgctxt "machine_scale_fan_speed_zero_to_one description" msgid "Scale the fan speed to be between 0 and 1 instead of between 0 and 256." -msgstr "Skalieren der Lüftergeschwindigkeit auf einen Wert zwischen 0 und 1 statt zwischen 0 und 256" +msgstr "Skalieren der Lüftergeschwindigkeit auf einen Wert zwischen 0 und 1 statt zwischen 0 und 256." #: fdmprinter.def.json msgctxt "resolution label" @@ -2810,12 +2811,12 @@ msgstr "Ermöglicht die Justierung der Druckkopfbeschleunigung. Eine Erhöhung d #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Beschleunigung für Bewegung aktivieren" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Verwenden Sie eine separate Beschleunigungsrate für Bewegungen. Wenn diese Option deaktiviert ist, wird für Bewegungen der Beschleunigungswert der gedruckten Linie an der Zielposition verwendet." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,12 @@ msgstr "Ermöglicht die Justierung der Ruckfunktion des Druckkopfes bei Änderun #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Ruckfunktion für Bewegung aktivieren" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Verwenden Sie eine separate Ruckfunktionsrate für Bewegungen. Wenn diese Option deaktiviert ist, wird für Bewegungen der Ruckfunktionswert der gedruckten Linie an der Zielposition verwendet." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index d0e5377405..f5bd264d96 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -304,7 +304,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Aún no inicializado" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -884,17 +884,18 @@ msgstr "Personalizado" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "El material utilizado en este proyecto se basa en algunas definiciones de materiales que no están disponibles en Cura, lo que podría producir resultados" +" de impresión no deseados. Recomendamos encarecidamente instalar el paquete completo de materiales desde el Marketplace." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Perfiles de materiales no instalados" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Instalar materiales" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -932,12 +933,13 @@ msgstr "Error al escribir el archivo 3MF." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "No ha sido posible almacenar la información del paquete de materiales en el archivo del proyecto: {material}. Es posible que este proyecto no se abra correctamente" +" en otros sistemas." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Se ha producido un error al guardar la información del paquete de materiales" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -2000,12 +2002,12 @@ msgstr "Abrir" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Abrir el proyecto de todos modos" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Instalar material no instalado" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2113,12 +2115,12 @@ msgstr "Iniciar sesión" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Guardar el proyecto de Cura e imprimir archivo" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Guardar el proyecto de Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2490,7 +2492,7 @@ msgstr "Los siguientes paquetes no se pueden instalar debido a una versión no c #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Instalar los materiales que faltan" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2577,7 +2579,7 @@ msgstr "Más Información" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Por" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4048,28 +4050,28 @@ msgstr "Biblioteca de recorte de polígonos" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "Parser JSON" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Funciones de utilidades, incluido un cargador de imágenes" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Biblioteca de utilidades, incluida la generación de Voronoi" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Certificados de raíz para validar la fiabilidad del SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Compatibilidad entre Python 2 y 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4119,17 +4121,17 @@ msgstr "Biblioteca de detección para Zeroconf" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Configuración del sistema de construcción universal" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Gestor de dependencias y paquetes" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Empaquetado de aplicaciones Python" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4139,7 +4141,7 @@ msgstr "Implementación de la aplicación de distribución múltiple de Linux" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Generación de instaladores de Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5654,17 +5656,17 @@ msgstr "Experimental" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "el perfil personalizado está activo y ha sobrescrito algunos ajustes." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "el perfil personalizado está sobrescribiendo algunos ajustes." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Se han modificado algunos ajustes." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5689,7 +5691,7 @@ msgstr "Un relleno gradual aumentará gradualmente la cantidad de relleno hacia #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Resolución" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5704,17 +5706,17 @@ msgstr "Generar estructuras para soportar piezas del modelo que tengan voladizos #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Configuración no admitida" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "No hay perfiles disponibles para la configuración de material/%1 elegida. Modifique su configuración." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Más información" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index 65381a8f04..e37d9d9882 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:17+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index f1bd12cd34..38c6064d01 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:17+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1106,7 +1107,7 @@ msgstr "Dividir umbral de línea media" #: fdmprinter.def.json msgctxt "wall_split_middle_threshold description" msgid "The smallest line width, as a factor of the normal line width, above which the middle line (if there is one) will be split into two. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall." -msgstr "El ancho de línea más pequeño, como un factor del ancho de línea normal, por encima del cual la línea media (si existe) se dividirá en dos. Reduzca esta configuración para utilizar menos líneas más finas. Incremente para utilizar menos líneas más anchas. Tenga en cuenta que esto se mantiene, como si toda la forma necesitara ser rellenada con una pared. Por lo tanto, en este contexto, la línea intermedia se refiere a la línea intermedia del objeto entre dos bordes externos, incluso si en lugar de la pared, la impresión contiene un relleno u otro revestimiento externo" +msgstr "El ancho de línea más pequeño, como un factor del ancho de línea normal, por encima del cual la línea media (si existe) se dividirá en dos. Reduzca esta configuración para utilizar menos líneas más finas. Incremente para utilizar menos líneas más anchas. Tenga en cuenta que esto se mantiene, como si toda la forma necesitara ser rellenada con una pared. Por lo tanto, en este contexto, la línea intermedia se refiere a la línea intermedia del objeto entre dos bordes externos, incluso si en lugar de la pared, la impresión contiene un relleno u otro revestimiento externo." #: fdmprinter.def.json msgctxt "min_odd_wall_line_width label" @@ -2810,12 +2811,12 @@ msgstr "Permite ajustar la aceleración del cabezal de impresión. Aumentar las #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Habilitar la aceleración de desplazamiento" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Utilice una tasa de aceleración independiente para los movimientos de desplazamiento. Si está deshabilitada, los movimientos de desplazamiento utilizarán el valor de aceleración de la línea impresa en su destino." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,12 @@ msgstr "Permite ajustar el impulso del cabezal de impresión cuando la velocidad #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Habilitar el impulso de desplazamiento" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Utilice una tasa de impulso independiente para los movimientos de desplazamiento. Si está deshabilitada, los movimientos de desplazamiento utilizarán el valor de impulso de la línea impresa en su destino." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index cdf4e539d6..2e9ebdd4b4 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -7,13 +7,15 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: 2017-09-27 12:27+0200\n" +"PO-Revision-Date: 2022-07-15 10:53+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" "Language: fi_FI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.1.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -35,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "" @@ -53,52 +53,38 @@ 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 "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "" @@ -108,8 +94,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Mukautettu materiaali" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "Mukautettu" @@ -150,11 +135,10 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "Etsitään paikkaa" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" -msgstr "Kaikille kappaleille ei löydy paikkaa tulostustilavuudessa." +msgstr "Kaikille kappaleille ei löydy paikkaa tulostustilavuudessa" #: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" @@ -166,10 +150,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "" @@ -382,9 +363,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Vain yksi G-code-tiedosto voidaan ladata kerralla. Tiedoston {0} tuonti ohitettiin." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "Varoitus" @@ -395,11 +374,8 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Muita tiedostoja ei voida ladata, kun G-code latautuu. Tiedoston {0} tuonti ohitettiin." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" msgstr "Virhe" @@ -464,8 +440,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "" @@ -475,9 +450,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "" @@ -492,21 +465,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "Tiedosto on jo olemassa" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Tiedosto {0} on jo olemassa. Haluatko varmasti kirjoittaa sen päälle?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" @@ -558,8 +528,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -631,8 +600,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "Suutin" @@ -652,28 +620,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "Lisää" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "Peruuta" @@ -744,29 +703,23 @@ msgctxt "@tooltip" msgid "Other" msgstr "Muu" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" msgstr "Sulje" @@ -786,9 +739,7 @@ msgctxt "@action:button" msgid "Sync materials" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "" @@ -840,8 +791,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "" @@ -883,8 +833,7 @@ msgctxt "@action:button" msgid "Install Materials" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-tiedosto" @@ -899,8 +848,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "" @@ -976,8 +924,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "" @@ -1012,12 +959,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Viipalointi ei onnistu nykyisellä materiaalilla, sillä se ei sovellu käytettäväksi valitun laitteen tai kokoonpanon kanssa." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "Viipalointi ei onnistu" @@ -1054,8 +997,7 @@ msgid "" "- Are not all set as modifier meshes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Käsitellään kerroksia" @@ -1065,8 +1007,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Tiedot" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiili" @@ -1098,8 +1039,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "" @@ -1109,9 +1049,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "GCode-tiedosto" @@ -1121,8 +1059,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-coden jäsennys" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "G-coden tiedot" @@ -1142,8 +1079,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "" @@ -1188,8 +1124,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "" @@ -1204,14 +1139,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "" @@ -1322,8 +1255,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Tallenna siirrettävälle asemalle {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "" @@ -1339,8 +1271,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Tallennetaan" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1352,8 +1283,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Ei löydetty tiedostonimeä yritettäessä kirjoittaa laitteeseen {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1423,8 +1353,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "" @@ -1494,16 +1423,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 #: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" @@ -1590,8 +1515,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "" msgstr[1] "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "" @@ -1854,8 +1778,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Yhteenveto – Cura-projekti" @@ -1865,20 +1788,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Miten laitteen ristiriita pitäisi ratkaista?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "Tulostimen asetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "Tyyppi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "" @@ -1888,34 +1808,28 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Miten profiilin ristiriita pitäisi ratkaista?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profiilin asetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nimi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Ei profiilissa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2079,9 +1993,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" @@ -2272,10 +2184,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "Kuvassa käytettävän tasoituksen määrä." -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -2295,18 +2204,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Suuttimen koko" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2394,22 +2295,22 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:197 msgctxt "@label" msgid "X min" -msgstr "X väh." +msgstr "X väh" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:217 msgctxt "@label" msgid "Y min" -msgstr "Y väh." +msgstr "Y väh" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:237 msgctxt "@label" msgid "X max" -msgstr "X enint." +msgstr "X enint" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:257 msgctxt "@label" msgid "Y max" -msgstr "Y enint." +msgstr "Y enint" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:275 msgctxt "@label" @@ -2446,9 +2347,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2529,8 +2428,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "" @@ -2545,8 +2443,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "" @@ -2641,14 +2538,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "" @@ -2807,8 +2702,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Valitse tätä mallia varten mukautettavat asetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "Suodatin..." @@ -2850,8 +2744,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "" msgstr[1] "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "Värimalli" @@ -2906,8 +2799,7 @@ msgctxt "@label" msgid "Shell" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "Täyttö" @@ -3022,9 +2914,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Muokkaa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" @@ -3040,20 +2930,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Jos tulostinta ei ole luettelossa, lue verkkotulostuksen vianetsintäopas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "Tyyppi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "Laiteohjelmistoversio" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "Osoite" @@ -3083,8 +2970,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "" @@ -3094,8 +2980,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Tulostimen osoite" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "" @@ -3147,8 +3032,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" @@ -3169,8 +3053,7 @@ msgctxt "@label" msgid "Delete" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "" @@ -3185,9 +3068,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "" @@ -3227,8 +3108,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "Keskeytä tulostus" @@ -3238,9 +3118,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "" @@ -3270,8 +3148,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." @@ -3312,17 +3189,14 @@ msgctxt "@label" msgid "First available" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "Valmis" @@ -3332,10 +3206,8 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" msgstr "" @@ -3415,8 +3287,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "" @@ -3759,8 +3630,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Näytä määrityskansio" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Määritä asetusten näkyvyys..." @@ -3845,8 +3715,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "Yleiset" @@ -3856,20 +3725,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Asetukset" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "Tulostimet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "Materiaalit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiilit" @@ -3879,14 +3745,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "Avaa tiedosto(t)" @@ -4030,8 +3894,7 @@ msgctxt "@label" msgid "Utility library, including Voronoi generation" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "" @@ -4156,8 +4019,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Kysy aina" @@ -4234,8 +4096,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "" @@ -4571,8 +4432,7 @@ msgctxt "@label" msgid "Object list" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "" @@ -4640,7 +4500,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:396 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" -msgstr "Siirtää kameraa siten, että valittuna oleva malli on näkymän keskellä." +msgstr "Siirtää kameraa siten, että valittuna oleva malli on näkymän keskellä" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 msgctxt "@action:button" @@ -4845,8 +4705,7 @@ msgctxt "@info:tooltip" 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 "Kun olet tehnyt muutokset profiiliin ja vaihtanut toiseen, näytetään valintaikkuna, jossa kysytään, haluatko säilyttää vai hylätä muutokset. Tässä voit myös valita oletuskäytöksen, jolloin valintaikkunaa ei näytetä uudelleen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "" @@ -4931,15 +4790,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "Aktivoi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "Nimeä uudelleen" @@ -4949,14 +4805,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "Tuo" @@ -4966,32 +4820,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "Jäljennös" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "Vie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "Tuo materiaali" @@ -5006,8 +4855,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Materiaalin tuominen epäonnistui: %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "Vie materiaali" @@ -5057,9 +4905,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "" @@ -5079,8 +4925,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "" @@ -5105,14 +4950,12 @@ msgctxt "@button" msgid "Try again" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "" @@ -5172,8 +5015,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "" @@ -5283,9 +5125,7 @@ msgctxt "@title" msgid "Information" msgstr "Tiedot" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "Tulostusasetukset" @@ -5315,8 +5155,7 @@ msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "Hylkää tehdyt muutokset" @@ -5346,8 +5185,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiilin vienti" @@ -5362,8 +5200,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "Nimeä profiili uudelleen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiilin tuonti" @@ -5420,14 +5257,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Peruuta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "Esilämmitä" @@ -5727,12 +5562,12 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingItem.qml:89 msgctxt "@label Header for list of settings." msgid "Affects" -msgstr "Koskee seuraavia:" +msgstr "Koskee seuraavia" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingItem.qml:94 msgctxt "@label Header for list of settings." msgid "Affected By" -msgstr "Riippuu seuraavista:" +msgstr "Riippuu seuraavista" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" @@ -5931,8 +5766,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index dccea0303a..e3d787b72f 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: 2017-08-11 14:31+0200\n" +"PO-Revision-Date: 2022-07-15 11:17+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" "Language: fi_FI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 6811f3b88a..17324b976a 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: 2017-09-27 12:27+0200\n" +"PO-Revision-Date: 2022-07-15 11:17+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" "Language: fi_FI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -572,7 +573,7 @@ msgstr "Maksimikiihtyvyys X" #: fdmprinter.def.json msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" -msgstr "X-suunnan moottorin maksimikiihtyvyys." +msgstr "X-suunnan moottorin maksimikiihtyvyys" #: fdmprinter.def.json msgctxt "machine_max_acceleration_y label" @@ -2129,7 +2130,7 @@ msgstr "Oletustulostuslämpötila" #: fdmprinter.def.json msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "Tulostuksessa käytettävä oletuslämpötila. Tämän tulee olla materiaalin ”pohjalämpötila”. Kaikkien muiden tulostuslämpötilojen tulee käyttää tähän arvoon perustuvia siirtymiä." +msgstr "Tulostuksessa käytettävä oletuslämpötila. Tämän tulee olla materiaalin ”pohjalämpötila”. Kaikkien muiden tulostuslämpötilojen tulee käyttää tähän arvoon perustuvia siirtymiä" #: fdmprinter.def.json msgctxt "build_volume_temperature label" @@ -3219,7 +3220,7 @@ msgstr "Takaisinveto kerroksen muuttuessa" #: fdmprinter.def.json msgctxt "retract_at_layer_change description" msgid "Retract the filament when the nozzle is moving to the next layer." -msgstr "Vedä tulostuslanka takaisin, kun suutin on siirtymässä seuraavaan kerrokseen. " +msgstr "Vedä tulostuslanka takaisin, kun suutin on siirtymässä seuraavaan kerrokseen." #: fdmprinter.def.json msgctxt "retraction_amount label" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index abb74a1cd4..1ed0741285 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2022-07-15 11:16+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" +"X-Generator: Poedit 3.1.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -36,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Pas écrasé" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "Imprimantes connectées" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "Imprimantes préréglées" @@ -54,52 +53,37 @@ 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 !" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visuel" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Le profil visuel est conçu pour imprimer des prototypes et des modèles visuels dans le but d'obtenir une qualité visuelle et de surface élevée." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Le profil d'ingénierie est conçu pour imprimer des prototypes fonctionnels et des pièces finales dans le but d'obtenir une meilleure précision et des tolérances plus étroites." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Ébauche" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "L'ébauche du profil est conçue pour imprimer les prototypes initiaux et la validation du concept dans le but de réduire considérablement le temps d'impression." @@ -109,8 +93,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Matériau personnalisé" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "Personnalisé" @@ -151,8 +134,7 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "Recherche d'emplacement" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Impossible de trouver un emplacement dans le volume d'impression pour tous les objets" @@ -167,10 +149,7 @@ 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 : {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "Sauvegarde" @@ -304,7 +283,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Pas encore initialisé" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -391,9 +370,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Un seul fichier G-Code peut être chargé à la fois. Importation de {0} sautée" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "Avertissement" @@ -404,10 +381,7 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossible d'ouvrir un autre fichier si le G-Code est en cours de chargement. Importation de {0} sautée" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" @@ -473,8 +447,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "Échec de la création de l'archive des matériaux à synchroniser avec les imprimantes." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "Impossible de charger l'archive des matériaux pour la synchroniser avec les imprimantes." @@ -484,9 +457,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "La réponse de Digital Factory semble être corrompue." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "Il manque des informations importantes dans la réponse de Digital Factory." @@ -501,21 +472,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "Échec de la connexion à Digital Factory." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "Le fichier existe déjà" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format 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 ?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de fichier invalide :" @@ -567,8 +535,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Échec de l'importation du profil depuis le fichier {0} :" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -640,8 +607,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "Buse" @@ -661,28 +627,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrudeuse(s) désactivée(s)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "Ajouter" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "Fin" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "Annuler" @@ -753,28 +710,22 @@ msgctxt "@tooltip" msgid "Other" msgstr "Autre" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "Les notes de version n'ont pas pu être ouvertes." -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "Suivant" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "Passer" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" @@ -795,9 +746,7 @@ msgctxt "@action:button" msgid "Sync materials" msgstr "Synchroniser les matériaux" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "En savoir plus" @@ -853,8 +802,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}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Impossible d'ouvrir le fichier de projet" @@ -884,20 +832,19 @@ msgstr "Personnalisé" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "Les matériaux utilisés pour ce projet sont basés sur des définitions de matériaux qui ne sont pas disponibles dans Cura, ce qui peut entraîner des résultats d'impression indésirables. Nous vous recommandons vivement d'installer le package de matériaux complet à partir de la Marketplace." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Les profils de matériaux ne sont pas installés" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Installer des matériaux" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Fichier 3MF" @@ -912,8 +859,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "Il n'y a pas encore d'espace de travail à écrire. Veuillez d'abord ajouter une imprimante." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Aucune autorisation d'écrire l'espace de travail ici." @@ -932,12 +878,12 @@ msgstr "Erreur d'écriture du fichier 3MF." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Impossible de stocker les informations du package de matériaux dans le fichier projet suivant : {material}. Ce projet peut ne pas s'ouvrir correctement sur d'autres systèmes." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Échec de l'enregistrement des informations du package de matériaux" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -989,8 +935,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "La sauvegarde dépasse la taille de fichier maximale." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Une erreur s’est produite lors de la tentative de restauration de votre sauvegarde." @@ -1025,12 +970,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Impossible de découper le matériau actuel, car celui-ci est incompatible avec la machine ou la configuration sélectionnée." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "Impossible de découper" @@ -1071,8 +1012,7 @@ msgstr "" "- Sont affectés à un extrudeur activé\n" "- N sont pas tous définis comme des mailles de modificateur" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Traitement des couches" @@ -1082,8 +1022,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informations" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profil Cura" @@ -1115,8 +1054,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Mettre à jour le firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Fichier G-Code compressé" @@ -1126,9 +1064,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter ne prend pas en charge le mode texte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Fichier GCode" @@ -1138,8 +1074,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Analyse du G-Code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "Détails G-Code" @@ -1159,8 +1094,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter ne prend pas en charge le mode non-texte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Veuillez préparer le G-Code avant d'exporter." @@ -1205,8 +1139,7 @@ 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 ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/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" @@ -1221,14 +1154,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "Synchronisation..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "Refuser" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "Accepter" @@ -1339,8 +1270,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Enregistrer sur un lecteur amovible {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Aucun format de fichier n'est disponible pour écriture !" @@ -1356,8 +1286,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Enregistrement" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1369,8 +1298,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Impossible de trouver un nom de fichier lors d'une tentative d'écriture sur {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1440,8 +1368,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "Pas de couches à afficher" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Ne plus afficher ce message" @@ -1511,17 +1438,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "COLLADA Digital Asset Exchange compressé" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Impossible d'écrire dans le fichier UFP :" @@ -1607,8 +1529,7 @@ 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 :" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1879,8 +1800,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Créer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Résumé - Projet Cura" @@ -1890,20 +1810,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Comment le conflit de la machine doit-il être résolu ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "Paramètres de l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "Groupe d'imprimantes" @@ -1913,34 +1830,27 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Comment le conflit du profil doit-il être résolu ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Paramètres de profil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nom" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Absent du profil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2002,12 +1912,12 @@ msgstr "Ouvrir" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Ouvrir le projet quand même" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Installer le matériau manquant" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2104,10 +2014,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Sauvegardez et synchronisez vos paramètres Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" msgstr "Se connecter" @@ -2115,12 +2022,12 @@ msgstr "Se connecter" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Enregistrer le projet Cura et imprimer le fichier" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Enregistrer le projet Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2297,10 +2204,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "La quantité de lissage à appliquer à l'image." -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -2320,18 +2224,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Taille de la buse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2471,9 +2367,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "Ignorer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2492,7 +2386,7 @@ msgstr "Les packages suivants ne peuvent pas être installés en raison d'une ve #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Installer les matériaux manquants" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2554,8 +2448,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "Quitter %1" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "Installer des matériaux" @@ -2570,8 +2463,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "Vous devez accepter la licence pour installer le package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "En Savoir Plus" @@ -2579,7 +2471,7 @@ msgstr "En Savoir Plus" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Par" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -2666,14 +2558,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "Compatible avec la Material Station" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "Oui" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "Non" @@ -2835,8 +2725,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Sélectionner les paramètres pour personnaliser ce modèle" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrer..." @@ -2878,8 +2767,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "Le script suivant est actif :" msgstr[1] "Les scripts suivants sont actifs :" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "Modèle de couleurs" @@ -2934,8 +2822,7 @@ msgctxt "@label" msgid "Shell" msgstr "Coque" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "Remplissage" @@ -3050,9 +2937,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Modifier" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" @@ -3068,20 +2953,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Si votre imprimante n'apparaît pas dans la liste, lisez le guide de dépannage de l'impression en réseau" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "Version du firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "Adresse" @@ -3111,8 +2993,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Adresse IP non valide" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Veuillez saisir une adresse IP valide." @@ -3122,8 +3003,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Adresse de l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Saisissez l'adresse IP de votre imprimante sur le réseau." @@ -3175,9 +3055,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Si vous sélectionnez « Remplacer », les paramètres de la configuration actuelle de l'imprimante seront utilisés. Cela peut entraîner l'échec de l'impression." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" msgstr "Verre" @@ -3197,8 +3075,7 @@ msgctxt "@label" msgid "Delete" msgstr "Effacer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "Reprendre" @@ -3213,9 +3090,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Reprise..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "Pause" @@ -3255,8 +3130,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Êtes-vous sûr de vouloir annuler %1 ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "Abandonner l'impression" @@ -3266,9 +3140,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Gérer l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Veuillez mettre à jour le Firmware de votre imprimante pour gérer la file d'attente à distance." @@ -3298,9 +3170,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "Inactif" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." msgstr "Préparation..." @@ -3340,17 +3210,13 @@ msgctxt "@label" msgid "First available" msgstr "Premier disponible" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "Abandonné" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "Terminé" @@ -3360,9 +3226,7 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "Abandon..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" @@ -3443,8 +3307,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Se connecter" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "Connectez-vous à la plateforme Ultimaker" @@ -3790,8 +3653,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Afficher le dossier de configuration" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurer la visibilité des paramètres..." @@ -3876,8 +3738,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Ce paquet sera installé après le redémarrage." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "Général" @@ -3887,20 +3748,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Paramètres" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "Imprimantes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "Matériaux" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "Profils" @@ -3910,14 +3768,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Fermeture de %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Voulez-vous vraiment quitter %1 ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "Ouvrir le(s) fichier(s)" @@ -4049,28 +3905,27 @@ msgstr "Bibliothèque de découpe polygone" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "Analyseur JSON" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Fonctions utilitaires, y compris un chargeur d'images" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Bibliothèque d'utilitaires, y compris la génération d'un diagramme Voronoï" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Certificats racines pour valider la fiabilité SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Compatibilité entre Python 2 et Python 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4120,17 +3975,17 @@ msgstr "Bibliothèque de découverte ZeroConf" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Configuration du système de fabrication universel" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Gestionnaire des dépendances et des packages" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Packaging d'applications Python" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4140,7 +3995,7 @@ msgstr "Déploiement d'applications sur multiples distributions Linux" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Génération de programmes d'installation Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -4190,8 +4045,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Modifications actuelles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Toujours me demander" @@ -4268,8 +4122,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Sans titre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Paramètres" @@ -4605,8 +4458,7 @@ msgctxt "@label" msgid "Object list" msgstr "Liste d'objets" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "Rétablir les paramètres par défaut" @@ -4879,8 +4731,7 @@ msgctxt "@info:tooltip" 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." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "Profils" @@ -4965,15 +4816,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "Ajouter un nouveau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "Activer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "Renommer" @@ -4983,14 +4831,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "Matériaux compatibles avec l'imprimante active :" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "Créer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "Importer" @@ -5000,32 +4846,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "Synchroniser les imprimantes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliquer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "Exporter" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmer la suppression" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Êtes-vous sûr de vouloir supprimer l'objet %1 ? Vous ne pourrez pas revenir en arrière !" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "Importer un matériau" @@ -5040,8 +4881,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossible d'importer le matériau %1 : %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "Exporter un matériau" @@ -5091,9 +4931,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "Pour synchroniser automatiquement les profils de matériaux avec toutes vos imprimantes connectées à Digital Factory, vous devez être connecté à Cura." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "Synchroniser les matériaux avec USB" @@ -5113,8 +4951,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "Les profils de matériaux ont été synchronisés avec les imprimantes suivantes :" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "Dépannage" @@ -5139,14 +4976,12 @@ msgctxt "@button" msgid "Try again" msgstr "Réessayer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "Terminé" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "Synchroniser" @@ -5206,8 +5041,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "Comment charger de nouveaux profils de matériaux dans mon imprimante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "Précédent" @@ -5317,9 +5151,7 @@ msgctxt "@title" msgid "Information" msgstr "Informations" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "Paramètres d'impression" @@ -5347,10 +5179,9 @@ msgstr "Mettre à jour le profil." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:143 msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" -msgstr "Mettre à jour le profil avec les paramètres actuels  / forcer " +msgstr "Mettre à jour le profil avec les paramètres actuels/forcer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "Ignorer les modifications actuelles" @@ -5380,8 +5211,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Veuillez fournir un nom pour ce profil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "Exporter un profil" @@ -5396,8 +5226,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "Renommer le profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "Importer un profil" @@ -5454,14 +5283,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "Température jusqu'à laquelle préchauffer l'extrémité chauffante." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Annuler" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "Préchauffer" @@ -5655,17 +5482,17 @@ msgstr "Expérimental" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "le profil personnalisé est actif et vous avez remplacé certains paramètres." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "le profil personnalisé remplace certains paramètres." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Certains paramètres ont été modifiés." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5690,7 +5517,7 @@ msgstr "Un remplissage graduel augmentera la quantité de remplissage vers le ha #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Résolution" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5705,17 +5532,17 @@ msgstr "Générer des structures pour soutenir les parties du modèle qui possè #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "La configuration n'est pas prise en charge" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Aucun profil disponible pour la configuration de matériaux/%1 sélectionnée. Veuillez la modifier." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "En savoir plus" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -5965,8 +5792,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Impossible de se connecter à l'appareil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/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 ?" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 258b36bdc2..335d0d56ed 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -2810,12 +2810,13 @@ msgstr "Active le réglage de l'accélération de la tête d'impression. Augment #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Activer l'accélération de déplacement" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Utilisez un taux d'accélération différent pour les déplacements. Si cette option est désactivée, les déplacements utiliseront la même accélération que" +" celle de la ligne imprimée à l'emplacement cible." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,13 @@ msgstr "Active le réglage de la saccade de la tête d'impression lorsque la vit #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Activer la saccade de déplacement" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Utilisez un taux de saccades différent pour les déplacements. Si cette option est désactivée, les déplacements utiliseront les mêmes saccades que celle" +" de la ligne imprimée à l'emplacement cible." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index ad39d6c85e..5d44db8cb2 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2022-07-15 11:14+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 3.1.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -36,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Non sottoposto a override" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "Stampanti collegate" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "Stampanti preimpostate" @@ -54,52 +53,37 @@ 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 "Rimuovere {0}? Questa operazione non può essere annullata!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visivo" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Il profilo visivo è destinato alla stampa di prototipi e modelli visivi, con l'intento di ottenere una qualità visiva e della superficie elevata." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Il profilo di progettazione è destinato alla stampa di prototipi funzionali e di componenti d'uso finale, allo scopo di ottenere maggiore precisione e tolleranze strette." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Bozza" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Il profilo bozza è destinato alla stampa dei prototipi iniziali e alla convalida dei concept, con l'intento di ridurre in modo significativo il tempo di stampa." @@ -109,8 +93,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Materiale personalizzato" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "Personalizzata" @@ -151,8 +134,7 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "Ricerca posizione" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Impossibile individuare una posizione nel volume di stampa per tutti gli oggetti" @@ -167,10 +149,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Impossibile creare un archivio dalla directory dei dati utente: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "Backup" @@ -304,7 +283,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Non ancora inizializzato" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -391,9 +370,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "È possibile caricare un solo file codice G per volta. Importazione saltata {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "Avvertenza" @@ -404,10 +381,7 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossibile aprire altri file durante il caricamento del codice G. Importazione saltata {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" @@ -473,8 +447,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "Impossibile creare archivio di materiali da sincronizzare con le stampanti." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "Impossibile caricare l'archivio di materiali da sincronizzare con le stampanti." @@ -484,9 +457,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "La risposta da Digital Factory sembra essere danneggiata." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "Nella risposta da Digital Factory mancano informazioni importanti." @@ -501,21 +472,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "Impossibile connettersi a Digital Factory." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "Il file esiste già" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Il file {0} esiste già. Sei sicuro di volerlo sovrascrivere?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "File URL non valido:" @@ -567,8 +535,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Impossibile importare il profilo da {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -640,8 +607,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "Ugello" @@ -661,28 +627,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Estrusore disabilitato" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "Aggiungi" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "Fine" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "Annulla" @@ -753,29 +710,23 @@ msgctxt "@tooltip" msgid "Other" msgstr "Altro" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "Impossibile aprire le note sulla versione." -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "Avanti" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "Salta" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" msgstr "Chiudi" @@ -795,9 +746,7 @@ msgctxt "@action:button" msgid "Sync materials" msgstr "Sincronizza materiali" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "Ulteriori informazioni" @@ -853,8 +802,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Il file di progetto {0} è diventato improvvisamente inaccessibile: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Impossibile aprire il file di progetto" @@ -884,20 +832,19 @@ msgstr "Personalizzata" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +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." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Profili del materiale non installati" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Installa materiali" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "File 3MF" @@ -912,8 +859,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "Ancora nessuna area di lavoro da scrivere. Aggiungere innanzitutto una stampante." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Nessuna autorizzazione di scrittura dell'area di lavoro qui." @@ -932,12 +878,12 @@ msgstr "Errore scrittura file 3MF." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Non è stato possibile memorizzare le informazioni del pacchetto di materiale nel file di progetto: {material}. Questo progetto potrebbe non aprirsi correttamente su altri sistemi." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Impossibile salvare le informazioni del pacchetto di materiale" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -989,8 +935,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Il backup supera la dimensione file massima." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Si è verificato un errore cercando di ripristinare il backup." @@ -1025,12 +970,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Impossibile eseguire il sezionamento con il materiale corrente in quanto incompatibile con la macchina o la configurazione selezionata." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "Sezionamento impossibile" @@ -1071,8 +1012,7 @@ msgstr "" "- Sono assegnati a un estrusore abilitato\n" "- Non sono tutti impostati come maglie modificatore" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Elaborazione dei livelli" @@ -1082,8 +1022,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informazioni" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profilo Cura" @@ -1115,8 +1054,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Aggiornamento firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "File G-Code compresso" @@ -1126,9 +1064,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter non supporta la modalità di testo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "File G-Code" @@ -1138,8 +1074,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Parsing codice G" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "Dettagli codice G" @@ -1159,8 +1094,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter non supporta la modalità non di testo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Preparare il codice G prima dell’esportazione." @@ -1205,8 +1139,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Desiderate sincronizzare pacchetti materiale e software con il vostro account?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Modifiche rilevate dal tuo account Ultimaker" @@ -1221,14 +1154,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "Sincronizzazione in corso..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "Non accetto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "Accetta" @@ -1339,8 +1270,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Salva su unità rimovibile {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Non ci sono formati di file disponibili per la scrittura!" @@ -1356,8 +1286,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Salvataggio in corso" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1369,8 +1298,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Impossibile trovare un nome file durante il tentativo di scrittura su {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1440,8 +1368,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "Nessun layer da visualizzare" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Non mostrare nuovamente questo messaggio" @@ -1511,17 +1438,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Compressed COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacchetto formato Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Impossibile scrivere nel file UFP:" @@ -1607,8 +1529,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Questa stampante non è collegata a Digital Factory:" msgstr[1] "Queste stampanti non sono collegate a Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1879,8 +1800,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Crea nuovo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Riepilogo - Progetto Cura" @@ -1890,20 +1810,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Come può essere risolto il conflitto nella macchina?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "Impostazioni della stampante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "Gruppo stampanti" @@ -1913,34 +1830,27 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Come può essere risolto il conflitto nel profilo?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Impostazioni profilo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nome" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Non nel profilo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2002,12 +1912,12 @@ msgstr "Apri" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Apri il progetto comunque" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Installa materiale mancante" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2104,9 +2014,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Backup e sincronizzazione delle impostazioni Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" @@ -2115,12 +2023,12 @@ msgstr "Accedi" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Salva progetto Cura e stampa file" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Salva progetto Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2297,10 +2205,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "La quantità di smoothing (levigatura) da applicare all'immagine." -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -2320,18 +2225,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Dimensione ugello" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2471,9 +2368,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "Rimuovi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2492,7 +2387,7 @@ msgstr "Impossibile installare i seguenti pacchetti a causa di una versione di C #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Installa materiali mancanti" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2554,8 +2449,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "Chiudere %1" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "Installa materiali" @@ -2570,8 +2464,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "È necessario accettare la licenza per installare il pacchetto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "Ulteriori Informazioni" @@ -2579,7 +2472,7 @@ msgstr "Ulteriori Informazioni" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Per mezzo di" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -2666,14 +2559,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "Compatibile con Material Station" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "Sì" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "No" @@ -2836,8 +2727,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Seleziona impostazioni di personalizzazione per questo modello" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtro..." @@ -2879,8 +2769,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "È attivo il seguente script:" msgstr[1] "Sono attivi i seguenti script:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "Schema colori" @@ -2935,8 +2824,7 @@ msgctxt "@label" msgid "Shell" msgstr "Guscio" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "Riempimento" @@ -3051,9 +2939,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Modifica" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" @@ -3069,20 +2955,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se la stampante non è nell’elenco, leggere la guida alla risoluzione dei problemi per la stampa in rete" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "Versione firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "Indirizzo" @@ -3112,8 +2995,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Indirizzo IP non valido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Inserire un indirizzo IP valido." @@ -3123,8 +3005,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Indirizzo stampante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Inserire l'indirizzo IP della stampante in rete." @@ -3176,9 +3057,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "L’override utilizza le impostazioni specificate con la configurazione stampante esistente. Ciò può causare una stampa non riuscita." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" msgstr "Vetro" @@ -3198,8 +3077,7 @@ msgctxt "@label" msgid "Delete" msgstr "Cancella" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "Riprendi" @@ -3214,9 +3092,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Ripresa in corso..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "Pausa" @@ -3256,8 +3132,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Sei sicuro di voler interrompere %1?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "Interrompi la stampa" @@ -3267,9 +3142,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Gestione stampanti" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Aggiornare il firmware della stampante per gestire la coda da remoto." @@ -3299,9 +3172,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "Ferma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." msgstr "Preparazione in corso..." @@ -3341,17 +3212,13 @@ msgctxt "@label" msgid "First available" msgstr "Primo disponibile" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "Interrotto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "Terminato" @@ -3361,9 +3228,7 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "Interr. in corso..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" @@ -3444,8 +3309,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Accedi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "Accedi alla piattaforma Ultimaker" @@ -3791,8 +3655,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostra cartella di configurazione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configura visibilità delle impostazioni..." @@ -3877,8 +3740,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Questo pacchetto sarà installato dopo il riavvio." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "Generale" @@ -3888,20 +3750,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Impostazioni" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "Stampanti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "Materiali" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "Profili" @@ -3911,14 +3770,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Chiusura di %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Chiudere %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "Apri file" @@ -4050,28 +3907,27 @@ msgstr "Libreria ritaglio poligono" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "Analizzatore JSON" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Funzioni di utilità, tra cui un caricatore di immagini" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Libreria utilità, tra cui generazione diagramma Voronoi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Certificati di origine per la convalida dell'affidabilità SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Compatibilità tra Python 2 e 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4121,17 +3977,17 @@ msgstr "Libreria scoperta ZeroConf" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Configurazione universale del sistema di build" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Gestore della dipendenza e del pacchetto" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Pacchetto applicazioni Python" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4141,7 +3997,7 @@ msgstr "Apertura applicazione distribuzione incrociata Linux" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Generazione installatori Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -4191,8 +4047,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Modifiche correnti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Chiedi sempre" @@ -4269,8 +4124,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Senza titolo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Impostazioni" @@ -4606,8 +4460,7 @@ msgctxt "@label" msgid "Object list" msgstr "Elenco oggetti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "Valori predefiniti" @@ -4880,8 +4733,7 @@ msgctxt "@info:tooltip" 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 "Dopo aver modificato un profilo ed essere passati a un altro, si apre una finestra di dialogo che chiede se mantenere o eliminare le modifiche oppure se scegliere un comportamento predefinito e non visualizzare più tale finestra di dialogo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "Profili" @@ -4966,15 +4818,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "Aggiungi nuovo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "Attiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "Rinomina" @@ -4984,14 +4833,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "Materiali compatibili con la stampante attiva:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "Crea nuovo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "Importa" @@ -5001,32 +4848,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "Sincronizza con le stampanti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplica" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "Esporta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Conferma rimozione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Sei sicuro di voler rimuovere %1? Questa operazione non può essere annullata!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "Importa materiale" @@ -5041,8 +4883,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossibile importare materiale {1}: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "Esporta materiale" @@ -5092,9 +4933,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "Per sincronizzare automaticamente i profili del materiale con tutte le stampanti collegate a Digital Factory è necessario aver effettuato l'accesso a Cura." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "Sincronizza materiali con USB" @@ -5114,8 +4953,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "I profili del materiale sono stati sincronizzati correttamente con le stampanti seguenti:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "Ricerca e riparazione dei guasti" @@ -5140,14 +4978,12 @@ msgctxt "@button" msgid "Try again" msgstr "Riprova" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "Eseguito" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "Sincronizza" @@ -5207,8 +5043,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "Come caricare nuovi profili del materiale nella stampante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "Indietro" @@ -5318,9 +5153,7 @@ msgctxt "@title" msgid "Information" msgstr "Informazioni" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "Impostazioni di stampa" @@ -5350,8 +5183,7 @@ msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" msgstr "Aggiorna il profilo con le impostazioni/esclusioni correnti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "Elimina le modifiche correnti" @@ -5381,8 +5213,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Indica un nome per questo profilo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "Esporta profilo" @@ -5397,8 +5228,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "Rinomina profilo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "Importa profilo" @@ -5455,14 +5285,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "La temperatura di preriscaldo dell’estremità calda." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Annulla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "Pre-riscaldo" @@ -5656,17 +5484,17 @@ msgstr "Sperimentale" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "il profilo personalizzato è attivo e sono state sovrascritte alcune impostazioni." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "il profilo personalizzato sta sovrascrivendo alcune impostazioni." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Alcune impostazioni sono state modificate." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5691,7 +5519,7 @@ msgstr "Un riempimento graduale aumenterà gradualmente la quantità di riempime #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Risoluzione" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5706,17 +5534,17 @@ msgstr "Genera strutture per supportare le parti del modello a sbalzo. Senza que #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Configurazione non supportata" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Nessun profilo disponibile per la configurazione del materiale /%1 selezionato/a. Modifica la configurazione." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Ulteriori informazioni" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -5966,8 +5794,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Impossibile connettersi al dispositivo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/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?" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 10ee6bd2b5..3e1475c345 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -2810,12 +2810,13 @@ msgstr "Abilita la regolazione dell’accelerazione della testina di stampa. Aum #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Abilita Accelerazione spostamenti" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Utilizza un tasso di accelerazione separato per i movimenti di spostamento. Se disabilitata, i movimenti di spostamento utilizzeranno il valore di accelerazione" +" della linea stampata alla destinazione." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,13 @@ msgstr "Abilita la regolazione del jerk della testina di stampa quando la veloci #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Abilita jerk spostamenti" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Utilizza un tasso di jerk distinto per i movimenti di spostamento. Se disabilitato, i movimenti di spostamento utilizzeranno il valore di jerk della linea" +" stampata alla destinazione." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 0055039355..3b8a803160 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -304,7 +304,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "初期化されていません" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -884,17 +884,17 @@ msgstr "カスタム" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "このプロジェクトで使用される材料にはCuraで利用できないいくつかの材料コードが使用されているため、望ましくないプリント結果になる可能性があります。Marketplaceから材料パッケージ一式をインストールすることを強くお勧めします。" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "材料プロファイルがインストールされていません" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "材料のインストール" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -932,12 +932,12 @@ msgstr "3Mf ファイルの書き込みエラー。" #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "材料パッケージ情報をプロジェクトファイル({material})に保存できませんでした。このプロジェクトは、他のシステムでは正しく開けない可能性があります。" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "材料パッケージ情報を保存できませんでした" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -1993,12 +1993,12 @@ msgstr "開く" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "それでもプロジェクトを開く" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "未ダウンロードの材料をインストールする" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2106,12 +2106,12 @@ msgstr "サインイン" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Curaプロジェクトとプリントファイルを保存する" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Curaプロジェクトを保存する" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2483,7 +2483,7 @@ msgstr "次のパッケージは、Curaバージョンに互換性がないた #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "未ダウンロードの材料をインストールする" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2570,7 +2570,7 @@ msgstr "詳しく見る" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "作成者" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4036,28 +4036,28 @@ msgstr "ポリゴンクリッピングライブラリー" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON解析プログラム" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "画像ローダーなどを含むユーティリティ機能" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "ボロノイ図生成を含むユーティリティライブラリ" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "SSLの信頼性を検証するためのルート証明書" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Python2および3との互換性" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4107,17 +4107,17 @@ msgstr "ZeroConfディスカバリーライブラリー" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "ユニバーサルビルドシステム設定" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "パッケージ管理システム" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Pythonアプリケーションのパッケージ化" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4127,7 +4127,7 @@ msgstr "Linux 分散アプリケーションの開発" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Windowsインストーラーの生成" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5636,17 +5636,17 @@ msgstr "実験" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "カスタムプロファイルが稼働し、一部の設定を上書きしました。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "カスタムプロファイルが一部の設定を上書き中です。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "一部の設定が変更されました。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5671,7 +5671,7 @@ msgstr "グラデュアルインフィルはトップに向かうに従ってイ #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "解像度" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5686,17 +5686,17 @@ msgstr "オーバーハングがあるモデルにサポートを生成します #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "サポートされていない構成設定です" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "選択した/%1材料の設定で利用可能なプロファイルがありません。設定を変更してください。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "詳細を見る" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 5f8f0457aa..ab84fac3be 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:12+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index d50a3a49ba..8140193034 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -2814,12 +2814,12 @@ msgstr "プリントヘッドのスピード調整の有効化 加速度の増 #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "プリントヘッド加速(トラベルアクセラレーション)を有効にする" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "プリントヘッド移動に異なる加速度レートを使用します。これを無効にすると、プリントヘッドの移動速度は印刷範囲で加速されずに同じ速度が使用されます。" #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3014,12 +3014,12 @@ msgstr "X または Y 軸の速度が変更する際、プリントヘッドの #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "トラベルジャークを有効にする" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "プリントヘッドの移動に異なるジャーク値を使用します。これを無効にすると、印刷範囲で設定されたジャーク値を使用します。" #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 0b514a135d..3af8f757de 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -304,7 +304,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "아직 초기화되지 않음" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -884,17 +884,17 @@ msgstr "사용자 정의" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "이 프로젝트에 사용된 재료는 Cura에서 지원하지 않는 재료로 원하지 않는 3D 출력물을 생산할 수도 있습니다. Marketplace의 전체 재료 패키지를 설치하는 것을 권장합니다." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "재료 프로파일이 설치되지 않음" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "재료 설치" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -932,12 +932,12 @@ msgstr "3MF 파일 작성 중 오류." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "프로젝트 파일에 재료 패키지 정보를 저장할 수 없습니다: {material}. 이 프로젝트는 다른 시스템에서 제대로 열리지 않을 수 있습니다." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "재료 패키지 정보를 저장하는 데 실패함" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -1993,12 +1993,12 @@ msgstr "열기" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "무시하고 프로젝트 열기" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "누락된 재료 설치하기" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2106,12 +2106,12 @@ msgstr "로그인" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Cura 프로젝트 저장하고 파일 프린팅하기" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Cura 프로젝트 저장하기" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2483,7 +2483,7 @@ msgstr "호환되지 않는 Cura 버전이기 때문에 다음 패키지를 설 #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "누락된 재료 설치하기" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2570,7 +2570,7 @@ msgstr "자세히 알아보기" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "사용" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4037,28 +4037,28 @@ msgstr "다각형 클리핑 라이브러리" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON parser" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "이미지 로더를 포함한 유틸리티 기능" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Voronoi 세대를 포함한 유틸리티 라이브러리" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "SSL 신뢰성 검증용 루트 인증서" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Python 2 및 3 간의 호환성" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4108,17 +4108,17 @@ msgstr "ZeroConf discovery 라이브러리" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "범용 빌드 시스템 설정" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "의존성 및 패키지 관리자" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Python 애플리케이션 패키지 생성 중" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4128,7 +4128,7 @@ msgstr "Linux 교차 배포 응용 프로그램 배포" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Windows 설치 관리자 생성 중" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5638,17 +5638,17 @@ msgstr "실험적 설정" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "사용자 정의 프로파일을 활성화하고 일부 설정을 덮어썼습니다." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "사용자 정의 프로파일이 일부 설정을 무시합니다." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "일부 설정이 변경되었습니다." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5673,7 +5673,7 @@ msgstr "점차적인 내부채움은 점차적으로 빈 공간 채우기의 양 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "해상도" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5688,17 +5688,17 @@ msgstr "오버행이 있는 모델 서포트를 생성합니다. 이러한 구 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "지원되지 않는 설정" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "선택한 재료/%1 설정에 대해 사용할 수 있는 프로파일이 없습니다. 설정을 변경하십시오." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "자세히 알아보기" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 9558e8171b..7dab5e39d7 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -2810,12 +2810,12 @@ msgstr "프린트 헤드 가속도를 활성화 합니다. 가속도를 높이 #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "이동 가속 활성화" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "이동할 때 별도의 가속도를 사용합니다. 비활성화된 경우 이동 시 프린팅된 라인의 목적지 기준 가속도 값을 사용합니다." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3010,12 @@ msgstr "X 또는 Y 축의 속도가 변경 될 때 프린트 헤드의 속도를 #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "이동 저크 활성화" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "이동할 때 별도의 저크 속도를 사용합니다. 비활성화된 경우 이동 시 프린팅된 라인의 목적지 기준 저크 값을 사용합니다." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index f9947cef85..03f790cbaa 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2022-07-15 11:10+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 3.1.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -36,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Niet overschreven" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "Verbonden printers" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "Vooraf ingestelde printers" @@ -54,52 +53,37 @@ 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 "Weet u zeker dat u {0} wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visueel" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Het visuele profiel is ontworpen om visuele prototypen en modellen te printen met als doel een hoge visuele en oppervlaktekwaliteit te creëren." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Het engineeringprofiel is ontworpen om functionele prototypen en onderdelen voor eindgebruik te printen met als doel een grotere precisie en nauwere toleranties." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Ontwerp" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Het ontwerpprofiel is ontworpen om initiële prototypen en conceptvalidatie te printen met als doel de printtijd aanzienlijk te verkorten." @@ -109,8 +93,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Aangepast materiaal" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "Aangepast" @@ -151,8 +134,7 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "Locatie vinden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Kan binnen het werkvolume niet voor alle objecten een locatie vinden" @@ -167,10 +149,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Kan geen archief maken van gegevensmap van gebruiker: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "Back-up" @@ -304,7 +283,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Nog niet geïnitialiseerd" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -391,9 +370,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Er kan slechts één G-code-bestand tegelijkertijd worden geladen. Het importeren van {0} is overgeslagen" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "Waarschuwing" @@ -404,10 +381,7 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Kan geen ander bestand openen als G-code wordt geladen. Het importeren van {0} is overgeslagen" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" @@ -473,8 +447,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "Kan geen materiaalarchief maken voor synchronisatie met printers." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "Kan het materiaalarchief niet laden voor synchronisatie met printers." @@ -484,9 +457,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "Antwoord van Digital Factor is mogelijk beschadigd." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "In het antwoord van Digital Factory ontbreekt belangrijke informatie." @@ -501,21 +472,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "Kan geen verbinding maken met Digital Factory." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "Het Bestand Bestaat Al" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Het bestand {0} bestaat al. Weet u zeker dat u dit bestand wilt overschrijven?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ongeldige bestands-URL:" @@ -567,8 +535,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Kan het profiel niet importeren uit {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -640,8 +607,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" @@ -661,28 +627,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder(s) uitgeschakeld" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "Toevoegen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "Voltooien" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "Annuleren" @@ -753,28 +710,22 @@ msgctxt "@tooltip" msgid "Other" msgstr "Overig(e)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "De release notes konden niet worden geopend." -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "Volgende" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "Overslaan" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" @@ -793,11 +744,9 @@ msgstr "Nieuwe materialen geïnstalleerd" #: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:74 msgctxt "@action:button" msgid "Sync materials" -msgstr "Materialen synchroniseren..." +msgstr "Materialen synchroniseren" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "Meer informatie" @@ -853,8 +802,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Projectbestand {0} is plotseling ontoegankelijk: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Kan projectbestand niet openen" @@ -884,20 +832,19 @@ msgstr "Aangepast" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "Het materiaal dat in dit project wordt gebruikt, vertrouwt op materiaaldefinities die niet beschikbaar zijn in Cura, waardoor dit mogelijk tot ongewenste printresultaten leidt. We raden u ten zeerste aan om het volledige materiaalpakket te installeren van de marktplaats." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Materiaalprofielen niet geïnstalleerd" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Materialen installeren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-bestand" @@ -912,8 +859,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "Er is nog geen werkruimte om te schrijven. Voeg eerst een printer toe." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Geen bevoegdheid om de werkruimte hier te schrijven." @@ -932,12 +878,12 @@ msgstr "Fout bij het schrijven van het 3mf-bestand." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Het was niet mogelijk om de informatie van het materiaalpakket in het volgende projectbestand op te slaan: {material}. Dit project wordt op andere systemen mogelijk niet goed geopend." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Opslaan informatie materiaalpakket mislukt" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -989,8 +935,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "De back-up is groter dan de maximale bestandsgrootte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Er is een fout opgetreden tijdens het herstellen van uw back-up." @@ -1025,12 +970,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Met het huidige materiaal is slicen niet mogelijk, omdat het materiaal niet compatibel is met de geselecteerde machine of configuratie." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "Kan niet slicen" @@ -1071,8 +1012,7 @@ msgstr "" "- zijn toegewezen aan een ingeschakelde extruder\n" "- niet allemaal zijn ingesteld als modificatierasters" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Lagen verwerken" @@ -1082,8 +1022,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informatie" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiel" @@ -1115,8 +1054,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Firmware bijwerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Gecomprimeerd G-code-bestand" @@ -1126,9 +1064,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter ondersteunt geen tekstmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code-bestand" @@ -1138,8 +1074,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-code parseren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "Details van de G-code" @@ -1159,8 +1094,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter ondersteunt geen non-tekstmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Bereid voorafgaand aan het exporteren G-code voor." @@ -1205,8 +1139,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Wilt u materiaal- en softwarepackages synchroniseren met uw account?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Wijzigingen gedetecteerd van uw Ultimaker-account" @@ -1221,14 +1154,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "Synchroniseren ..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "Nee, ik ga niet akkoord" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "Akkoord" @@ -1339,8 +1270,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Opslaan op Verwisselbaar Station {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Er zijn geen bestandsindelingen beschikbaar om te schrijven!" @@ -1356,8 +1286,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Opslaan" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1369,8 +1298,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Kan geen bestandsnaam vinden tijdens het schrijven naar {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1440,8 +1368,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "Geen lagen om weer te geven" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Dit bericht niet meer weergeven" @@ -1511,17 +1438,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Gecomprimeerde COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Kan niet naar UFP-bestand schrijven:" @@ -1607,8 +1529,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Deze printer is niet gekoppeld aan de Digital Factory:" msgstr[1] "Deze printers zijn niet gekoppeld aan de Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1879,8 +1800,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Nieuw maken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Samenvatting - Cura-project" @@ -1890,20 +1810,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Hoe dient het conflict in de machine te worden opgelost?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "Printerinstellingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "Printergroep" @@ -1913,34 +1830,27 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Hoe dient het conflict in het profiel te worden opgelost?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Profielinstellingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Naam" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Niet in profiel" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2002,12 +1912,12 @@ msgstr "Openen" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Project toch openen" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Ontbrekend materiaal installeren" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2104,10 +2014,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Maak een back-up van uw Cura-instellingen en synchroniseer deze." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" msgstr "Aanmelden" @@ -2115,12 +2022,12 @@ msgstr "Aanmelden" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Cura-project opslaan en bestand printen" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Cura-project opslaan" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2200,7 +2107,7 @@ msgstr "Firmware-update mislukt door ontbrekende firmware." #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:14 msgctxt "@title:window" msgid "Convert Image" -msgstr "Afbeelding converteren..." +msgstr "Afbeelding converteren" #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:33 msgctxt "@action:label" @@ -2297,10 +2204,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "De mate van effening die op de afbeelding moet worden toegepast." -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -2320,18 +2224,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Maat nozzle" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2471,9 +2367,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "Verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2492,7 +2386,7 @@ msgstr "De volgende packages kunnen niet worden geïnstalleerd omdat de Cura-ver #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Ontbrekend materiaal installeren" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2554,8 +2448,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "Sluit %1" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "Materialen installeren" @@ -2570,8 +2463,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "U moet de licentie accepteren om de package te installeren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "Meer Informatie" @@ -2579,7 +2471,7 @@ msgstr "Meer Informatie" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Door" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -2666,14 +2558,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "Compatibel met Material Station" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "Ja" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "Nee" @@ -2836,8 +2726,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Instellingen Selecteren om Dit Model Aan te Passen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filteren..." @@ -2879,8 +2768,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "Het volgende script is actief:" msgstr[1] "De volgende scripts zijn actief:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "Kleurenschema" @@ -2935,8 +2823,7 @@ msgctxt "@label" msgid "Shell" msgstr "Shell" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "Vulling" @@ -3051,10 +2938,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Bewerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" msgstr "Verwijderen" @@ -3069,20 +2953,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Raadpleeg de handleiding voor probleemoplossing bij printen via het netwerk als uw printer niet in de lijst wordt vermeld" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "Firmwareversie" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "Adres" @@ -3112,8 +2993,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Ongeldig IP-adres" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Voer een geldig IP-adres in." @@ -3123,8 +3003,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Printeradres" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Voer het IP-adres van uw printer in het netwerk in." @@ -3176,9 +3055,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Met het overschrijven worden de opgegeven instellingen gebruikt met de bestaande printerconfiguratie. De print kan hierdoor mislukken." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" msgstr "Glas" @@ -3198,8 +3075,7 @@ msgctxt "@label" msgid "Delete" msgstr "Verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "Hervatten" @@ -3214,9 +3090,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Hervatten..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "Pauzeren" @@ -3256,8 +3130,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Weet u zeker dat u %1 wilt afbreken?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "Printen afbreken" @@ -3267,9 +3140,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Printer beheren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Werk de firmware van uw printer bij om de wachtrij op afstand te beheren." @@ -3299,9 +3170,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "Inactief" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." msgstr "Voorbereiden..." @@ -3341,17 +3210,13 @@ msgctxt "@label" msgid "First available" msgstr "Eerst beschikbaar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "Afgebroken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "Gereed" @@ -3361,9 +3226,7 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "Afbreken..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" @@ -3444,8 +3307,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Aanmelden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "Meld u aan op het Ultimaker-platform" @@ -3791,8 +3653,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Open Configuratiemap" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Zichtbaarheid Instelling Configureren..." @@ -3877,8 +3738,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Dit package wordt na opnieuw starten geïnstalleerd." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "Algemeen" @@ -3888,20 +3748,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Instellingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "Printers" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "Materialen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "Profielen" @@ -3911,14 +3768,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1 wordt gesloten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Weet u zeker dat u %1 wilt afsluiten?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "Bestand(en) openen" @@ -4050,28 +3905,27 @@ msgstr "Bibliotheek met veelhoeken" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON-parser" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Gebruiksfuncties, waaronder een afbeeldinglader" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Gebruiksbibliotheek, waaronder Voronoi-generatie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Rootcertificaten voor het valideren van SSL-betrouwbaarheid" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Compatibiliteit tussen Python 2 en 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4121,17 +3975,17 @@ msgstr "ZeroConf-detectiebibliotheek" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Universele configuratie bouwsysteem" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Afhankelijkheden- en pakketbeheer" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Verpakking Python-toepassingen" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4141,7 +3995,7 @@ msgstr "Implementatie van Linux-toepassing voor kruisdistributie" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Windows-installatieprogramma's genereren" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -4191,8 +4045,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Huidige wijzigingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Altijd vragen" @@ -4269,8 +4122,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Zonder titel" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "In&stellingen" @@ -4606,8 +4458,7 @@ msgctxt "@label" msgid "Object list" msgstr "Lijst met objecten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "Standaardwaarden" @@ -4880,8 +4731,7 @@ msgctxt "@info:tooltip" 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 "Wanneer u wijzigingen hebt aangebracht aan een profiel en naar een ander profiel wisselt, wordt een dialoogvenster weergegeven waarin u wordt gevraagd of u de aanpassingen wilt behouden. U kunt ook een standaardgedrag kiezen en het dialoogvenster nooit meer laten weergeven." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "Profielen" @@ -4966,15 +4816,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "Nieuwe toevoegen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "Activeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "Hernoemen" @@ -4984,14 +4831,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "Materialen die compatibel zijn met actieve printer:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "Nieuw maken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "Importeren" @@ -5001,32 +4846,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "Synchroniseren met printers" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliceren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "Exporteren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Verwijderen Bevestigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Weet u zeker dat u %1 wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "Materiaal Importeren" @@ -5041,8 +4881,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Kon materiaal %1 niet importeren: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "Materiaal Exporteren" @@ -5092,9 +4931,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "Om de materiaalprofielen automatisch te synchroniseren met alle printers die op Digital Factory zijn aangesloten, moet u zich aanmelden bij Cura." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "Materialen synchroniseren met USB" @@ -5114,8 +4951,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "Materiaalprofielen zijn gesynchroniseerd met de volgende printers:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "Probleemoplossing" @@ -5140,14 +4976,12 @@ msgctxt "@button" msgid "Try again" msgstr "Probeer het opnieuw" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "Klaar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "Synchroniseren" @@ -5207,8 +5041,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "Hoe u nieuwe materiaalprofielen laadt op Mijn printer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "Terug" @@ -5318,9 +5151,7 @@ msgctxt "@title" msgid "Information" msgstr "Informatie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "Instellingen voor printen" @@ -5350,8 +5181,7 @@ msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" msgstr "Profiel bijwerken met huidige instellingen/overschrijvingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "Huidige wijzigingen verwijderen" @@ -5381,8 +5211,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geef een naam op voor dit profiel." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiel Exporteren" @@ -5397,8 +5226,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "Profiel Hernoemen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiel Importeren" @@ -5455,14 +5283,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "De temperatuur waarnaar het hotend moet worden voorverwarmd." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Annuleren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "Voorverwarmen" @@ -5656,17 +5482,17 @@ msgstr "Experimenteel" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "aangepast profiel is actief en u hebt bepaalde instellingen overschreven." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "aangepast profiel overschrijft bepaalde instellingen." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Bepaalde instellingen zijn gewijzigd." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5691,7 +5517,7 @@ msgstr "Met geleidelijke vulling neemt de hoeveelheid vulling naar boven toe." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Resolutie" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5706,17 +5532,17 @@ msgstr "Genereer structuren om delen van het model met overhang te ondersteunen. #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Configuratie niet ondersteund" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Er zijn geen profielen beschikbaar voor de geselecteerde materiaal/%1-configuratie. Wijzig uw configuratie." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Meer informatie" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -5966,8 +5792,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Kan geen verbinding maken met het apparaat." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/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?" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 025cf9ee0f..9d579bc7c2 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -2810,12 +2810,12 @@ msgstr "Hiermee stelt u de printkopacceleratie in. Door het verhogen van de acce #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Bewegingsacceleratie inschakelen" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Gebruik een andere acceleratiesnelheid voor bewegingen. Indien uitgeschakeld, gebruikt de beweging de acceleratiewaarde van de geprinte lijn op de bestemming." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3010,12 @@ msgstr "Hiermee stelt u de schok van de printkop in wanneer de snelheid in de X- #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Bewegingsschok inschakelen" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Gebruik een andere bewegingsschok voor bewegingen. Indien uitgeschakeld, gebruikt de beweging de bewegingsschokwaarde van de geprinte lijn op de bestemming." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index ecf80a2459..875f06c8c9 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 5.0\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: 2022-04-28 03:56+0200\n" +"PO-Revision-Date: 2022-07-04 04:14+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -37,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Não sobreposto" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "Impressoras conectadas" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "Impressoras pré-ajustadas" @@ -55,52 +53,38 @@ 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 "Tem certeza que deseja remover {0}? Isto não pode ser defeito!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visual" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "O perfil visual é projetado para imprimir protótipos e modelos virtuais com o objetivo de alta qualidade visual e de superfície." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engenharia" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "O perfil de engenharia é projetado para imprimir protótipos funcionais e partes de uso final com o objetivo de melhor precisão e tolerâncias mais estritas." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Rascunho" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "O perfil de rascunho é projetado para imprimir protótipos iniciais e validações de conceito com o objetivo de redução significativa de tempo de impressão." @@ -110,8 +94,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Material Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -152,8 +135,7 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "Buscando Localização" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Não foi possível achar um lugar dentro do volume de construção para todos os objetos" @@ -168,10 +150,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Não pude criar arquivo do diretório de dados de usuário: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "Backup" @@ -305,7 +284,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Ainda não inicializado" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -392,9 +371,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Somente um arquivo G-Code pode ser carregado por vez. Pulando importação de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -405,11 +382,8 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir nenhum outro arquivo se G-Code estiver sendo carregado. Pulando importação de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -474,8 +448,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "Falha em criar arquivo de materiais para sincronizar com impressoras." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "Falha em carregar o arquivo de materiais para sincronizar com impressoras." @@ -485,9 +458,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "A resposta da Digital Factory parece estar corrompida." -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "A resposta da Digital Factory veio sem informações importantes." @@ -502,21 +473,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "Falha em conectar à Digital Factory." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O arquivo {0} já existe. Tem certeza que quer sobrescrevê-lo?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de arquivo inválida:" @@ -568,8 +536,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -641,8 +608,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "Bico" @@ -662,28 +628,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) Desabilitado(s)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "Finalizar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" @@ -754,29 +711,23 @@ msgctxt "@tooltip" msgid "Other" msgstr "Outros" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "As notas de lançamento não puderam ser abertas." -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "Próximo" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "Pular" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" msgstr "Fechar" @@ -796,9 +747,7 @@ msgctxt "@action:button" msgid "Sync materials" msgstr "Sincronizar materiais" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "Saiba mais" @@ -854,8 +803,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "O arquivo de projeto {0} tornou-se subitamente inacessível: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Não Foi Possível Abrir o Arquivo de Projeto" @@ -885,20 +833,19 @@ msgstr "Personalizado" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "O material usado neste projeto depende de algumas definições de material não disponíveis no Cura e isto pode produzir resultados de impressão indesejáveis. Recomendamos altamente instalar o pacote completo de material do Marketplace." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Perfis de material não instalados" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Instalar Materiais" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Arquivo 3MF" @@ -913,8 +860,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "Não existe espaço de trabalho ainda para a escrita. Por favor adicione uma impressora primeiro." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Sem permissão para gravar o espaço de trabalho aqui." @@ -933,12 +879,12 @@ msgstr "Erro ao escrever arquivo 3mf." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Não foi possível armazenar informação do pacote de material no arquivo de projeto: {material}. Este projeto pode não abrir corretamente em outros sistemas." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Falha em salvar informação de pacote de material" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -990,8 +936,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "O backup excede o tamanho máximo de arquivo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Houve um erro ao tentar restaurar seu backup." @@ -1026,12 +971,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Não foi possível fatiar com o material atual visto que é incompatível com a máquina ou configuração selecionada." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "Não foi possível fatiar" @@ -1072,8 +1013,7 @@ msgstr "" "- Estão associados a um extrusor habilitado\n" "- Não estão todos configurados como malhas de modificação" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Processando Camadas" @@ -1083,8 +1023,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informação" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil do Cura" @@ -1116,8 +1055,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Atualizar Firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Arquivo de G-Code Comprimido" @@ -1127,9 +1065,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "O GCodeGzWriter não suporta modo binário." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Arquivo G-Code" @@ -1139,8 +1075,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Interpretando G-Code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "Detalhes do G-Code" @@ -1160,8 +1095,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "O GCodeWriter não suporta modo binário." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Por favor prepare o G-Code antes de exportar." @@ -1206,8 +1140,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Você quer sincronizar os pacotes de material e software com sua conta?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/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" @@ -1222,14 +1155,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "Sincronizando..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "Recusar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "Concordar" @@ -1340,8 +1271,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Salvar em Unidade Removível {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Não há formatos de arquivo disponíveis com os quais escrever!" @@ -1357,8 +1287,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Salvando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1370,8 +1299,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Não foi possível encontrar nome de arquivo ao tentar escrever em {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1441,8 +1369,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "Não há camadas a exibir" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Não mostrar essa mensagem novamente" @@ -1512,16 +1439,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Câmbio de Ativos Digitais COLLADA Comprimido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacote de Formato da Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 #: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" @@ -1608,8 +1531,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Esta impressora não está ligada à Digital Factory:" msgstr[1] "Estas impressoras não estão ligadas à Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1880,8 +1802,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Criar novos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Resumo - Projeto do Cura" @@ -1891,20 +1812,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Como o conflito na máquina deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "Ajustes da impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo de Impressora" @@ -1914,34 +1832,28 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Como o conflito no perfil deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes de perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "Nome" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "Objetivo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "Ausente no perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2003,12 +1915,12 @@ msgstr "Abrir" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Abrir o projeto mesmo assim" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Instalar material faltante" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2105,9 +2017,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Fazer backup e sincronizar os ajustes do Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" @@ -2116,12 +2026,12 @@ msgstr "Entrar" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Salvar o projeto Cura e imprimir o arquivo" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Salvar o projeto Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2298,10 +2208,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "A quantidade de suavização para aplicar na imagem." -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "Ok" @@ -2321,18 +2228,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Tamanho do bico" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2472,9 +2371,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "Dispensar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2493,7 +2390,7 @@ msgstr "Os seguintes pacotes não podem ser instalados por incompatibilidade de #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Instalar Materiais faltantes" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2555,8 +2452,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "Sair de %1" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "Instalar Materiais" @@ -2571,8 +2467,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "Você precisa aceitar a licença para que o pacote possa ser instalado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "Saiba mais" @@ -2580,7 +2475,7 @@ msgstr "Saiba mais" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Por" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -2667,14 +2562,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "Compatível com Material Station" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "Sim" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "Não" @@ -2837,8 +2730,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar Ajustes a Personalizar para este modelo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." @@ -2880,8 +2772,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "O seguinte script está ativo:" msgstr[1] "Os seguintes scripts estão ativos:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "Esquema de Cores" @@ -2936,8 +2827,7 @@ msgctxt "@label" msgid "Shell" msgstr "Perímetro" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "Preenchimento" @@ -3052,9 +2942,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" @@ -3070,20 +2958,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se sua impressora não está listada, leia o guia de resolução de problemas de impressão em rede" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "Versão do firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "Endereço" @@ -3113,8 +2998,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Endereço IP inválido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Por favor entre um endereço IP válido." @@ -3124,8 +3008,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Entre o endereço IP da sua impressora na rede." @@ -3177,8 +3060,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Sobrepor irá usar os ajustes especificados com a configuração existente da impressora. Isto pode causar falha da impressão." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" @@ -3199,8 +3081,7 @@ msgctxt "@label" msgid "Delete" msgstr "Remover" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "Continuar" @@ -3215,9 +3096,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Continuando..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "Pausar" @@ -3257,8 +3136,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Você tem certeza que quer abortar %1?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "Abortar impressão" @@ -3268,9 +3146,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Gerir Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Por favor atualize o firmware de sua impressora parar gerir a fila remotamente." @@ -3300,8 +3176,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "Ocioso" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." @@ -3342,17 +3217,14 @@ msgctxt "@label" msgid "First available" msgstr "Primeira disponível" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "Abortado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "Finalizado" @@ -3362,10 +3234,8 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "Abortando..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" msgstr "Falhado" @@ -3445,8 +3315,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Entrar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "Entre na plataforma Ultimaker" @@ -3792,8 +3661,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Exibir Pasta de Configuração" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar a visibilidade dos ajustes..." @@ -3878,8 +3746,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este pacote será instalado após o reinício." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "Geral" @@ -3889,20 +3756,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" @@ -3912,14 +3776,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Fechando %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Tem certeza que quer sair de %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" @@ -4051,28 +3913,27 @@ msgstr "Biblioteca de recorte de polígonos" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "Parser JSON" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Funções de utilidade, incluindo um carregador de imagem" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Biblioteca de utilidade, incluindo geração Voronoi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Certificados-Raiz para validar confiança SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Compatibilidade entre Python 2 e 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4122,17 +3983,17 @@ msgstr "Biblioteca de descoberta 'ZeroConf'" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Configuração de sistema universal de construção" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Gestor de pacote e dependência" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Empacotamento de aplicações Python" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4142,7 +4003,7 @@ msgstr "Implementação de aplicação multidistribuição em Linux" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Gerando instaladores Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -4189,8 +4050,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Alterações atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" @@ -4267,8 +4127,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Sem Título" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "Aju&stes" @@ -4604,8 +4463,7 @@ msgctxt "@label" msgid "Object list" msgstr "Lista de objetos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "Defaults" @@ -4878,8 +4736,7 @@ msgctxt "@info:tooltip" 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 "Quando você faz alterações em um perfil e troca para um diferent, um diálogo aparecerá perguntando se você quer manter ou aplicar suas modificações, ou você pode forçar um comportamento default e não ter o diálogo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "Perfis" @@ -4964,15 +4821,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "Adicionar Novo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "Renomear" @@ -4982,14 +4836,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "Materiais compatíveis com a impressora ativa:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "Criar novo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "Importar" @@ -4999,32 +4851,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "Sincronizar com Impressoras" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "Importar Material" @@ -5039,8 +4886,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar material %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" @@ -5090,9 +4936,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "Para automaticamente sincronizar os perfis de material com todas as suas impressoras conectadas à Digital Factory, você precisa estar logado pelo Cura." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "Sincronizar materiais usando USB" @@ -5112,8 +4956,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "Perfis de material sincronizados com sucesso com as seguintes impressoras:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "Resolução de problemas" @@ -5138,14 +4981,12 @@ msgctxt "@button" msgid "Try again" msgstr "Tentar novamente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "Feito" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "Sincronizar" @@ -5205,8 +5046,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "Como carregar novos perfis de material na minha impressora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "Voltar" @@ -5316,9 +5156,7 @@ msgctxt "@title" msgid "Information" msgstr "Informação" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impressão" @@ -5348,8 +5186,7 @@ msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com ajustes/sobreposições atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar ajustes atuais" @@ -5379,8 +5216,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Por favor dê um nome a este perfil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" @@ -5395,8 +5231,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "Renomear Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" @@ -5453,14 +5288,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "A temperatura com a qual pré-aquecer o hotend." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "Pré-aquecer" @@ -5654,17 +5487,17 @@ msgstr "Experimental" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "o perfil personalizado está ativo e você sobrescreveu alguns ajustes." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "o perfil personalizado está sobrepujando alguns ajustes." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Alguns ajustes foram alterados." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5689,7 +5522,7 @@ msgstr "Preenchimento gradual aumentará gradualmente a quantidade de preenchime #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Resolução" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5704,17 +5537,17 @@ msgstr "Gera estrutura que suportarão partes do modelo que têm seções penden #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Configuração não suportada" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Nenhum perfil está disponível para a configuração selecionada de material/%1. Por favor altere sua configuração." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Saber mais" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -5964,8 +5797,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Não foi possível conectar ao dispositivo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/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?" @@ -7922,7 +7754,8 @@ msgstr "Visão de Raios-X" #~ "\n" #~ "Select your printer from the list below:" #~ msgstr "" -#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-Code para sua impressora.\n" +#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-" +#~ "Code para sua impressora.\n" #~ "\n" #~ "Selecione sua impressora da lista abaixo:" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 8b41318015..a9eeea20a3 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 5.0\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: 2022-05-02 12:04+0200\n" +"PO-Revision-Date: 2022-07-04 03:38+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -2812,12 +2812,12 @@ msgstr "Permite ajustar a aceleração da cabeça de impressão. Aumentar as ace #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Habilitar Aceleração de Percurso" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Usar taxa de aceleração separada para movimentos de percurso. Se desabilitado, os movimentos de percurso usarão o valor de aceleração da linha impressa em seu destino." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3012,12 +3012,12 @@ msgstr "Permite ajustar o jerk da cabeça de impressão quando a velocidade nos #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Habilitar Jerk de Percurso" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Usar taxa de jerk separada para movimentos de percurso. Se desabilitado, os movimentos de percurso usarão o valor de jerk da linha impressa em seu destino." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 1a696f5346..3ad78c8f87 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -304,7 +304,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Ainda não foi inicializado" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -884,17 +884,18 @@ msgstr "Personalizado" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "O material utilizado neste projeto baseia-se em algumas definições de material não disponíveis no Cura, o que pode produzir resultados de impressão indesejáveis." +" Recomendamos vivamente a instalação do pacote completo do material a partir do Marketplace." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Perfis do material não instalados" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Instalar materiais" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -932,12 +933,12 @@ msgstr "Erro ao gravar ficheiro 3mf." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Não foi possível guardar a informação do pacote do material no ficheiro do projecto: {material}. Este projeto poderá não abrir corretamente em outros sistemas." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Não foi possível guardar a informação do pacote do material" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -2000,12 +2001,12 @@ msgstr "Abrir" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "De qualquer modo, abrir o projecto" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Instalar material em falta" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2113,12 +2114,12 @@ msgstr "Iniciar sessão" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Guardar o projeto Cura e o ficheiro de impressão" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Guardar projeto Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2490,7 +2491,7 @@ msgstr "Os seguintes pacotes não podem ser instalados devido a uma versão inco #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Instalar os materiais em falta" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2577,7 +2578,7 @@ msgstr "Saber Mais" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Por" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4048,28 +4049,28 @@ msgstr "Biblioteca de recortes de polígonos" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON parser" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Funções utilitárias, incluindo um carregador de imagens" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Biblioteca de utilidades, incluindo a geração em Voronoi" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Certificados de raiz para validar a credibilidade SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Compatibilidade entre Python 2 e 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4119,17 +4120,17 @@ msgstr "Biblioteca de deteção ZeroConf" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Configuração de sistema de construção universal" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Dependência e gestor de pacotes" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "A empacotar aplicativos Python" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4139,7 +4140,7 @@ msgstr "Implementação da aplicação de distribuição cruzada Linux" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "A gerar instaladores Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5654,17 +5655,17 @@ msgstr "Experimental" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "o perfil personalizado está ativo e substituiu algumas definições." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "o perfil personalizado está a substituir algumas definições." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Algumas definições foram alteradas." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5689,7 +5690,7 @@ msgstr "O enchimento gradual irá aumentar progressivamente a densidade do enchi #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Resolução" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5704,17 +5705,17 @@ msgstr "Criar estruturas para suportar partes do modelo, suspensas ou com saliê #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Configuração não suportada" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Não há perfis disponíveis para a configuração do material/%1 selecionado. Altere sua configuração." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Saber mais" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index 039da78f46..4036a548bd 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -2810,12 +2810,13 @@ msgstr "Permite o ajuste da aceleração da cabeça de impressão. Aumentar as a #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Ativar a aceleração da viagem" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Utilizar uma taxa de aceleração separada para movimentos de viagem. Se desativados, os movimentos de viagem utilizarão o valor da aceleração da linha impressa" +" no seu destino." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,13 @@ msgstr "Permite ajustar o jerk da cabeça de impressão quando a velocidade nos #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Ativar Jerk de Viagem" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Utilizar uma taxa de jerk separada para movimentos de viagem. Se for desativado, os movimentos de viagem utilizarão o valor do jerk da linha impressa no" +" seu destino." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index bfba5b0801..f2a291cf06 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -304,7 +304,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Еще не инициализировано" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -884,17 +884,18 @@ msgstr "Своя" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "Используемый в этом проекте материал основывается на определениях материалов, недоступных в Cura, что может привести к нежелательным результатам при печати." +" Мы настоятельно рекомендуем установить полный пакет материалов из магазина." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Профили материалов не установлены" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Установка материалов" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -932,12 +933,12 @@ msgstr "Ошибка в ходе записи файла 3MF." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "Не удалось сохранить информацию о пакете материалов в файле проекта: {material}. Этот проект может некорректно открываться на других системах." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Информация о пакете материалов не сохранена" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -2009,12 +2010,12 @@ msgstr "Открыть" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Все равно открыть проект" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Установить недостающий материал" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2122,12 +2123,12 @@ msgstr "Войти" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Сохранить проекта Cura и распечатать файл" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Сохранить проект Cura" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2499,7 +2500,7 @@ msgstr "Следующие пакеты невозможно установит #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Установить недостающие материалы" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2586,7 +2587,7 @@ msgstr "Узнать Больше" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Автор" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4059,28 +4060,28 @@ msgstr "Библиотека обрезки полигонов" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "Парсер JSON" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Вспомогательные функции, включая загрузчик изображений" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Вспомогательные функции, включая генерацию диаграмм Вороного" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "Корневые сертификаты для проверки надежности SSL" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Совместимость между Python 2 и 3" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4130,17 +4131,17 @@ msgstr "Библиотека ZeroConf" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Конфигурация универсальной системы сборки" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Менеджер зависимостей и пакетов" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Упаковка Python-приложений" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4150,7 +4151,7 @@ msgstr "Развертывание приложений для различны #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Генерация установщиков для Windows" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5670,17 +5671,17 @@ msgstr "Экспериментальное" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "активен собственный профиль, и вы переписали некоторые настройки." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "собственный профиль переопределяет некоторые настройки." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Некоторые настройки были изменены." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5705,7 +5706,7 @@ msgstr "Постепенное заполнение будет постепен #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Разрешение" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5720,17 +5721,17 @@ msgstr "Генерация структур для поддержки навис #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Конфигурация не поддерживается" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Нет профилей для выбранного материала/конфигурации %1. Пожалуйста, измените конфигурацию." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Узнать больше" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index a2b2ff24f0..44ca2ff808 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:08+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1116,7 +1117,7 @@ msgstr "Минимальная ширина линии нечетных стен #: fdmprinter.def.json msgctxt "min_odd_wall_line_width description" msgid "The minimum line width for middle line gap filler polyline walls. This setting determines at which model thickness we switch from printing two wall lines, to printing two outer walls and a single central wall in the middle. A higher Minimum Odd Wall Line Width leads to a higher maximum even wall line width. The maximum odd wall line width is calculated as 2 * Minimum Even Wall Line Width," -msgstr "Минимальная ширина линии для полилинейных стенок, заполняющих зазоры средней линии. Этот параметр определяет, при какой толщине модели выполняется переключение с печати стенки в две линии на печать двух внешних стенок и одной центральной стенки посередине. Чем выше значение минимальной ширины линии нечетной стенки, тем выше максимальная ширина линии четной стенки. Максимальная ширина линии нечетной стенки вычисляется по формуле: 2 * Ширина линии четной стенки." +msgstr "Минимальная ширина линии для полилинейных стенок, заполняющих зазоры средней линии. Этот параметр определяет, при какой толщине модели выполняется переключение с печати стенки в две линии на печать двух внешних стенок и одной центральной стенки посередине. Чем выше значение минимальной ширины линии нечетной стенки, тем выше максимальная ширина линии четной стенки. Максимальная ширина линии нечетной стенки вычисляется по формуле: 2 * Ширина линии четной стенки," #: fdmprinter.def.json msgctxt "wall_add_middle_threshold label" @@ -2810,12 +2811,12 @@ msgstr "Разрешает регулирование ускорения гол #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Включить ускорение перемещения" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Использовать отдельный коэффициент ускорения для перемещения. Если опция отключена, то при перемещении будет использоваться значение ускорения строки в пункте назначения." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,12 @@ msgstr "Разрешает управление скоростью измене #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Включить рывок перемещения" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Использовать отдельный коэффициент рывка для перемещения. Если опция отключена, то при перемещении будет использоваться значение рывка строки в пункте назначения." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index cf8093f91f..440963e04c 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -304,7 +304,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "Henüz başlatılmadı" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -884,17 +884,18 @@ msgstr "Özel" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "Bu projede kullanılan malzeme, Cura'da bulunmayan birtakım malzeme tanımlarını temel alıyor ve bu durum, istenmeyen baskı sonuçlarına sebep olabilir. Mağazadan" +" tam malzeme paketini kurmanızı öneririz." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "Malzeme profilleri yüklü değil" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "Malzeme Yükle" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 @@ -932,12 +933,12 @@ msgstr "3mf dosyasını yazarken hata oluştu." #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "{material} proje dosyasında malzeme paketi bilgileri saklanamadı. Bu proje diğer sistemlerde doğru şekilde açılmayabilir." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "Malzeme paketi bilgileri kaydedilemedi" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -2002,12 +2003,12 @@ msgstr "Aç" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "Projeyi yine de aç" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "Eksik malzemeyi yükle" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2115,12 +2116,12 @@ msgstr "Giriş yap" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "Cura projesini kaydet ve dosyayı yazdır" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "Cura projesini kaydet" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2492,7 +2493,7 @@ msgstr "Aşağıdaki paketler uyumsuz Cura sürümü nedeniyle yüklenemiyor:" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "Eksik Malzemeleri yükle" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2579,7 +2580,7 @@ msgstr "Daha Fazla Bilgi Edinin" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "Oluşturan" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -4050,28 +4051,28 @@ msgstr "Poligon kırpma kitaplığı" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON ayrıştırıcı" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "Kullanım işlevleri, bir resim yükleyici dâhil" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "Kullanım kütüphanesi, Voronoi oluşturma dâhil" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "SSL güvenilirliğini doğrulamak için kök sertifikalar" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Python 2 ve 3 arasında uyumluluk" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4121,17 +4122,17 @@ msgstr "ZeroConf keşif kitaplığı" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "Evrensel yapı sistemi yapılandırması" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "Bağımlılık ve paket yöneticisi" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "Python uygulamalarını paketleme" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4141,7 +4142,7 @@ msgstr "Linux çapraz-dağıtım uygulama dağıtımı" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "Windows yükleyicileri oluşturma" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -5656,17 +5657,17 @@ msgstr "Deneysel" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "özel profili etkin ve bazı ayarların üstüne yazdınız." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "özel profili bazı ayarları geçersiz kılıyor." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "Bazı ayarlar değiştirildi." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5691,7 +5692,7 @@ msgstr "Kademeli dolgu, yukarıya doğru dolgu miktarını kademeli olarak yüks #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "Çözünürlük" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5706,17 +5707,17 @@ msgstr "Modellerin askıda kalan kısımlarını destekleyen yapılar oluşturun #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "Yapılandırma desteklenmiyor" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "Seçilen malzeme/%1 yapılandırması için kullanılabilecek profil yok. Lütfen yapılandırmanızı değiştirin." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "Daha fazla bilgi edinin" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 090a68b443..cb5e93676a 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -2810,12 +2810,12 @@ msgstr "Yazıcı başlığı ivmesinin ayarlanmasını sağlar. İvmeleri artır #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "Hareket İvmesini Etkinleştir" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "Hareket hamleleri için farklı bir ivme oranı kullanın. Devre dışı bırakılırsa hareket hamleleri, varış noktasındaki yazdırılmış hattın ivme değerini kullanır." #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3010,13 @@ msgstr "X veya Y eksenlerindeki hareket hızı değiştiğinde yazıcı başlı #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "Hareket Salınımını Etkinleştir" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "Hareket hamleleri için farklı bir salınım oranı kullanın. Devre dışı bırakılırsa hareket hamleleri, varış noktasındaki yazdırılmış hattın salınım değerini" +" kullanır." #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 4dc7869ff5..7def2c1b57 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2022-07-15 11:06+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.1.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 msgctxt "@label" @@ -36,14 +37,12 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "未覆盖" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Connected printers" msgstr "已连接的打印机" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/GlobalStacksModel.py:138 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterSelector/MachineSelectorList.qml:24 msgctxt "@label" msgid "Preset printers" msgstr "预设打印机" @@ -54,52 +53,38 @@ 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 "是否确实要删除 {0}?此操作无法撤消!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:61 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:65 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "视觉" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:66 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "视觉配置文件用于打印视觉原型和模型,可实现出色的视觉效果和表面质量。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:70 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "工程配置文件用于打印功能性原型和最终用途部件,可提高准确性和减小公差。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:75 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "草稿" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentSelectionModel.py:76 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "草稿配置文件用于打印初始原型和概念验证,可大大缩短打印时间。" @@ -109,8 +94,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "自定义材料" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:233 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:340 msgctxt "@label" msgid "Custom" msgstr "自定义" @@ -151,8 +135,7 @@ msgctxt "@info:title" msgid "Finding Location" msgstr "正在寻找位置" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:99 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "无法在成形空间体积内放下全部模型" @@ -167,10 +150,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "不能从用户数据目录创建存档: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:159 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:118 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:126 msgctxt "@info:title" msgid "Backup" msgstr "备份" @@ -304,7 +284,7 @@ msgstr "OpenGL" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:264 msgctxt "@label" msgid "Not yet initialized" -msgstr "" +msgstr "尚未初始化" #: /home/trin/Gedeeld/Projects/Cura/cura/CrashHandler.py:267 #, python-brace-format @@ -391,9 +371,7 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能加载一个 G-code 文件。{0} 已跳过导入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:217 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:189 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -404,11 +382,8 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果加载 G-code,则无法打开其他任何文件。{0} 已跳过导入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1812 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:156 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:173 msgctxt "@info:title" msgid "Error" msgstr "错误" @@ -473,8 +448,7 @@ msgctxt "@text:error" msgid "Failed to create archive of materials to sync with printers." msgstr "无法创建材料存档以与打印机同步。" -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:111 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:165 msgctxt "@text:error" msgid "Failed to load the archive of materials to sync it with printers." msgstr "无法加载材料存档以与打印机同步。" @@ -484,9 +458,7 @@ msgctxt "@text:error" msgid "The response from Digital Factory appears to be corrupted." msgstr "来自 Digital Factory 的响应似乎已损坏。" -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 +#: /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:147 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/PrinterOutput/UploadMaterialsJob.py:155 msgctxt "@text:error" msgid "The response from Digital Factory is missing important information." msgstr "来自 Digital Factory 的响应缺少重要信息。" @@ -501,21 +473,18 @@ msgctxt "@text:error" msgid "Failed to connect to Digital Factory." msgstr "无法连接至 Digital Factory。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:207 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 msgctxt "@title:window" msgid "File Already Exists" msgstr "文件已存在" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:208 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "文件 {0} 已存在。您确定要覆盖它吗?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:459 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:462 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "文件 URL 无效:" @@ -567,8 +536,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "无法从 {0} 导入配置文件:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:252 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:262 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -640,8 +608,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:219 msgctxt "@label" msgid "Nozzle" msgstr "喷嘴" @@ -661,28 +628,19 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "挤出机已禁用" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:61 msgctxt "@action:button" msgid "Add" msgstr "添加" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:290 msgctxt "@action:button" msgid "Finish" msgstr "完成" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:508 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:323 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:147 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:27 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:43 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:74 msgctxt "@action:button" msgid "Cancel" msgstr "取消" @@ -753,29 +711,23 @@ msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:37 /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:63 msgctxt "@text:window" msgid "The release notes could not be opened." msgstr "无法打开版本说明。" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:57 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:277 msgctxt "@action:button" msgid "Next" msgstr "下一步" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:286 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:67 msgctxt "@action:button" msgid "Skip" msgstr "跳过" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:175 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:135 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:443 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:186 msgctxt "@action:button" msgid "Close" msgstr "关闭" @@ -795,9 +747,7 @@ msgctxt "@action:button" msgid "Sync materials" msgstr "同步材料" -#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 +#: /home/trin/Gedeeld/Projects/Cura/cura/UltimakerCloud/CloudMaterialSync.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:397 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:80 msgctxt "@action:button" msgid "Learn more" msgstr "详细了解" @@ -853,8 +803,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "突然无法访问项目文件 {0}{1}。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:651 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:659 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "无法打开项目文件" @@ -884,20 +833,19 @@ msgstr "自定义" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:390 msgctxt "@info:status" 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 "" +msgstr "此项目使用的材料依赖于一些 Cura 中不存在的材料定义,这可能会造成打印效果不如预期。强烈建议安装从 Marketplace 获得的完整材料包。" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:392 msgctxt "@info:title" msgid "Material profiles not installed" -msgstr "" +msgstr "材料配置文件未安装" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:405 msgctxt "@action:button" msgid "Install Materials" -msgstr "" +msgstr "安装材料" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF 文件" @@ -912,8 +860,7 @@ msgctxt "@error" msgid "There is no workspace yet to write. Please add a printer first." msgstr "没有可写入的工作区。请先添加打印机。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:64 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:97 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "没有在此处写入工作区的权限。" @@ -932,12 +879,12 @@ msgstr "写入 3mf 文件时出错。" #, python-brace-format msgctxt "@error:material" msgid "It was not possible to store material package information in project file: {material}. This project may not open correctly on other systems." -msgstr "" +msgstr "项目文件中无法存储材料包信息:{material}。此项目在其他系统上可能无法正确打开。" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:283 msgctxt "@info:title" msgid "Failed to save material package information" -msgstr "" +msgstr "未能保存材料包信息" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/__init__.py:28 msgctxt "@item:inlistbox" @@ -989,8 +936,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "备份超过了最大文件大小。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "尝试恢复您的备份时出错。" @@ -1025,12 +971,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "无法使用当前材料进行切片,因为该材料与所选机器或配置不兼容。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:434 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:461 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:473 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:485 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:498 msgctxt "@info:title" msgid "Unable to slice" msgstr "无法切片" @@ -1071,8 +1013,7 @@ msgstr "" "- 分配给了已启用的挤出器\n" "- 尚未全部设置为修改器网格" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "正在处理层" @@ -1082,8 +1023,7 @@ msgctxt "@info:title" msgid "Information" msgstr "信息" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 配置文件" @@ -1115,8 +1055,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "更新固件" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "压缩 G-code 文件" @@ -1126,9 +1065,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter 不支持文本模式。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "GCode 文件" @@ -1138,8 +1075,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "解析 G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:352 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:506 msgctxt "@info:title" msgid "G-code Details" msgstr "G-code 详细信息" @@ -1159,8 +1095,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter 不支持非文本模式。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "导出前请先准备 G-code。" @@ -1205,8 +1140,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "是否要与您的帐户同步材料和软件包?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "检测到您的 Ultimaker 帐户有更改" @@ -1221,14 +1155,12 @@ msgctxt "@info:generic" msgid "Syncing..." msgstr "正在同步..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:12 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:79 msgctxt "@button" msgid "Decline" msgstr "拒绝" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:13 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:53 msgctxt "@button" msgid "Agree" msgstr "同意" @@ -1339,8 +1271,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "保存到可移动磁盘 {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "没有可进行写入的文件格式!" @@ -1356,8 +1287,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "正在保存" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:120 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:123 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1369,8 +1299,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "尝试写入到 {device} 时找不到文件名。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:152 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:171 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1440,8 +1369,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "无层可显示" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:136 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "不再显示此消息" @@ -1511,16 +1439,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "压缩 COLLADA 数据资源交换" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 格式包" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 #: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" @@ -1603,8 +1527,7 @@ msgid "This printer is not linked to the Digital Factory:" msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "这些打印机未链接到 Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:348 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:440 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1872,8 +1795,7 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "新建" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:59 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "摘要 - Cura 项目" @@ -1883,20 +1805,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "机器的设置冲突应如何解决?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:95 msgctxt "@action:label" msgid "Printer settings" msgstr "打印机设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:175 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:104 msgctxt "@action:label" msgid "Type" msgstr "类型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:192 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 msgctxt "@action:label" msgid "Printer Group" msgstr "打印机组" @@ -1906,34 +1825,28 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "配置文件中的冲突如何解决?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Profile settings" msgstr "配置文件设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:250 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:375 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:119 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:244 msgctxt "@action:label" msgid "Name" msgstr "名字" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:286 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 msgctxt "@action:label" msgid "Not in profile" msgstr "不在配置文件中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:233 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -1993,12 +1906,12 @@ msgstr "打开" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:520 msgctxt "@action:button" msgid "Open project anyway" -msgstr "" +msgstr "仍要打开项目" #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:529 msgctxt "@action:button" msgid "Install missing material" -msgstr "" +msgstr "安装缺少的材料" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListFooter.qml:22 msgctxt "@button" @@ -2095,9 +2008,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "备份并同步您的 Cura 设置。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:47 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:164 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:212 msgctxt "@button" msgid "Sign in" @@ -2106,12 +2017,12 @@ msgstr "登录" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:216 msgctxt "@option" msgid "Save Cura project and print file" -msgstr "" +msgstr "保存 Cura 项目并打印文件" #: /home/trin/Gedeeld/Projects/Cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml:217 msgctxt "@option" msgid "Save Cura project" -msgstr "" +msgstr "保存 Cura 项目" #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 msgctxt "@title" @@ -2288,10 +2199,7 @@ msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." msgstr "要应用到图像的平滑量。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:329 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:136 /home/trin/Gedeeld/Projects/Cura/resources/qml/ColorDialog.qml:143 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/RenameDialog.qml:80 msgctxt "@action:button" msgid "OK" msgstr "确定" @@ -2311,18 +2219,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "喷嘴孔径" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:92 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:201 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:221 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:261 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:279 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2462,9 +2362,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "解除" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:118 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:76 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:175 msgctxt "@button" msgid "Next" @@ -2483,7 +2381,7 @@ msgstr "由于 Cura 版本不兼容,无法安装以下程序包:" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15 msgctxt "@title" msgid "Install missing Materials" -msgstr "" +msgstr "安装缺少的材料" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/LicenseDialog.qml:15 msgctxt "@button" @@ -2545,8 +2443,7 @@ msgctxt "@info:button, %1 is the application name" msgid "Quit %1" msgstr "退出 %1" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/Materials.qml:8 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/MissingPackages.qml:8 msgctxt "@header" msgid "Install Materials" msgstr "安装材料" @@ -2561,8 +2458,7 @@ msgctxt "@label" msgid "You need to accept the license to install the package" msgstr "需要接受许可证才能安装该程序包" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:101 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:207 msgctxt "@button:label" msgid "Learn More" msgstr "详细了解" @@ -2570,7 +2466,7 @@ msgstr "详细了解" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:172 msgctxt "@label Is followed by the name of an author" msgid "By" -msgstr "" +msgstr "由" #: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackageCardHeader.qml:226 msgctxt "@button" @@ -2657,14 +2553,12 @@ msgctxt "@header" msgid "Compatible with Material Station" msgstr "与 Material Station 兼容" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "Yes" msgstr "是" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:202 /home/trin/Gedeeld/Projects/Cura/plugins/Marketplace/resources/qml/PackagePage.qml:228 msgctxt "@info" msgid "No" msgstr "否" @@ -2827,8 +2721,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "选择对此模型的自定义设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:61 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:102 msgctxt "@label:textbox" msgid "Filter..." msgstr "筛选..." @@ -2869,8 +2762,7 @@ msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "以下脚本处于活动状态:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:18 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:47 msgctxt "@label" msgid "Color scheme" msgstr "颜色方案" @@ -2925,8 +2817,7 @@ msgctxt "@label" msgid "Shell" msgstr "外壳" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:249 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:64 msgctxt "@label" msgid "Infill" msgstr "填充" @@ -3041,9 +2932,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "编辑" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:140 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:186 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:321 msgctxt "@action:button" msgid "Remove" @@ -3059,20 +2948,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "如果您的打印机未列出,请阅读网络打印故障排除指南" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:186 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:247 msgctxt "@label" msgid "Type" msgstr "类型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:202 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:256 msgctxt "@label" msgid "Firmware version" msgstr "固件版本" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:266 msgctxt "@label" msgid "Address" msgstr "地址" @@ -3102,8 +2988,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "IP 地址无效" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:262 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:141 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "请输入有效的 IP 地址。" @@ -3113,8 +2998,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "打印机网络地址" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:97 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "请输入打印机在网络上的 IP 地址。" @@ -3165,8 +3049,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "覆盖将使用包含现有打印机配置的指定设置。这可能会导致打印失败。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:151 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:178 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:175 msgctxt "@label" msgid "Glass" @@ -3187,8 +3070,7 @@ msgctxt "@label" msgid "Delete" msgstr "删除" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 msgctxt "@label" msgid "Resume" msgstr "恢复" @@ -3203,9 +3085,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "正在恢复..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:288 msgctxt "@label" msgid "Pause" msgstr "暂停" @@ -3245,8 +3125,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "您确定要中止 %1 吗?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:161 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@window:title" msgid "Abort print" msgstr "中止打印" @@ -3256,9 +3135,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "管理打印机" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:467 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:239 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "请及时更新打印机固件以远程管理打印队列。" @@ -3288,8 +3165,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "空闲" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:351 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:76 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 msgctxt "@label:status" msgid "Preparing..." @@ -3330,17 +3206,14 @@ msgctxt "@label" msgid "First available" msgstr "第一个可用" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:70 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborted" msgstr "已中止" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:72 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:74 msgctxt "@label:status" msgid "Finished" msgstr "已完成" @@ -3350,10 +3223,8 @@ msgctxt "@label:status" msgid "Aborting..." msgstr "正在中止..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Failed" msgstr "失败" @@ -3433,8 +3304,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "登录" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:19 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "登录 Ultimaker 平台" @@ -3780,8 +3650,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "显示配置文件夹" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:467 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:476 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "配置设定可见性..." @@ -3866,8 +3735,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "这个包将在重新启动后安装。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 msgctxt "@title:tab" msgid "General" msgstr "基本" @@ -3877,20 +3745,17 @@ msgctxt "@title:tab" msgid "Settings" msgstr "设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:17 msgctxt "@title:tab" msgid "Printers" msgstr "打印机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:470 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:70 msgctxt "@title:tab" msgid "Materials" msgstr "材料" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:472 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:57 msgctxt "@title:tab" msgid "Profiles" msgstr "配置文件" @@ -3900,14 +3765,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "正在关闭 %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:590 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:599 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "您确定要退出 %1 吗?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:637 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:16 msgctxt "@title:window" msgid "Open file(s)" msgstr "打开文件" @@ -4039,28 +3902,27 @@ msgstr "多边形剪辑库" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:155 msgctxt "@label" msgid "JSON parser" -msgstr "" +msgstr "JSON 解析器" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 msgctxt "@label" msgid "Utility functions, including an image loader" -msgstr "" +msgstr "实用程序函数,包括图像加载器" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@label" msgid "Utility library, including Voronoi generation" -msgstr "" +msgstr "实用程序库,包括 Voronoi 图生成" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 msgctxt "@label" msgid "Root Certificates for validating SSL trustworthiness" -msgstr "" +msgstr "用于验证 SSL 可信度的根证书" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" msgid "Compatibility between Python 2 and 3" -msgstr "" +msgstr "Python 2 和 3 之间的兼容性" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" @@ -4110,17 +3972,17 @@ msgstr "ZeroConf 发现库" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 msgctxt "@label" msgid "Universal build system configuration" -msgstr "" +msgstr "通用构建系统配置" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:175 msgctxt "@label" msgid "Dependency and package manager" -msgstr "" +msgstr "依赖性和程序包管理器" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:176 msgctxt "@label" msgid "Packaging Python-applications" -msgstr "" +msgstr "打包 Python 应用" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:177 msgctxt "@label" @@ -4130,7 +3992,7 @@ msgstr "Linux 交叉分布应用程序部署" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:178 msgctxt "@label" msgid "Generating Windows installers" -msgstr "" +msgstr "生成 Windows 安装程序" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:17 msgctxt "@title:window" @@ -4180,8 +4042,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "当前更改" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:104 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:799 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "总是询问" @@ -4257,8 +4118,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "未命名" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "设置(&S)" @@ -4591,8 +4451,7 @@ msgctxt "@label" msgid "Object list" msgstr "对象列表" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:131 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:24 msgctxt "@action:button" msgid "Defaults" msgstr "默认" @@ -4865,8 +4724,7 @@ msgctxt "@info:tooltip" 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 "当您对配置文件进行更改并切换到其他配置文件时将显示一个对话框,询问您是否要保留修改。您也可以选择一个默认行为并令其不再显示该对话框。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:780 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:36 msgctxt "@label" msgid "Profiles" msgstr "配置文件" @@ -4951,15 +4809,12 @@ msgctxt "@action:button" msgid "Add New" msgstr "新增" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@action:button" msgid "Activate" msgstr "激活" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:331 msgctxt "@action:button" msgid "Rename" msgstr "重命名" @@ -4969,14 +4824,12 @@ msgctxt "@label" msgid "Materials compatible with active printer:" msgstr "与处于活动状态的打印机兼容的材料:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:94 msgctxt "@action:button" msgid "Create new" msgstr "新建" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:90 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:88 msgctxt "@action:button" msgid "Import" msgstr "导入" @@ -4986,32 +4839,27 @@ msgctxt "@action:button" msgid "Sync with Printers" msgstr "与打印机同步" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:311 msgctxt "@action:button" msgid "Duplicate" msgstr "复制" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:198 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:342 msgctxt "@action:button" msgid "Export" msgstr "导出" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:212 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:392 msgctxt "@title:window" msgid "Confirm Remove" msgstr "确认删除" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:215 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:393 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "您确认要删除 %1?该操作无法恢复!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:228 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:238 msgctxt "@title:window" msgid "Import Material" msgstr "导入配置" @@ -5026,8 +4874,7 @@ msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "无法导入材料 %1%2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:256 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:267 msgctxt "@title:window" msgid "Export Material" msgstr "导出材料" @@ -5077,9 +4924,7 @@ msgctxt "@text" msgid "To automatically sync the material profiles with all your printers connected to Digital Factory you need to be signed in in Cura." msgstr "要自动将材料配置文件与连接到 Digital Factory 的所有打印机同步,您需要登录 Cura。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:446 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:586 msgctxt "@button" msgid "Sync materials with USB" msgstr "使用 USB 同步材料" @@ -5099,8 +4944,7 @@ msgctxt "@title:header" msgid "Material profiles successfully synced with the following printers:" msgstr "材料配置文件与以下打印机成功同步:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:429 msgctxt "@button" msgid "Troubleshooting" msgstr "故障排除" @@ -5125,14 +4969,12 @@ msgctxt "@button" msgid "Try again" msgstr "再试一次" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:461 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:696 msgctxt "@button" msgid "Done" msgstr "完成" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:463 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:606 msgctxt "@button" msgid "Sync" msgstr "同步" @@ -5192,8 +5034,7 @@ msgctxt "@button" msgid "How to load new material profiles to my printer" msgstr "如何将新材料配置文件加载到打印机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:687 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:299 msgctxt "@button" msgid "Back" msgstr "返回" @@ -5303,9 +5144,7 @@ msgctxt "@title" msgid "Information" msgstr "信息" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:647 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:18 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:82 msgctxt "@label" msgid "Print settings" msgstr "打印设置" @@ -5335,8 +5174,7 @@ msgctxt "@action:tooltip" msgid "Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:256 msgctxt "@action:button" msgid "Discard current changes" msgstr "舍弃当前更改" @@ -5366,8 +5204,7 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "请为此配置文件提供名称。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:352 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:368 msgctxt "@title:window" msgid "Export Profile" msgstr "导出配置文件" @@ -5382,8 +5219,7 @@ msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:422 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:429 msgctxt "@title:window" msgid "Import Profile" msgstr "导入配置文件" @@ -5439,14 +5275,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "热端的预热温度。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:259 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "取消" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:263 msgctxt "@button" msgid "Pre-heat" msgstr "预热" @@ -5640,17 +5474,17 @@ msgstr "实验性" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:54 msgctxt "@info" msgid "custom profile is active and you overwrote some settings." -msgstr "" +msgstr "自定义配置文件处于活动状态,并且已覆盖某些设置。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:68 msgctxt "@info" msgid "custom profile is overriding some settings." -msgstr "" +msgstr "自定义配置文件正在覆盖某些设置。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml:79 msgctxt "@info" msgid "Some settings were changed." -msgstr "" +msgstr "某些设置已更改。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:27 msgctxt "@label" @@ -5675,7 +5509,7 @@ msgstr "渐层填充(Gradual infill)将随着打印高度的提升而逐渐 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:26 msgctxt "@label" msgid "Resolution" -msgstr "" +msgstr "分辨率" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:28 msgctxt "@label" @@ -5690,17 +5524,17 @@ msgstr "在模型的悬垂(Overhangs)部分生成支撑结构。若不这样 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:31 msgctxt "@error" msgid "Configuration not supported" -msgstr "" +msgstr "配置不受支持" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:39 msgctxt "@message:text %1 is the name the printer uses for 'nozzle'." msgid "No profiles are available for the selected material/%1 configuration. Please change your configuration." -msgstr "" +msgstr "对于所选材料/%1 配置,无可用的配置文件。请更改配置。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/UnsupportedProfileIndication.qml:47 msgctxt "@button:label" msgid "Learn more" -msgstr "" +msgstr "了解详情" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ProfileOverview.qml:36 msgctxt "@title:column" @@ -5950,8 +5784,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "无法连接到设备。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "无法连接到 Ultimaker 打印机?" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 7bfdc6d042..c7caff60bf 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2022-06-21 12:50+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2022-07-15 11:06+0200\n" +"Last-Translator: \n" "Language-Team: LANGUAGE\n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.1.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1116,7 +1117,7 @@ msgstr "最小奇数壁走线宽度" #: fdmprinter.def.json msgctxt "min_odd_wall_line_width description" msgid "The minimum line width for middle line gap filler polyline walls. This setting determines at which model thickness we switch from printing two wall lines, to printing two outer walls and a single central wall in the middle. A higher Minimum Odd Wall Line Width leads to a higher maximum even wall line width. The maximum odd wall line width is calculated as 2 * Minimum Even Wall Line Width," -msgstr "中间走线空隙填料多线壁的最小走线宽度。此设置确定在什么模型厚度下,我们从打印两根壁走线切换到打印两个外壁并在中间打印一个中心壁。更高的最小奇数壁走线宽度会带来更高的最大偶数壁走线宽度。最大奇数壁走线宽度计算方法是:2 * 最小偶数壁走线宽度," +msgstr "中间走线空隙填料多线壁的最小走线宽度。此设置确定在什么模型厚度下,我们从打印两根壁走线切换到打印两个外壁并在中间打印一个中心壁。更高的最小奇数壁走线宽度会带来更高的最大偶数壁走线宽度。最大奇数壁走线宽度计算方法是:2 * 最小偶数壁走线宽度," #: fdmprinter.def.json msgctxt "wall_add_middle_threshold label" @@ -2810,12 +2811,12 @@ msgstr "启用调整打印头加速度。 提高加速度可以通过以打印 #: fdmprinter.def.json msgctxt "acceleration_travel_enabled label" msgid "Enable Travel Acceleration" -msgstr "" +msgstr "启用空驶加速度" #: fdmprinter.def.json msgctxt "acceleration_travel_enabled description" msgid "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination." -msgstr "" +msgstr "空驶时使用单独的加速度。如果禁用,空驶将使用打印线在目的地的加速度值。" #: fdmprinter.def.json msgctxt "acceleration_print label" @@ -3010,12 +3011,12 @@ msgstr "启用当 X 或 Y 轴的速度变化时调整打印头的抖动速度。 #: fdmprinter.def.json msgctxt "jerk_travel_enabled label" msgid "Enable Travel Jerk" -msgstr "" +msgstr "启用空驶抖动速度" #: fdmprinter.def.json msgctxt "jerk_travel_enabled description" msgid "Use a separate jerk rate for travel moves. If disabled, travel moves will use the jerk value of the printed line at their destination." -msgstr "" +msgstr "空驶时使用单独的抖动速度。如果禁用,空驶将使用打印线在目的地的抖动速度值。" #: fdmprinter.def.json msgctxt "jerk_print label" diff --git a/resources/meshes/flsun_qq_s.3mf b/resources/meshes/flsun_qq_s.3mf index 7eba390a66..275a34ddaf 100644 Binary files a/resources/meshes/flsun_qq_s.3mf and b/resources/meshes/flsun_qq_s.3mf differ diff --git a/resources/meshes/hctech_hc300-m1&m1h.3mf b/resources/meshes/hctech_hc300-m1&m1h.3mf new file mode 100644 index 0000000000..84ae00339f Binary files /dev/null and b/resources/meshes/hctech_hc300-m1&m1h.3mf differ diff --git a/resources/meshes/hctech_hc300-m2h.3mf b/resources/meshes/hctech_hc300-m2h.3mf new file mode 100644 index 0000000000..002dd272bf Binary files /dev/null and b/resources/meshes/hctech_hc300-m2h.3mf differ diff --git a/resources/meshes/hctech_hc300-m3.3mf b/resources/meshes/hctech_hc300-m3.3mf new file mode 100644 index 0000000000..58bf6fc2b0 Binary files /dev/null and b/resources/meshes/hctech_hc300-m3.3mf differ diff --git a/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml b/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml index ede42fcd5f..453f2ed9e0 100644 --- a/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml +++ b/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml @@ -33,63 +33,63 @@ Popup thumbnail: UM.Theme.getIcon("PrinterTriple", "high"), description: catalog.i18nc("@tooltip:button", "Monitor printers in Ultimaker Digital Factory."), link: "https://digitalfactory.ultimaker.com/app/printers?utm_source=cura&utm_medium=software&utm_campaign=switcher-digital-factory-printers", - DFAccessRequired: true + permissionsRequired: ["digital-factory.printer.read"] }, { displayName: "Digital Library", //Not translated, since it's a brand name. thumbnail: UM.Theme.getIcon("Library", "high"), description: catalog.i18nc("@tooltip:button", "Create print projects in Digital Library."), link: "https://digitalfactory.ultimaker.com/app/library?utm_source=cura&utm_medium=software&utm_campaign=switcher-library", - DFAccessRequired: true + permissionsRequired: ["digital-factory.project.read.shared"] }, { displayName: catalog.i18nc("@label:button", "Print jobs"), thumbnail: UM.Theme.getIcon("FoodBeverages"), description: catalog.i18nc("@tooltip:button", "Monitor print jobs and reprint from your print history."), link: "https://digitalfactory.ultimaker.com/app/print-jobs?utm_source=cura&utm_medium=software&utm_campaign=switcher-digital-factory-printjobs", - DFAccessRequired: true + permissionsRequired: ["digital-factory.print-job.read"] }, { 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."), link: "https://marketplace.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-marketplace-materials", - DFAccessRequired: false + permissionsRequired: [] }, { 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."), link: "https://academy.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-academy", - DFAccessRequired: false + permissionsRequired: [] }, { 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."), link: "https://support.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-support", - DFAccessRequired: false + permissionsRequired: [] }, { displayName: catalog.i18nc("@label:button", "Ask a question"), thumbnail: UM.Theme.getIcon("Speak", "high"), description: catalog.i18nc("@tooltip:button", "Consult the Ultimaker Community."), link: "https://community.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-community", - DFAccessRequired: false + permissionsRequired: [] }, { displayName: catalog.i18nc("@label:button", "Report a bug"), thumbnail: UM.Theme.getIcon("Bug", "high"), description: catalog.i18nc("@tooltip:button", "Let developers know that something is going wrong."), link: "https://github.com/Ultimaker/Cura/issues/new/choose", - DFAccessRequired: false + permissionsRequired: [] }, { displayName: "Ultimaker.com", //Not translated, since it's a URL. thumbnail: UM.Theme.getIcon("Browser"), description: catalog.i18nc("@tooltip:button", "Visit the Ultimaker website."), link: "https://ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-umwebsite", - DFAccessRequired: false + permissionsRequired: [] } ] @@ -99,7 +99,24 @@ Popup iconSource: modelData.thumbnail tooltipText: modelData.description isExternalLink: true - visible: modelData.DFAccessRequired ? Cura.API.account.isLoggedIn & Cura.API.account.additionalRights["df_access"] : true + visible: + { + try + { + modelData.permissionsRequired.forEach(function(permission) + { + if(!Cura.API.account.isLoggedIn || !Cura.API.account.permissions.includes(permission)) //This required permission is not in the account. + { + throw "No permission to use this application."; //Can't return from within this lambda. Throw instead. + } + }); + } + catch(e) + { + return false; + } + return true; + } onClicked: Qt.openUrlExternally(modelData.link) } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index d22e5a1526..2ec342f502 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -311,8 +311,6 @@ UM.MainWindow property int mouseY: base.mouseY property bool tallerThanParent: height > parent.height - z: 1 // Ensure toolbar and toolpanels are drawn on top - anchors { verticalCenter: tallerThanParent ? undefined : parent.verticalCenter diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index 6687da572d..e3fdbfa787 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -19,6 +19,8 @@ UM.Dialog width: minimumWidth height: minimumHeight + backgroundColor: UM.Theme.getColor("main_background") + Rectangle { id: header @@ -133,49 +135,49 @@ UM.Dialog { //Do NOT add dependencies of our dependencies here, nor CI-dependencies! //Ultimaker's own projects and forks. - projectsModel.append({ name: "Cura", description: catalog.i18nc("@label", "Graphical user interface"), license: "LGPLv3", url: "https://github.com/Ultimaker/Cura" }); - projectsModel.append({ name: "Uranium", description: catalog.i18nc("@label", "Application framework"), license: "LGPLv3", url: "https://github.com/Ultimaker/Uranium" }); - projectsModel.append({ name: "CuraEngine", description: catalog.i18nc("@label", "G-code generator"), license: "AGPLv3", url: "https://github.com/Ultimaker/CuraEngine" }); - projectsModel.append({ name: "libArcus", description: catalog.i18nc("@label", "Interprocess communication library"), license: "LGPLv3", url: "https://github.com/Ultimaker/libArcus" }); - projectsModel.append({ name: "pynest2d", description: catalog.i18nc("@label", "Python bindings for libnest2d"), license: "LGPL", url: "https://github.com/Ultimaker/pynest2d" }); - projectsModel.append({ name: "libnest2d", description: catalog.i18nc("@label", "Polygon packing library, developed by Prusa Research"), license: "LGPL", url: "https://github.com/tamasmeszaros/libnest2d" }); - projectsModel.append({ name: "libSavitar", description: catalog.i18nc("@label", "Support library for handling 3MF files"), license: "LGPLv3", url: "https://github.com/ultimaker/libsavitar" }); - projectsModel.append({ name: "libCharon", description: catalog.i18nc("@label", "Support library for file metadata and streaming"), license: "LGPLv3", url: "https://github.com/ultimaker/libcharon" }); + 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" }); + projectsModel.append({ name: "libArcus", description: catalog.i18nc("@label Description for application component", "Interprocess communication library"), license: "LGPLv3", url: "https://github.com/Ultimaker/libArcus" }); + projectsModel.append({ name: "pynest2d", description: catalog.i18nc("@label Description for application component", "Python bindings for libnest2d"), license: "LGPL", url: "https://github.com/Ultimaker/pynest2d" }); + projectsModel.append({ name: "libnest2d", description: catalog.i18nc("@label Description for application component", "Polygon packing library, developed by Prusa Research"), license: "LGPL", url: "https://github.com/tamasmeszaros/libnest2d" }); + projectsModel.append({ name: "libSavitar", description: catalog.i18nc("@label Description for application component", "Support library for handling 3MF files"), license: "LGPLv3", url: "https://github.com/ultimaker/libsavitar" }); + projectsModel.append({ name: "libCharon", description: catalog.i18nc("@label Description for application component", "Support library for file metadata and streaming"), license: "LGPLv3", url: "https://github.com/ultimaker/libcharon" }); //Direct dependencies of the front-end. - projectsModel.append({ name: "Python", description: catalog.i18nc("@label", "Programming language"), license: "Python", url: "http://python.org/" }); - projectsModel.append({ name: "Qt6", description: catalog.i18nc("@label", "GUI framework"), license: "LGPLv3", url: "https://www.qt.io/" }); - projectsModel.append({ name: "PyQt", description: catalog.i18nc("@label", "GUI framework bindings"), license: "GPL", url: "https://riverbankcomputing.com/software/pyqt" }); - projectsModel.append({ name: "SIP", description: catalog.i18nc("@label", "C/C++ Binding library"), license: "GPL", url: "https://riverbankcomputing.com/software/sip" }); - projectsModel.append({ name: "Protobuf", description: catalog.i18nc("@label", "Data interchange format"), license: "BSD", url: "https://developers.google.com/protocol-buffers" }); + projectsModel.append({ name: "Python", description: catalog.i18nc("@label Description for application dependency", "Programming language"), license: "Python", url: "http://python.org/" }); + projectsModel.append({ name: "Qt6", description: catalog.i18nc("@label Description for application dependency", "GUI framework"), license: "LGPLv3", url: "https://www.qt.io/" }); + projectsModel.append({ name: "PyQt", description: catalog.i18nc("@label Description for application dependency", "GUI framework bindings"), license: "GPL", url: "https://riverbankcomputing.com/software/pyqt" }); + projectsModel.append({ name: "SIP", description: catalog.i18nc("@label Description for application dependency", "C/C++ Binding library"), license: "GPL", url: "https://riverbankcomputing.com/software/sip" }); + projectsModel.append({ name: "Protobuf", description: catalog.i18nc("@label Description for application dependency", "Data interchange format"), license: "BSD", url: "https://developers.google.com/protocol-buffers" }); projectsModel.append({ name: "Noto Sans", description: catalog.i18nc("@label", "Font"), license: "Apache 2.0", url: "https://www.google.com/get/noto/" }); //CuraEngine's dependencies. - projectsModel.append({ name: "Clipper", description: catalog.i18nc("@label", "Polygon clipping library"), license: "Boost", url: "http://www.angusj.com/delphi/clipper.php" }); - projectsModel.append({ name: "RapidJSON", description: catalog.i18nc("@label", "JSON parser"), license: "MIT", url: "https://rapidjson.org/" }); - projectsModel.append({ name: "STB", description: catalog.i18nc("@label", "Utility functions, including an image loader"), license: "Public Domain", url: "https://github.com/nothings/stb" }); - projectsModel.append({ name: "Boost", description: catalog.i18nc("@label", "Utility library, including Voronoi generation"), license: "Boost", url: "https://www.boost.org/" }); + projectsModel.append({ name: "Clipper", description: catalog.i18nc("@label Description for application dependency", "Polygon clipping library"), license: "Boost", url: "http://www.angusj.com/delphi/clipper.php" }); + projectsModel.append({ name: "RapidJSON", description: catalog.i18nc("@label Description for application dependency", "JSON parser"), license: "MIT", url: "https://rapidjson.org/" }); + projectsModel.append({ name: "STB", description: catalog.i18nc("@label Description for application dependency", "Utility functions, including an image loader"), license: "Public Domain", url: "https://github.com/nothings/stb" }); + projectsModel.append({ name: "Boost", description: catalog.i18nc("@label Description for application dependency", "Utility library, including Voronoi generation"), license: "Boost", url: "https://www.boost.org/" }); //Python modules. - projectsModel.append({ name: "Certifi", description: catalog.i18nc("@label", "Root Certificates for validating SSL trustworthiness"), license: "MPL", url: "https://github.com/certifi/python-certifi" }); - projectsModel.append({ name: "Cryptography", description: catalog.i18nc("@label", "Root Certificates for validating SSL trustworthiness"), license: "APACHE and BSD", url: "https://cryptography.io/" }); - projectsModel.append({ name: "Future", description: catalog.i18nc("@label", "Compatibility between Python 2 and 3"), license: "MIT", url: "https://python-future.org/" }); - projectsModel.append({ name: "keyring", description: catalog.i18nc("@label", "Support library for system keyring access"), license: "MIT", url: "https://github.com/jaraco/keyring" }); - projectsModel.append({ name: "NumPy", description: catalog.i18nc("@label", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" }); - projectsModel.append({ name: "NumPy-STL", description: catalog.i18nc("@label", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" }); - projectsModel.append({ name: "PyClipper", description: catalog.i18nc("@label", "Python bindings for Clipper"), license: "MIT", url: "https://github.com/fonttools/pyclipper" }); - projectsModel.append({ name: "PySerial", description: catalog.i18nc("@label", "Serial communication library"), license: "Python", url: "http://pyserial.sourceforge.net/" }); - projectsModel.append({ name: "SciPy", description: catalog.i18nc("@label", "Support library for scientific computing"), license: "BSD-new", url: "https://www.scipy.org/" }); - projectsModel.append({ name: "Sentry", description: catalog.i18nc("@Label", "Python Error tracking library"), license: "BSD 2-Clause 'Simplified'", url: "https://sentry.io/for/python/" }); - projectsModel.append({ name: "Trimesh", description: catalog.i18nc("@label", "Support library for handling triangular meshes"), license: "MIT", url: "https://trimsh.org" }); - projectsModel.append({ name: "python-zeroconf", description: catalog.i18nc("@label", "ZeroConf discovery library"), license: "LGPL", url: "https://github.com/jstasiak/python-zeroconf" }); + projectsModel.append({ name: "Certifi", description: catalog.i18nc("@label Description for application dependency", "Root Certificates for validating SSL trustworthiness"), license: "MPL", url: "https://github.com/certifi/python-certifi" }); + projectsModel.append({ name: "Cryptography", description: catalog.i18nc("@label Description for application dependency", "Root Certificates for validating SSL trustworthiness"), license: "APACHE and BSD", url: "https://cryptography.io/" }); + projectsModel.append({ name: "Future", description: catalog.i18nc("@label Description for application dependency", "Compatibility between Python 2 and 3"), license: "MIT", url: "https://python-future.org/" }); + projectsModel.append({ name: "keyring", description: catalog.i18nc("@label Description for application dependency", "Support library for system keyring access"), license: "MIT", url: "https://github.com/jaraco/keyring" }); + projectsModel.append({ name: "NumPy", description: catalog.i18nc("@label Description for application dependency", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" }); + projectsModel.append({ name: "NumPy-STL", description: catalog.i18nc("@label Description for application dependency", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" }); + projectsModel.append({ name: "PyClipper", description: catalog.i18nc("@label Description for application dependency", "Python bindings for Clipper"), license: "MIT", url: "https://github.com/fonttools/pyclipper" }); + projectsModel.append({ name: "PySerial", description: catalog.i18nc("@label Description for application dependency", "Serial communication library"), license: "Python", url: "http://pyserial.sourceforge.net/" }); + projectsModel.append({ name: "SciPy", description: catalog.i18nc("@label Description for application dependency", "Support library for scientific computing"), license: "BSD-new", url: "https://www.scipy.org/" }); + projectsModel.append({ name: "Sentry", description: catalog.i18nc("@Label Description for application dependency", "Python Error tracking library"), license: "BSD 2-Clause 'Simplified'", url: "https://sentry.io/for/python/" }); + projectsModel.append({ name: "Trimesh", description: catalog.i18nc("@label Description for application dependency", "Support library for handling triangular meshes"), license: "MIT", url: "https://trimsh.org" }); + projectsModel.append({ name: "python-zeroconf", description: catalog.i18nc("@label Description for application dependency", "ZeroConf discovery library"), license: "LGPL", url: "https://github.com/jstasiak/python-zeroconf" }); //Building/packaging. - projectsModel.append({ name: "CMake", description: catalog.i18nc("@label", "Universal build system configuration"), license: "BSD 3-Clause", url: "https://cmake.org/" }); - projectsModel.append({ name: "Conan", description: catalog.i18nc("@label", "Dependency and package manager"), license: "MIT", url: "https://conan.io/" }); - projectsModel.append({ name: "Pyinstaller", description: catalog.i18nc("@label", "Packaging Python-applications"), license: "GPLv2", url: "https://pyinstaller.org/" }); - projectsModel.append({ name: "AppImageKit", description: catalog.i18nc("@label", "Linux cross-distribution application deployment"), license: "MIT", url: "https://github.com/AppImage/AppImageKit" }); - projectsModel.append({ name: "NSIS", description: catalog.i18nc("@label", "Generating Windows installers"), license: "Zlib", url: "https://nsis.sourceforge.io/" }); + projectsModel.append({ name: "CMake", description: catalog.i18nc("@label Description for development tool", "Universal build system configuration"), license: "BSD 3-Clause", url: "https://cmake.org/" }); + projectsModel.append({ name: "Conan", description: catalog.i18nc("@label Description for development tool", "Dependency and package manager"), license: "MIT", url: "https://conan.io/" }); + projectsModel.append({ name: "Pyinstaller", description: catalog.i18nc("@label Description for development tool", "Packaging Python-applications"), license: "GPLv2", url: "https://pyinstaller.org/" }); + projectsModel.append({ name: "AppImageKit", description: catalog.i18nc("@label Description for development tool", "Linux cross-distribution application deployment"), license: "MIT", url: "https://github.com/AppImage/AppImageKit" }); + projectsModel.append({ name: "NSIS", description: catalog.i18nc("@label Description for development tool", "Generating Windows installers"), license: "Zlib", url: "https://nsis.sourceforge.io/" }); } } diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml index 65d62a5fab..cac23d34c1 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml @@ -17,6 +17,7 @@ UM.Dialog title: catalog.i18nc("@title:window", "Open project file") width: UM.Theme.getSize("small_popup_dialog").width height: UM.Theme.getSize("small_popup_dialog").height + backgroundColor: UM.Theme.getColor("main_background") maximumHeight: height maximumWidth: width diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 0579cb3c30..0b39d84177 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -24,6 +24,16 @@ UM.Dialog property var changesModel: Cura.UserChangesModel { id: userChangesModel } + // Hack to make sure that when the data of our model changes the tablemodel is also updated + // If we directly set the rows (So without the clear being called) it doesn't seem to + // get updated correctly. + property var modelRows: userChangesModel.items + onModelRowsChanged: + { + tableModel.clear() + tableModel.rows = modelRows + } + onVisibilityChanged: { if(visible) @@ -78,8 +88,9 @@ UM.Dialog ] model: UM.TableModel { + id: tableModel headers: ["label", "original_value", "user_value"] - rows: userChangesModel.items + rows: modelRows } sectionRole: "category" } diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index ee189ab73c..a174959807 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -18,6 +18,8 @@ UM.Dialog width: minimumWidth height: minimumHeight + backgroundColor: UM.Theme.getColor("main_background") + property bool dontShowAgain: true function storeDontShowAgain() diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml index 24f211ae17..df72286943 100644 --- a/resources/qml/IconWithText.qml +++ b/resources/qml/IconWithText.qml @@ -24,6 +24,8 @@ Item property alias wrapMode: label.wrapMode property real spacing: UM.Theme.getSize("narrow_margin").width + property string tooltipText: "" + // These properties can be used in combination with layouts. readonly property real contentWidth: icon.width + margin + label.contentWidth readonly property real minContentWidth: Math.round(icon.width + margin + 0.5 * label.contentWidth) @@ -66,4 +68,13 @@ Item margins: margin } } + + MouseArea + { + enabled: tooltipText != "" + anchors.fill: parent + hoverEnabled: true + onEntered: base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipText) + onExited: base.hideTooltip() + } } \ No newline at end of file diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 9b6f5bf609..c77545bc03 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -92,6 +92,7 @@ UM.ManagementPage minimumHeight: UM.Theme.getSize("modal_window_minimum").height maximumWidth: minimumWidth * 3 maximumHeight: minimumHeight * 3 + backgroundColor: UM.Theme.getColor("main_background") } UM.ConfirmRemoveDialog diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index eb8b46dbad..ce3f9c4303 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -8,9 +8,9 @@ import QtQuick.Layouts 1.15 import QtQuick.Window 2.1 import Cura 1.1 as Cura -import UM 1.5 as UM +import UM 1.6 as UM -Window +UM.Window { id: materialsSyncDialog property variant catalog: UM.I18nCatalog { name: "cura" } @@ -88,7 +88,15 @@ Window { if(Cura.API.account.isLoggedIn) { - swipeView.currentIndex += 2; //Skip sign in page. + if(Cura.API.account.permissions.includes("digital-factory.printer.write")) + { + swipeView.currentIndex += 2; //Skip sign in page. Continue to sync via cloud. + } + else + { + //Logged in, but no permissions to start syncing. Direct them to USB. + swipeView.currentIndex = removableDriveSyncPage.SwipeView.index; + } } else { @@ -112,7 +120,15 @@ Window { if(is_logged_in && signinPage.SwipeView.isCurrentItem) { - swipeView.currentIndex += 1; + if(Cura.API.account.permissions.includes("digital-factory.printer.write")) + { + swipeView.currentIndex += 1; + } + else + { + //Logged in, but no permissions to start syncing. Direct them to USB. + swipeView.currentIndex = removableDriveSyncPage.SwipeView.index; + } } } } diff --git a/resources/qml/Preferences/RenameDialog.qml b/resources/qml/Preferences/RenameDialog.qml index 6e4c628114..7bcd65ed5d 100644 --- a/resources/qml/Preferences/RenameDialog.qml +++ b/resources/qml/Preferences/RenameDialog.qml @@ -23,7 +23,7 @@ UM.Dialog property string explanation: catalog.i18nc("@info", "Please provide a new name.") title: dialogTitle - + backgroundColor: UM.Theme.getColor("main_background") minimumWidth: UM.Theme.getSize("small_popup_dialog").width minimumHeight: UM.Theme.getSize("small_popup_dialog").height width: minimumWidth diff --git a/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml index 1a54dc27db..10f006538b 100644 --- a/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml @@ -51,7 +51,7 @@ Item target: warning text: { var profile_name = Cura.MachineManager.activeQualityChangesGroup.name - return "%1 %2".arg(profile_name).arg(catalog.i18nc("@info", "custom profile is active and you overwrote some settings.")) + return catalog.i18nc("@info, %1 is the name of the custom profile", "%1 custom profile is active and you overwrote some settings.").arg(profile_name) } } @@ -65,7 +65,7 @@ Item target: warning text: { var profile_name = Cura.MachineManager.activeQualityChangesGroup.name - return "%1 %2".arg(profile_name).arg(catalog.i18nc("@info", "custom profile is overriding some settings.")) + return catalog.i18nc("@info, %1 is the name of the custom profile", "%1 custom profile is overriding some settings.").arg(profile_name) } } }, diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 74c496f824..8d31d6292d 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -13,7 +13,7 @@ import Cura 1.0 as Cura Item { id: enableAdhesionRow - height: childrenRect.height + height: enableAdhesionContainer.height property real labelColumnWidth: Math.round(width / 3) property var curaRecommendedMode: Cura.RecommendedMode {} @@ -47,8 +47,6 @@ Item id: enableAdhesionCheckBox anchors.verticalCenter: parent.verticalCenter - property alias _hovered: adhesionMouseArea.containsMouse - //: Setting enable printing build-plate adhesion helper checkbox enabled: recommendedPrintSetup.settingsEnabled @@ -60,22 +58,25 @@ Item id: adhesionMouseArea anchors.fill: parent hoverEnabled: true - - onClicked: - { - curaRecommendedMode.setAdhesion(!parent.checked) - } - - onEntered: - { - base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); - } - onExited: base.hideTooltip() + // propagateComposedEvents used on adhesionTooltipMouseArea does not work with Controls Components. + // It only works with other MouseAreas, so this is required + onClicked: curaRecommendedMode.setAdhesion(!parent.checked) } } } + MouseArea + { + id: adhesionTooltipMouseArea + anchors.fill: parent + propagateComposedEvents: true + hoverEnabled: true + + onEntered:base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0), + catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); + onExited: base.hideTooltip() + } + UM.SettingPropertyProvider { id: platformAdhesionType diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml index 9e2d73609c..0317cb7814 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -51,7 +51,17 @@ Item { target: infillSlider property: "value" - value: parseInt(infillDensity.properties.value) + value: { + // The infill slider has a max value of 100. When it is given a value > 100 onValueChanged updates the setting to be 100. + // When changing to an intent with infillDensity > 100, it would always be clamped to 100. + // This will force the slider to ignore the first onValueChanged for values > 100 so higher values can be set. + var density = parseInt(infillDensity.properties.value) + if (density > 100) { + infillSlider.ignoreValueChange = true + } + + return density + } } // Here are the elements that are shown in the left column @@ -65,6 +75,7 @@ Item font: UM.Theme.getFont("medium") width: labelColumnWidth iconSize: UM.Theme.getSize("medium_button_icon").width + tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") } Item @@ -83,6 +94,8 @@ Item { id: infillSlider + property var ignoreValueChange: false + width: parent.width height: UM.Theme.getSize("print_setup_slider_handle").height // The handle is the widest element of the slider @@ -102,7 +115,6 @@ Item id: backgroundLine height: UM.Theme.getSize("print_setup_slider_groove").height width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width - implicitWidth: width anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter color: infillSlider.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") @@ -157,7 +169,13 @@ Item target: infillSlider function onValueChanged() { - // Don't round the value if it's already the same + if (infillSlider.ignoreValueChange) + { + infillSlider.ignoreValueChange = false + return + } + + // Don't update if the setting value, if the slider has the same value if (parseInt(infillDensity.properties.value) == infillSlider.value) { return diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 086e27d41b..94de16141f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -62,7 +62,7 @@ Item { width: parent.width Layout.fillWidth: true - Layout.topMargin: UM.Theme.getSize("thin_margin").height + Layout.topMargin: UM.Theme.getSize("default_margin").height Layout.bottomMargin: UM.Theme.getSize("thin_margin").height } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 87cb271ed4..bc5826fe7c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -43,7 +43,6 @@ Item qualityType = Cura.MachineManager.activeQualityType } else { qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category) - print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)) } Cura.IntentManager.selectIntent(model.intent_category, qualityType) } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml index bbad686514..4f1b49e931 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml @@ -22,6 +22,7 @@ Item id: resolutionTitle anchors.top: parent.top anchors.left: parent.left + anchors.leftMargin: - UM.Theme.getSize("thick_lining").width source: UM.Theme.getIcon("PrintQuality") text: catalog.i18nc("@label", "Resolution") width: labelColumnWidth diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 0b683f0ddf..3e40c16d74 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -14,39 +14,41 @@ import Cura 1.0 as Cura Item { id: enableSupportRow - height: childrenRect.height + height: UM.Theme.getSize("print_setup_big_item").height property real labelColumnWidth: Math.round(width / 3) - Cura.IconWithText - { - id: enableSupportRowTitle - anchors.top: parent.top - anchors.left: parent.left - visible: enableSupportCheckBox.visible - source: UM.Theme.getIcon("Support") - text: catalog.i18nc("@label", "Support") - font: UM.Theme.getFont("medium") - width: labelColumnWidth - iconSize: UM.Theme.getSize("medium_button_icon").width - } - Item { id: enableSupportContainer - height: enableSupportCheckBox.height + width: labelColumnWidth + enableSupportCheckBox.width anchors { - left: enableSupportRowTitle.right - right: parent.right - verticalCenter: enableSupportRowTitle.verticalCenter + left: parent.left + top: parent.top + bottom: parent.bottom + rightMargin: UM.Theme.getSize("thick_margin").width + } + + Cura.IconWithText + { + id: enableSupportRowTitle + anchors.left: parent.left + visible: enableSupportCheckBox.visible + source: UM.Theme.getIcon("Support") + text: catalog.i18nc("@label", "Support") + font: UM.Theme.getFont("medium") + width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width + tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") } UM.CheckBox { id: enableSupportCheckBox anchors.verticalCenter: parent.verticalCenter + anchors.left: enableSupportRowTitle.right property alias _hovered: enableSupportMouseArea.containsMouse @@ -60,158 +62,220 @@ Item id: enableSupportMouseArea anchors.fill: parent hoverEnabled: true - + // propagateComposedEvents used on supportToolTipMouseArea does not work with Controls Components. + // It only works with other MouseAreas, so this is required onClicked: supportEnabled.setPropertyValue("value", supportEnabled.properties.value != "True") - - onEntered: - { - base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.")) - } - onExited: base.hideTooltip() } } - ComboBox + MouseArea { - id: supportExtruderCombobox + id: supportToolTipMouseArea + anchors.fill: parent + propagateComposedEvents: true + hoverEnabled: true + onEntered: base.showTooltip(enableSupportContainer, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0), + catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.")) + onExited: base.hideTooltip() + } + } - height: UM.Theme.getSize("print_setup_big_item").height - anchors + ComboBox + { + id: supportExtruderCombobox + + height: UM.Theme.getSize("print_setup_big_item").height + anchors + { + left: enableSupportContainer.right + right: parent.right + leftMargin: UM.Theme.getSize("default_margin").width + rightMargin: UM.Theme.getSize("thick_margin").width + verticalCenter: parent.verticalCenter + } + + enabled: recommendedPrintSetup.settingsEnabled + visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) + textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started + + model: extruderModel + + // knowing the extruder position, try to find the item index in the model + function getIndexByPosition(position) + { + var itemIndex = -1 // if position is not found, return -1 + for (var item_index in model.items) { - left: enableSupportCheckBox.right - right: parent.right - leftMargin: UM.Theme.getSize("thick_margin").width - rightMargin: UM.Theme.getSize("thick_margin").width - verticalCenter: parent.verticalCenter - } - - enabled: recommendedPrintSetup.settingsEnabled - visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) - textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started - - model: extruderModel - - // knowing the extruder position, try to find the item index in the model - function getIndexByPosition(position) - { - var itemIndex = -1 // if position is not found, return -1 - for (var item_index in model.items) + var item = model.getItem(item_index) + if (item.index == position) { - var item = model.getItem(item_index) - if (item.index == position) - { - itemIndex = item_index - break - } - } - return itemIndex - } - - onActivated: - { - if (model.getItem(index).enabled) - { - forceActiveFocus(); - supportExtruderNr.setPropertyValue("value", model.getItem(index).index); - } else - { - currentIndex = supportExtruderNr.properties.value; // keep the old value + itemIndex = item_index + break } } + return itemIndex + } - currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 - - property string color: "#fff" - Connections + onActivated: + { + if (model.getItem(index).enabled) { - target: extruderModel - function onModelChanged() - { - var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color - if (maybeColor) - { - supportExtruderCombobox.color = maybeColor - } - } + forceActiveFocus(); + supportExtruderNr.setPropertyValue("value", model.getItem(index).index); + } else + { + currentIndex = supportExtruderNr.properties.value; // keep the old value } - onCurrentIndexChanged: + } + + currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 + + property string color: "#fff" + Connections + { + target: extruderModel + function onModelChanged() { var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color - if(maybeColor) + if (maybeColor) { supportExtruderCombobox.color = maybeColor } } - - Binding + } + onCurrentIndexChanged: + { + var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color + if(maybeColor) { - target: supportExtruderCombobox - property: "currentIndex" - value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) - // Sometimes when the value is already changed, the model is still being built. - // The when clause ensures that the current index is not updated when this happens. - when: supportExtruderCombobox.model.count > 0 + supportExtruderCombobox.color = maybeColor } + } - indicator: UM.ColorImage + Binding + { + target: supportExtruderCombobox + property: "currentIndex" + value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) + // Sometimes when the value is already changed, the model is still being built. + // The when clause ensures that the current index is not updated when this happens. + when: supportExtruderCombobox.model.count > 0 + } + + indicator: UM.ColorImage + { + id: downArrow + x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding + y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) + + source: UM.Theme.getIcon("ChevronSingleDown") + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height + + color: UM.Theme.getColor("setting_control_button") + } + + background: Rectangle + { + color: { - id: downArrow - x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding - y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) + if (!enabled) + { + return UM.Theme.getColor("setting_control_disabled") + } + if (supportExtruderCombobox.hovered || base.activeFocus) + { + return UM.Theme.getColor("setting_control_highlight") + } + return UM.Theme.getColor("setting_control") + } + radius: UM.Theme.getSize("setting_control_radius").width + border.width: UM.Theme.getSize("default_lining").width + border.color: + { + if (!enabled) + { + return UM.Theme.getColor("setting_control_disabled_border") + } + if (supportExtruderCombobox.hovered || supportExtruderCombobox.activeFocus) + { + return UM.Theme.getColor("setting_control_border_highlight") + } + return UM.Theme.getColor("setting_control_border") + } + } - source: UM.Theme.getIcon("ChevronSingleDown") - width: UM.Theme.getSize("standard_arrow").width - height: UM.Theme.getSize("standard_arrow").height + contentItem: UM.Label + { + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width + anchors.right: downArrow.left + rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - color: UM.Theme.getColor("setting_control_button") + text: supportExtruderCombobox.currentText + textFormat: Text.PlainText + color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") + + elide: Text.ElideLeft + + + background: Rectangle + { + id: swatch + height: Math.round(parent.height / 2) + width: height + radius: Math.round(width / 2) + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.rightMargin: UM.Theme.getSize("thin_margin").width + + color: supportExtruderCombobox.color + } + } + + popup: Popup + { + y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height + width: supportExtruderCombobox.width + implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width + padding: UM.Theme.getSize("default_lining").width + + contentItem: ListView + { + implicitHeight: contentHeight + + ScrollBar.vertical: UM.ScrollBar {} + clip: true + model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null + currentIndex: supportExtruderCombobox.highlightedIndex } background: Rectangle { - color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled") - } - if (supportExtruderCombobox.hovered || base.activeFocus) - { - return UM.Theme.getColor("setting_control_highlight") - } - return UM.Theme.getColor("setting_control") - } - radius: UM.Theme.getSize("setting_control_radius").width - border.width: UM.Theme.getSize("default_lining").width - border.color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled_border") - } - if (supportExtruderCombobox.hovered || supportExtruderCombobox.activeFocus) - { - return UM.Theme.getColor("setting_control_border_highlight") - } - return UM.Theme.getColor("setting_control_border") - } + color: UM.Theme.getColor("setting_control") + border.color: UM.Theme.getColor("setting_control_border") } + } + + delegate: ItemDelegate + { + width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width + height: supportExtruderCombobox.height + highlighted: supportExtruderCombobox.highlightedIndex == index contentItem: UM.Label { - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left + anchors.fill: parent anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width - anchors.right: downArrow.left + anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width + + text: model.name + color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") + + elide: Text.ElideRight rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - text: supportExtruderCombobox.currentText - textFormat: Text.PlainText - color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") - - elide: Text.ElideLeft - - background: Rectangle { id: swatch @@ -222,71 +286,14 @@ Item anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - color: supportExtruderCombobox.color + color: supportExtruderCombobox.model.getItem(index).color } } - popup: Popup + background: Rectangle { - y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height - width: supportExtruderCombobox.width - implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width - padding: UM.Theme.getSize("default_lining").width - - contentItem: ListView - { - implicitHeight: contentHeight - - ScrollBar.vertical: UM.ScrollBar {} - clip: true - model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null - currentIndex: supportExtruderCombobox.highlightedIndex - } - - background: Rectangle - { - color: UM.Theme.getColor("setting_control") - border.color: UM.Theme.getColor("setting_control_border") - } - } - - delegate: ItemDelegate - { - width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width - height: supportExtruderCombobox.height - highlighted: supportExtruderCombobox.highlightedIndex == index - - contentItem: UM.Label - { - anchors.fill: parent - anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width - anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width - - text: model.name - color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") - - elide: Text.ElideRight - rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - - background: Rectangle - { - id: swatch - height: Math.round(parent.height / 2) - width: height - radius: Math.round(width / 2) - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.rightMargin: UM.Theme.getSize("thin_margin").width - - color: supportExtruderCombobox.model.getItem(index).color - } - } - - background: Rectangle - { - color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" - border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" - } + color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" + border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" } } } diff --git a/resources/qml/PrinterSelector/MachineListButton.qml b/resources/qml/PrinterSelector/MachineListButton.qml new file mode 100644 index 0000000000..55ae5497d9 --- /dev/null +++ b/resources/qml/PrinterSelector/MachineListButton.qml @@ -0,0 +1,87 @@ +// 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 +import Cura 1.0 as Cura + + +Button +{ + id: machineListButton + + width: parent.width + height: UM.Theme.getSize("large_button").height + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + checkable: true + hoverEnabled: true + + contentItem: Item + { + width: machineListButton.width - machineListButton.leftPadding - machineListButton.rightPadding + height: UM.Theme.getSize("action_button").height + + UM.ColorImage + { + id: printerIcon + height: UM.Theme.getSize("medium_button").height + width: UM.Theme.getSize("medium_button").width + color: UM.Theme.getColor("machine_selector_printer_icon") + visible: model.isAbstractMachine || !model.isOnline + source: model.isAbstractMachine ? UM.Theme.getIcon("PrinterTriple", "medium") : UM.Theme.getIcon("Printer", "medium") + + anchors + { + left: parent.left + verticalCenter: parent.verticalCenter + } + } + + UM.Label + { + id: buttonText + anchors + { + left: printerIcon.right + right: printerCount.left + verticalCenter: parent.verticalCenter + leftMargin: UM.Theme.getSize("default_margin").width + } + text: machineListButton.text + font: model.isAbstractMachine ? UM.Theme.getFont("medium_bold") : UM.Theme.getFont("medium") + visible: text != "" + elide: Text.ElideRight + } + + Rectangle + { + id: printerCount + color: UM.Theme.getColor("background_2") + radius: height + width: height + anchors + { + right: parent.right + top: buttonText.top + bottom: buttonText.bottom + } + visible: model.isAbstractMachine + + UM.Label + { + text: model.machineCount + anchors.centerIn: parent + font: UM.Theme.getFont("default_bold") + } + } + } + + background: Rectangle + { + id: backgroundRect + color: machineListButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + } +} diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 77cd2be409..869d536a00 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -192,7 +192,7 @@ Cura.ExpandablePopup contentItem: Item { id: popup - implicitWidth: UM.Theme.getSize("machine_selector_widget_content").width + 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. MachineSelectorList { @@ -224,6 +224,9 @@ Cura.ExpandablePopup anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter + anchors.left: parent.left + anchors.right: parent.right + padding: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width @@ -236,7 +239,7 @@ Cura.ExpandablePopup // 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: UM.Theme.getSize("machine_selector_widget_content").width / 2 - leftPadding + width: buttonRow.width / 2 - leftPadding * 1.5 onClicked: { toggleContent() @@ -253,7 +256,7 @@ Cura.ExpandablePopup 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: UM.Theme.getSize("machine_selector_widget_content").width / 2 - leftPadding + width: buttonRow.width / 2 - rightPadding * 1.5 onClicked: { toggleContent() diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml index ae2706f9ab..06c2fdb40c 100644 --- a/resources/qml/PrinterSelector/MachineSelectorList.qml +++ b/resources/qml/PrinterSelector/MachineSelectorList.qml @@ -10,8 +10,8 @@ import Cura 1.0 as Cura ListView { id: listView - model: Cura.GlobalStacksModel {} - section.property: "hasRemoteConnection" + model: Cura.MachineListModel {} + section.property: "isOnline" property real contentHeight: childrenRect.height ScrollBar.vertical: UM.ScrollBar @@ -21,7 +21,7 @@ ListView section.delegate: UM.Label { - text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Preset printers") + text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Other printers") width: parent.width - scrollBar.width height: UM.Theme.getSize("action_button").height leftPadding: UM.Theme.getSize("default_margin").width @@ -29,13 +29,10 @@ ListView color: UM.Theme.getColor("text_medium") } - delegate: MachineSelectorButton + delegate: MachineListButton { text: model.name ? model.name : "" width: listView.width - scrollBar.width - outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null - - checked: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.id == model.id : false onClicked: { diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml index 215d2be1be..3aba5b7ecf 100644 --- a/resources/qml/Settings/SettingCheckBox.qml +++ b/resources/qml/Settings/SettingCheckBox.qml @@ -15,7 +15,13 @@ SettingItem contents: MouseArea { id: control - anchors.fill: parent + anchors + { + top: parent.top + bottom: parent.bottom + left: parent.left + } + width: UM.Theme.getSize("checkbox").width hoverEnabled: true property bool checked: diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 228de4a9d6..53f194dfd2 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -209,7 +209,7 @@ Item height: UM.Theme.getSize("small_button_icon").height width: height - color: UM.Theme.getColor("setting_control_button") + color: UM.Theme.getColor("accent_1") hoverColor: UM.Theme.getColor("setting_control_button_hover") iconSource: UM.Theme.getIcon("ArrowReset") diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index f0e3b2cacb..4e72bca93e 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -153,13 +153,13 @@ SettingItem selectionColor: UM.Theme.getColor("text_selection") selectByMouse: true - maximumLength: (definition.type == "str" || definition.type == "[int]") ? -1 : 10 + maximumLength: (definition.type == "str" || definition.type == "[int]") ? -1 : 12 // Since [int] & str don't have a max length, they need to be clipped (since clipping is expensive, this // should be done as little as possible) clip: definition.type == "str" || definition.type == "[int]" - validator: RegularExpressionValidator { regularExpression: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,9}\s*,)*(\s*-?[0-9]{0,9})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,10}$/ : (definition.type == "float") ? /^-?[0-9]{0,9}[.,]?[0-9]{0,3}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry + validator: RegularExpressionValidator { regularExpression: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,11}\s*,)*(\s*-?[0-9]{0,11})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,12}$/ : (definition.type == "float") ? /^-?[0-9]{0,11}[.,]?[0-9]{0,3}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry Binding { diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index 77e6c489e9..eac85bfb44 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -56,28 +56,30 @@ ComboBox background: UM.UnderlineBackground { - //Rectangle for highlighting when this combobox needs to pulse. + // Rectangle for highlighting when this combobox needs to pulse. Rectangle { anchors.fill: parent opacity: 0 - color: UM.Theme.getColor("warning") + color: "transparent" + + border.color: UM.Theme.getColor("text_field_border_active") + border.width: UM.Theme.getSize("default_lining").width SequentialAnimation on opacity { id: pulseAnimation running: false - loops: 1 - alwaysRunToEnd: true + loops: 2 PropertyAnimation { to: 1 - duration: 300 + duration: 150 } PropertyAnimation { to: 0 - duration : 2000 + duration : 150 } } } diff --git a/resources/qml/qmldir b/resources/qml/qmldir index a47d85545b..6ec3ca91c8 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -2,6 +2,7 @@ module Cura MachineSelector 1.0 MachineSelector.qml MachineSelectorButton 1.0 MachineSelectorButton.qml +MachineListButton 1.0 MachineListButton.qml CustomConfigurationSelector 1.0 CustomConfigurationSelector.qml PrintSetupSelector 1.0 PrintSetupSelector.qml ProfileOverview 1.6 ProfileOverview.qml diff --git a/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg b/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg new file mode 100644 index 0000000000..7a2c9ac824 --- /dev/null +++ b/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg @@ -0,0 +1,46 @@ +[general] +version = 4 +name = Suggested parameters for ABS_V1.0 +definition = anycubic_kobra + +[metadata] +setting_version = 20 +type = quality +quality_type = abs +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 +acceleration_enabled = True +default_material_bed_temperature = 80 +jerk_enabled = True +layer_height_0 = 0.2 +acceleration_print = 800 +acceleration_travel = 3000 +acceleration_travel_layer_0 = 3000.0 +bottom_layers = 6 +brim_width = 7.0 +default_material_print_temperature = 230 +infill_overlap = 15 +infill_sparse_density = 20 +initial_layer_line_width_factor = 140 +jerk_print = 8 +jerk_travel = 10 +material_final_print_temperature = 230 +material_flow = 100 +material_flow_layer_0 = 120 +material_initial_print_temperature = 230 +optimize_wall_printing_order = True +inset_direction = outside_in +retraction_amount = 6 +retraction_min_travel = =line_width * 2 +retraction_speed = 40 +skirt_brim_speed = 40 +speed_print = 50 +speed_travel = 100 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 +z_seam_type = sharpest_corner +z_seam_x = 110 +z_seam_y = 220 \ No newline at end of file diff --git a/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg b/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg new file mode 100644 index 0000000000..32ea58a93f --- /dev/null +++ b/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = Suggested parameters for PLA_V1.0 +definition = anycubic_kobra + +[metadata] +setting_version = 20 +type = quality +quality_type = pla +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +acceleration_enabled = True +jerk_enabled = True +layer_height_0 = 0.2 +acceleration_print = 1000 +acceleration_travel_layer_0 = 2000.0 +bottom_layers = 6 +brim_width = 4.0 +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 100 +jerk_print = 8 +jerk_travel = 10 +material_final_print_temperature = 200 +material_initial_print_temperature = 200 +optimize_wall_printing_order = True +inset_direction = outside_in +retraction_amount = 6 +retraction_min_travel = 1.5 +retraction_speed = 40 +skirt_brim_speed = 40 +speed_print = 50 +speed_travel = 100 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 +z_seam_type = sharpest_corner +z_seam_x = 110 +z_seam_y = 220 \ No newline at end of file diff --git a/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg b/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg new file mode 100644 index 0000000000..432eeb4bb6 --- /dev/null +++ b/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg @@ -0,0 +1,45 @@ +[general] +version = 4 +name = Suggested parameters for TPU_V1.0 +definition = anycubic_kobra + +[metadata] +setting_version = 20 +type = quality +quality_type = tpu +weight = 1 +global_quality = True + +[values] +layer_height = 0.2 +acceleration_enabled = True +jerk_enabled = True +layer_height_0 = 0.2 +acceleration_print = 800 +acceleration_travel = 3000 +acceleration_travel_layer_0 = 3000.0 +bottom_layers = 6 +brim_width = 7.0 +default_material_print_temperature = 190 +infill_overlap = 15 +infill_sparse_density = 25 +initial_layer_line_width_factor = 140 +jerk_print = 8 +jerk_travel = 10 +material_final_print_temperature = 190 +material_flow = 90 +material_flow_layer_0 = 120 +material_initial_print_temperature = 190 +optimize_wall_printing_order = True +inset_direction = outside_in +retraction_amount = 8 +retraction_min_travel = =line_width * 2 +retraction_speed = 60 +skirt_brim_speed = 40 +speed_print = 50 +speed_travel = 100 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 +z_seam_type = sharpest_corner +z_seam_x = 110 +z_seam_y = 220 \ No newline at end of file diff --git a/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg new file mode 100644 index 0000000000..d4434c6b79 --- /dev/null +++ b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg @@ -0,0 +1,53 @@ +[general] +version = 4 +name = Suggested parameters for PLA_V1.0 +definition = anycubic_kobra_max + +[metadata] +setting_version = 20 +type = quality +quality_type = pla +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +acceleration_enabled = True +jerk_enabled = True +layer_height_0 = 0.2 +acceleration_print = 1000 +acceleration_travel = 3000 +brim_width = 7 +default_material_print_temperature = 195 +infill_sparse_density = 15 +initial_layer_line_width_factor = 140 +jerk_print = 8 +jerk_travel = 10 +material_final_print_temperature = 195 +material_flow = 95 +material_flow_layer_0 = 120 +material_initial_print_temperature = 195 +material_print_temperature_layer_0 = 0 +optimize_wall_printing_order = True +retraction_amount = 6 +retraction_hop = 0.075 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 1.5 +retraction_speed = 40 +skirt_brim_speed = 40 +speed_layer_0 = 45 +speed_print = 80 +speed_topbottom = 45 +speed_travel = 100 +speed_travel_layer_0 = 100 +speed_wall = 80 +speed_wall_0 = 45 +speed_wall_x = 80 +speed_z_hop = 20 +top_bottom_thickness = 1.2 +top_thickness = 1.2 +wall_thickness = 1.2 +z_seam_type = sharpest_corner +z_seam_x = 110 +z_seam_y = 220 \ No newline at end of file diff --git a/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg new file mode 100644 index 0000000000..94ea7f8579 --- /dev/null +++ b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = Suggested parameters for TPU_V1.0 +definition = anycubic_kobra_max + +[metadata] +setting_version = 20 +type = quality +quality_type = tpu +weight = 1 +global_quality = True + +[values] +layer_height = 0.2 +acceleration_enabled = True +jerk_enabled = False +layer_height_0 = 0.3 +acceleration_print = 1000 +acceleration_travel = 3000 +brim_width = 5 +cool_fan_speed_0 = 10 +default_material_print_temperature = 210 +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 130 +jerk_print = 8 +jerk_travel = 10 +material_final_print_temperature = 210 +material_flow = 90 +material_flow_layer_0 = 100 +material_initial_print_temperature = 210 +material_print_temperature_layer_0 = 210 +optimize_wall_printing_order = False +retraction_amount = 8 +retraction_hop = 0.075 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 1.5 +retraction_speed = 60 +skirt_brim_speed = 40 +speed_layer_0 = 40 +speed_print = 80 +speed_topbottom = 32 +speed_travel = 100 +speed_travel_layer_0 = 50 +speed_wall = 80 +speed_wall_0 = 45 +speed_wall_x = 80 +speed_z_hop = 10 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 +z_seam_type = sharpest_corner +z_seam_x = 110 +z_seam_y = 220 \ No newline at end of file diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index d2c546570a..9a73786941 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -28,7 +28,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 1e8af3fdde..bfc155c5cb 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -27,7 +27,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index aa9e815df5..06293319d8 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -27,7 +27,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 0a5c803589..7ae006b606 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -29,7 +29,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 6464c434e6..2d6c3617bf 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -26,7 +26,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 6d7f1e8a94..aad794f91c 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -29,7 +29,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index 51d9607d02..c0aa59f1d0 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -28,7 +28,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index ad80497cf8..1e2b316efc 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -27,7 +27,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 4001c60204..9fd4d77ed9 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -27,7 +27,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 05ac62cb57..e1825dfd42 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -27,7 +27,6 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -inset_direction = inside_out alternate_extra_perimeter = False fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg index edd764aea6..f3576e3060 100644 --- a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg @@ -21,7 +21,6 @@ top_thickness = 0.8 top_layers = 4 bottom_thickness = 0.8 bottom_layers = 4 -inset_direction = inside_out skin_outline_count = 0 ; infill_line_distance = 8 diff --git a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg index bdc140914e..a4ff9e9ad6 100644 --- a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg @@ -21,7 +21,6 @@ top_thickness = 0.8 top_layers = 10 bottom_thickness = 0.8 bottom_layers = 10 -inset_direction = inside_out skin_outline_count = 1 ; infill_line_distance = 8 diff --git a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg index cd6c2c85bb..9221a7e15e 100644 --- a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg @@ -21,7 +21,6 @@ top_thickness = 0.8 top_layers = 5 bottom_thickness = 0.8 bottom_layers = 5 -inset_direction = inside_out skin_outline_count = 0 ; infill_line_distance = 8 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 64a6db0573..fd8f22a3fe 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index b3cb9eb2f7..0723122770 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,13 +12,13 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index bc3928bab4..7ad6967e6b 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index 9dd15079c7..add681b5c6 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 7e22a08939..fbf7d65477 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index e298848a90..07b91499e4 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.4 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index f52206e9b3..6177272235 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,11 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.3 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True -support_infill_sparse_thickness = 0.3 support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index fd9ec86036..048708b0d1 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = -1 global_quality = True [values] -layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height +layer_height = 0.15 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index 3522f0b5a0..a67d97a78e 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = 1 global_quality = True [values] -layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height +layer_height = 0.06 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 5955a587f4..4a68719014 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height 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 6c3a7e7a81..376af254f9 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 @@ -19,5 +19,3 @@ top_bottom_thickness = 0.8 initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index ef7623fe0a..6bef64658f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -22,8 +22,6 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = 190 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 retraction_hop = 0.2 skin_overlap = 5 speed_layer_0 = =speed_print diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index a19b438a9a..61ec5d977d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -22,8 +22,6 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature - 15 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 30 / 30) speed_print = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 87415ecb05..577362391f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 13e07744b1..416a175c81 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,13 +12,13 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature - 10 # prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 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 aa1ba2ef27..e77195665a 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 @@ -15,8 +15,6 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 skin_overlap = 20 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 7c2ad43944..8117c60edc 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 @@ -16,8 +16,6 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 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 5b65d2351b..85a05b576a 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 @@ -18,8 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 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 20b668ca51..b75ab359b4 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 @@ -17,8 +17,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index c82fb9c68d..420e250f71 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -18,8 +18,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index f60adf89f3..50b3954774 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -17,8 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 6f230a94cd..99f977d17c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -19,8 +19,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 57fad8111c..210536340f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -18,8 +18,6 @@ cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index 62a5516b2c..e2f00681a6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -28,9 +28,6 @@ material_print_temperature = =default_material_print_temperature + 10 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 - prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index c3837c7850..a35ff96196 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index 3f08161091..9c688e3995 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -19,8 +19,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index 1046c70272..f6885552ba 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -19,8 +19,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index 48443ce029..09146132d0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -20,8 +20,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 50206224a9..72c9981665 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -28,9 +28,6 @@ material_print_temperature = =default_material_print_temperature - 5 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 - prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 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 ad9ef89a03..be5ae977b5 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,8 +16,6 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 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 1f131578a9..ba58a799e9 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,8 +16,6 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 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 60c06b80ce..f121297ab7 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,8 +16,6 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 1491af9743..5321690d9c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index fdad9fc5df..a559d0f912 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True raft_margin = 10 support_angle = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 9f12894816..21425a4920 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index 622bc635c7..aaa7981b3d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -23,8 +23,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index f20bde1f59..dfec5abf1b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -23,8 +23,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False raft_margin = 10 retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index d4a02e65e8..445d4c6cfd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,8 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 85e3e2530a..1df9f6b97b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 5bcaf96f5f..7495130aa9 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 7b31e48283..308d26bf62 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg index 10d8666ade..83ac175c47 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg index 5a9f03349a..9c89527d1e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index 237eda83e3..df7c944caf 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index c561977e5b..84169d31f7 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 3742eec814..5d2618a02d 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 4c7dbe5b28..88d6049ff9 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index ff65fd5c57..eccccc6d42 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height 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 76c8372166..3df31368bd 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 @@ -17,7 +17,4 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 initial_layer_line_width_factor = 100 - -material_print_temperature = =default_material_print_temperature - 5 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 \ No newline at end of file +material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index d469288e35..6c82905859 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -22,8 +22,6 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = 190 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 retraction_hop = 0.2 skin_overlap = 5 speed_layer_0 = =speed_print diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index 1e0b4c0044..37a15aa1ba 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -22,8 +22,6 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature - 15 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 30 / 30) speed_print = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index e57c078d70..e2450cd6b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index d63710b4b6..24f007b99b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,13 +12,13 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_print_temperature = =default_material_print_temperature - 10 # prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 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 bedfaa177a..3e0bd8d4b8 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 @@ -15,8 +15,6 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 skin_overlap = 20 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 2a6b354674..f9a8aa8915 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 @@ -16,8 +16,6 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 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 2925e5ca6f..289521bd01 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 @@ -18,8 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 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 7dbca8a664..8129f66fc3 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 @@ -17,8 +17,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index e85891cdc8..bcd193268d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -18,8 +18,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index 408c65da04..37ca77c51a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -17,8 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index e803a92538..98049f2d1c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -19,8 +19,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 4653d1bdbb..b9acd3ba63 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -18,8 +18,6 @@ cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index 74161daa57..4e5180032c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -28,8 +28,6 @@ material_print_temperature = =default_material_print_temperature + 10 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index 535b85955a..5b627b87f7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index a2e585117b..f1370caaf0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -19,8 +19,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index def68b8525..8f1158bcbc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -19,8 +19,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index 5a55438f0e..6f46c9c441 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -20,8 +20,6 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 48f65ed4da..5138c25d0b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -28,9 +28,6 @@ material_print_temperature = =default_material_print_temperature - 5 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 - prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 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 6e6b0a09a4..b128d3a252 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,8 +16,6 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 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 5de1db358f..8aa0a748d4 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,8 +16,6 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 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 1f95f693e8..ad9b43ab07 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,8 +16,6 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.5 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index 9575708085..b465c3d95c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index d85aeb3f9b..0f2aa42b8d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True raft_margin = 10 support_angle = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index e39360b6ca..e6e1a9c718 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -21,8 +21,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index fbf2ad1733..d0bbce15a0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -23,8 +23,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index 5683956267..62a9b616b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -23,8 +23,6 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False raft_margin = 10 retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index cb2430636a..b8e0103386 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,8 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.3 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index f69ecfbb94..b98235718b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 17b3dd2467..40dcd5da35 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 47dcbe57fa..d5397c44eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg index d6f54f2e49..4b82c58a66 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg index c11af88907..6c855696de 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index a2769f7e88..d0cfbad066 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index 24515461c7..14bc1dd211 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -material_shrinkage_percentage_xy = 100.2 -material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 34d2946524..8ab6de530f 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index 14b0a3bb4e..a3153e8718 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index ed099f85bd..ef68e808dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg new file mode 100644 index 0000000000..aad9aaa72e --- /dev/null +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_abs +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +support_infill_rate = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg new file mode 100644 index 0000000000..0390da964f --- /dev/null +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_abs +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +support_infill_rate = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg new file mode 100644 index 0000000000..3507a73253 --- /dev/null +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_abs +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +support_infill_rate = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg new file mode 100644 index 0000000000..5c6b976c32 --- /dev/null +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_abs +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +support_infill_rate = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg new file mode 100644 index 0000000000..65cc44d6d1 --- /dev/null +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_antibact_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg new file mode 100644 index 0000000000..8dda63f0f8 --- /dev/null +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_antibact_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg new file mode 100644 index 0000000000..f302bfd624 --- /dev/null +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_antibact_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg new file mode 100644 index 0000000000..ea027c21b3 --- /dev/null +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_antibact_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg new file mode 100644 index 0000000000..fe6a2d359a --- /dev/null +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_carbon_fiber +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 6.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg new file mode 100644 index 0000000000..c3ed048f94 --- /dev/null +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_carbon_fiber +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 6.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg new file mode 100644 index 0000000000..aeb90c8ed1 --- /dev/null +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_carbon_fiber +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 6.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg new file mode 100644 index 0000000000..8a2a29504e --- /dev/null +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_carbon_fiber +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 6.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg new file mode 100644 index 0000000000..b32467b7b6 --- /dev/null +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_metallic_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg new file mode 100644 index 0000000000..d852237394 --- /dev/null +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_metallic_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg new file mode 100644 index 0000000000..24d8f006c1 --- /dev/null +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_metallic_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg new file mode 100644 index 0000000000..65813f660f --- /dev/null +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_metallic_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg new file mode 100644 index 0000000000..0e63f87aa8 --- /dev/null +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_nylon +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature = 260 +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 6.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg new file mode 100644 index 0000000000..079860a5b6 --- /dev/null +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_nylon +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature = 260 +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 6.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg new file mode 100644 index 0000000000..310b83853e --- /dev/null +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_nylon +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature = 260 +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 6.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg new file mode 100644 index 0000000000..f64c7b90c5 --- /dev/null +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_nylon +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature = 260 +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 6.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg new file mode 100644 index 0000000000..2f291a310c --- /dev/null +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_pahtcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +line_width = 0.4 +wall_line_width_x = 0.4 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 40 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +infill_material_flow = 85 +wall_material_flow = 85 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg new file mode 100644 index 0000000000..e3f8082b3c --- /dev/null +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_pahtcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +line_width = 0.4 +wall_line_width_x = 0.4 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 40 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +infill_material_flow = 85 +wall_material_flow = 85 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg new file mode 100644 index 0000000000..735b3a9e8e --- /dev/null +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_pahtcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +line_width = 0.4 +wall_line_width_x = 0.4 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 40 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +infill_material_flow = 85 +wall_material_flow = 85 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg new file mode 100644 index 0000000000..a722f3d5ac --- /dev/null +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_pahtcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +line_width = 0.4 +wall_line_width_x = 0.4 +layer_height = 0.2 +layer_height_0 = 0.3 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 40 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +infill_material_flow = 85 +wall_material_flow = 85 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg new file mode 100644 index 0000000000..87200663cd --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_pc +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 3.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg new file mode 100644 index 0000000000..9ce244c865 --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_pc +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 3.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg new file mode 100644 index 0000000000..27662123a3 --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_pc +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 3.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg new file mode 100644 index 0000000000..fdef6243c7 --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_pc +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 3.0 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg new file mode 100644 index 0000000000..e4a7568fb3 --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_pc +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +infill_line_width = 0.6 +line_width = 0.6 +wall_line_width_x = 0.6 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 5.5 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +adhesion_type = brim \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg new file mode 100644 index 0000000000..135bff0276 --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_pc +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +infill_line_width = 0.6 +line_width = 0.6 +wall_line_width_x = 0.6 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 5.5 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +adhesion_type = brim \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg new file mode 100644 index 0000000000..e454e4e55b --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_pc +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +infill_line_width = 0.6 +line_width = 0.6 +wall_line_width_x = 0.6 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 5.5 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +adhesion_type = brim \ No newline at end of file diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg new file mode 100644 index 0000000000..f54c4828fa --- /dev/null +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg @@ -0,0 +1,39 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_pc +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +infill_line_width = 0.6 +line_width = 0.6 +wall_line_width_x = 0.6 +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 40 +speed_wall = =speed_print +speed_infill = =speed_print +speed_support = =speed_print +speed_travel = 150 +speed_layer_0 = 15 +retraction_amount = 5.5 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 100 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 +adhesion_type = brim \ No newline at end of file diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg new file mode 100644 index 0000000000..7233fb108b --- /dev/null +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_petcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 50 +speed_layer_0 = 15 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg new file mode 100644 index 0000000000..018a0fafb3 --- /dev/null +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_petcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 50 +speed_layer_0 = 15 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg new file mode 100644 index 0000000000..9dee9a2a5b --- /dev/null +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_petcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 50 +speed_layer_0 = 15 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg new file mode 100644 index 0000000000..8795cdd067 --- /dev/null +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_petcf15 +variant = Hardened Steel High Temp. 0.6mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.2 +layer_height_0 = 0.3 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 150 +retraction_amount = 7 +retraction_speed = 50 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 50 +speed_layer_0 = 15 +acceleration_infill = 500.0 +acceleration_wall = 500.0 +acceleration_wall_0 = 500.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg new file mode 100644 index 0000000000..784a6891d4 --- /dev/null +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_petg +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg new file mode 100644 index 0000000000..6de215e455 --- /dev/null +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_petg +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg new file mode 100644 index 0000000000..e29278dd9e --- /dev/null +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_petg +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg new file mode 100644 index 0000000000..0c18ba02d9 --- /dev/null +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_petg +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 70 +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 3 +retraction_speed = 20 +retraction_prime_speed = =retraction_speed +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg new file mode 100644 index 0000000000..40298dcb60 --- /dev/null +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..09a55b6c3d --- /dev/null +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..6efaedd517 --- /dev/null +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg new file mode 100644 index 0000000000..8be9793a9e --- /dev/null +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg new file mode 100644 index 0000000000..43ae099126 --- /dev/null +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg @@ -0,0 +1,37 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_ppgf30 +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +brim_width = 20.0 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +infill_material_flow = 85 +wall_material_flow = 85 diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg new file mode 100644 index 0000000000..793a08f433 --- /dev/null +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg @@ -0,0 +1,37 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_ppgf30 +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +brim_width = 20.0 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +infill_material_flow = 85 +wall_material_flow = 85 diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg new file mode 100644 index 0000000000..1e719a284c --- /dev/null +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_ppgf30 +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 90 +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 \ No newline at end of file diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg new file mode 100644 index 0000000000..156f42ef22 --- /dev/null +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg @@ -0,0 +1,37 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_ppgf30 +variant = Hardened Steel 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +layer_height = 0.2 +layer_height_0 = 0.3 +material_diameter = 1.75 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 20 +speed_infill = 30 +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 50 +brim_width = 20.0 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +infill_material_flow = 85 +wall_material_flow = 85 \ No newline at end of file diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg new file mode 100644 index 0000000000..17e733f5c7 --- /dev/null +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_tough_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_topbottom = 10 +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg new file mode 100644 index 0000000000..a4c9e07aad --- /dev/null +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_tough_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_topbottom = 10 +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg new file mode 100644 index 0000000000..70b610cb39 --- /dev/null +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_tough_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_topbottom = 10 +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg new file mode 100644 index 0000000000..309a8512e1 --- /dev/null +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_tough_pla +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.2 +layer_height_0 = 0.30 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 30 +speed_infill = 60 +speed_wall = =speed_print +speed_topbottom = 10 +speed_support = =speed_print +speed_travel = 80 +retraction_amount = 4.5 +retraction_speed = 20 +retraction_prime_speed = 15 +infill_sparse_density = 10 +bridge_skin_speed = 20 +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg new file mode 100644 index 0000000000..9a8f254d1d --- /dev/null +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +material = xyzprinting_tpu +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 15 +speed_infill = =speed_print +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = =15 +infill_sparse_density = 10 +brim_width = 5.0 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg new file mode 100644 index 0000000000..623381312f --- /dev/null +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +material = xyzprinting_tpu +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 15 +speed_infill = =speed_print +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = =15 +infill_sparse_density = 10 +brim_width = 5.0 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg new file mode 100644 index 0000000000..cd589ae435 --- /dev/null +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +material = xyzprinting_tpu +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 15 +speed_infill = =speed_print +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = =15 +infill_sparse_density = 10 +brim_width = 5.0 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg new file mode 100644 index 0000000000..34211a6adc --- /dev/null +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +material = xyzprinting_tpu +variant = Hardened Steel 0.4mm Nozzle + +[values] +layer_height = 0.2 +layer_height_0 = 0.3 +material_diameter = 1.75 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = =material_bed_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +speed_print = 15 +speed_infill = =speed_print +speed_wall = =speed_print +speed_support = =speed_print +speed_travel = 200 +retraction_amount = 6 +retraction_speed = 50 +retraction_prime_speed = =15 +infill_sparse_density = 10 +brim_width = 5.0 +bridge_skin_speed = 100 +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 \ No newline at end of file diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg new file mode 100644 index 0000000000..f0e8dfdc37 --- /dev/null +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = fine +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +layer_height_0 = 0.2 +material_diameter = 1.75 +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg new file mode 100644 index 0000000000..4631432b4a --- /dev/null +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Normal Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = normal +weight = -1 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.3 +material_diameter = 1.75 +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg new file mode 100644 index 0000000000..4e25003939 --- /dev/null +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.3 +layer_height_0 = 0.4 +material_diameter = 1.75 +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg new file mode 100644 index 0000000000..606ecfc0fa --- /dev/null +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Coarse Quality +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = quality +quality_type = coarse +weight = -3 +global_quality = True + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +material_diameter = 1.75 +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 33ac01743d..d68840bba8 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,72 @@ +[5.1] +For an overview of the new features in Cura 5.1, please watch our video. + +* Improved toolpath simplification algorithm +The algorithm that reduces the resolution of the print has been rewritten, providing a more constant resolution to allow for greater precision without causing buffer underruns. + +* Added option to alternate wall direction +A new setting causes the direction of printing walls to alternate between layers and adjacent walls, which reduces warping in the print. + +* Adjusted combing boundaries to reduce scarring +Travel moves through the inside of the models are adjusted so that they should keep more distance from the model where possible, yet allowing travels through narrow parts without retractions. + +* Reduced acceleration and jerk commands for travel moves +We added the option to disable acceleration and jerk commands for travel moves. If disabled, they will take on the acceleration of the printed part of its destination. This greatly reduces file size and buffer underruns. + +* Project files know which packages they require +Newly created project files will now store which packages they require from the Ultimaker Marketplace. If a project needs a material from there, the user will be prompted to download it. + +* Other new features and improvements: +- The interface to select the printing profile in Recommended Mode has been redesigned. +- Implemented multi-threaded slicing for MacOS, to bring it in line with other operating systems, contributed by Piezoid. +- Cura now links toolpaths to project files in the Digital Factory. +- Improved performance of loading STL files on Linux. +- Packages from the Marketplace can now contain intent profiles. +- The application now makes heavy use of Conan to make it easier and faster to build releases of Cura. +- Start and end g-code can now refer to the currently active profile with replacement keys. +- To provide proper compatibility with both older and newer Linux distribution, this release contains two Linux builds. + +* Bug fixes: +- Fix resetting configuration if it gets corrupt. +- Monotonic ordering now works again for top surfaces. +- Fix a bug where Remove Raft Inside Corners didn't always remove all corners. +- Fix the position of the toolbar if the toolbar is too tall to fit. +- Intents in the Recommended Mode now show a description again. +- Remove Inside Corners and Raft Base Wall Count can now be changed per extruder, though they will affect the entire print. +- Fix opening STL files with special characters in their header. +- Fix crash at start-up on newer Linux distributions. +- Fix priming when printing a raft with a different extruder for some of its layers. +- Fix a case where the inner wall ends up protruding through the outside of the model. +- Improve some details on dark mode colouring. +- Fix an error sometimes occurring when uninstalling plug-ins. +- Fix a rendering issue with pop-up dialogues on MacOS. +- Fix Discard or Keep Changes dialog showing an outdated setting value. +- Horizontal Scaling Shrinkage Compensation no longer adjusts the size of the build volume, allowing the full size of the build plate to be used. +- Fixed overextrusion when using gradual infill with thin strips of infill. +- Fix opening STL files with special characters in their file header. +- Fix slicing failure when using Randomize Infill Start in some cases. +- Restore reminder to sync materials with your printer when using cloud printers with custom materials. +- The tool bar should no longer show up in the monitor stage. +- Exporting materials should now retain settings unknown to Cura as well. + +* Printer definitions, profiles and materials: +- Improved profiles for PVA and support for Ultimaker printers. +- Adjust retraction speed and distance for Voron, contributed by Haxk20 and Cbc02009 +- Heat up extruder and build plate at the same time for Ender 3 Pro, contributed by XDazld. +- Add new Tough PLA colours. +- Add DD0.4 print cores for Ultimaker printers. +- Add MakerGear M2 printer, contributed by Wanders78746. +- Add Trimarker Nebula Plus printer, contributed by MatiGabaglio. +- Various small profile improvements. + +* Community translations: +- Updated the Brazilian Portuguese translation, contributed by Patola. +- Updated the Czech translation, contributed by sustmi. + +* Known critical issues: +- The placement of the seam has gotten more scattered than in previous releases. +- Support is sometimes missing in detailed parts, where previous releases supported them properly. + [5.0] Watch the launch event to learn more about Ultimaker Cura 5.0. diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 34696fb35e..7fd5d797cd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -48,7 +48,6 @@ "lining": "border_main", "viewport_overlay": "background_1", - "primary": [12, 169, 227, 255], "primary_text": "text_default", "secondary": [95, 95, 95, 255], @@ -81,7 +80,7 @@ "text": "text_default", "text_detail": [255, 255, 255, 172], "text_link": "accent_1", - "text_inactive": [255, 255, 255, 88], + "text_inactive": [118, 118, 118, 255], "text_hover": [255, 255, 255, 204], "text_scene": [255, 255, 255, 162], "text_scene_hover": [255, 255, 255, 204], diff --git a/resources/themes/cura-light/icons/default/Download.svg b/resources/themes/cura-light/icons/default/Download.svg index cbe0da2a99..fb94cd78b4 100644 --- a/resources/themes/cura-light/icons/default/Download.svg +++ b/resources/themes/cura-light/icons/default/Download.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/default/People.svg b/resources/themes/cura-light/icons/default/People.svg index 8632b37f7c..6692cbb427 100644 --- a/resources/themes/cura-light/icons/default/People.svg +++ b/resources/themes/cura-light/icons/default/People.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/default/Settings.svg b/resources/themes/cura-light/icons/default/Settings.svg index 204f2a5b6f..22000feb16 100644 --- a/resources/themes/cura-light/icons/default/Settings.svg +++ b/resources/themes/cura-light/icons/default/Settings.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/high/Certificate.svg b/resources/themes/cura-light/icons/high/Certificate.svg index b588bddd8b..4d2c5ba0cf 100644 --- a/resources/themes/cura-light/icons/high/Certificate.svg +++ b/resources/themes/cura-light/icons/high/Certificate.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/high/Settings.svg b/resources/themes/cura-light/icons/high/Settings.svg index 1cd2ff324e..23774a3beb 100644 --- a/resources/themes/cura-light/icons/high/Settings.svg +++ b/resources/themes/cura-light/icons/high/Settings.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 83eb13f0cb..809bcfdee8 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -218,7 +218,7 @@ "lining": [192, 193, 194, 255], "viewport_overlay": [246, 246, 246, 255], - "primary": [25, 110, 240, 255], + "primary": "accent_1", "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], "text_selection": [156, 195, 255, 127], @@ -269,7 +269,7 @@ "text": [25, 25, 25, 255], "text_disabled": [180, 180, 180, 255], "text_detail": [174, 174, 174, 128], - "text_link": [25, 110, 240, 255], + "text_link": "accent_1", "text_inactive": [174, 174, 174, 255], "text_medium": [128, 128, 128, 255], "text_scene": [102, 102, 102, 255], @@ -564,6 +564,9 @@ "medium_button": [2.5, 2.5], "medium_button_icon": [2, 2], + "large_button": [3.0, 3.0], + "large_button_icon": [2.8, 2.8], + "context_menu": [20, 2], "icon_indicator": [1, 1], diff --git a/resources/variants/creality_ender3s1_0.2.inst.cfg b/resources/variants/creality_ender3s1_0.2.inst.cfg new file mode 100644 index 0000000000..5aed89119c --- /dev/null +++ b/resources/variants/creality_ender3s1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender3s1_0.3.inst.cfg b/resources/variants/creality_ender3s1_0.3.inst.cfg new file mode 100644 index 0000000000..cd59787dee --- /dev/null +++ b/resources/variants/creality_ender3s1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender3s1_0.4.inst.cfg b/resources/variants/creality_ender3s1_0.4.inst.cfg new file mode 100644 index 0000000000..b621656ca8 --- /dev/null +++ b/resources/variants/creality_ender3s1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender3s1_0.5.inst.cfg b/resources/variants/creality_ender3s1_0.5.inst.cfg new file mode 100644 index 0000000000..0ca9ce3a50 --- /dev/null +++ b/resources/variants/creality_ender3s1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender3s1_0.6.inst.cfg b/resources/variants/creality_ender3s1_0.6.inst.cfg new file mode 100644 index 0000000000..30ea5da3ea --- /dev/null +++ b/resources/variants/creality_ender3s1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender3s1_0.8.inst.cfg b/resources/variants/creality_ender3s1_0.8.inst.cfg new file mode 100644 index 0000000000..5f2a9125ca --- /dev/null +++ b/resources/variants/creality_ender3s1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender3s1_1.0.inst.cfg b/resources/variants/creality_ender3s1_1.0.inst.cfg new file mode 100644 index 0000000000..fb61517749 --- /dev/null +++ b/resources/variants/creality_ender3s1_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_ender3s1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index bb31e90aaf..d0cc437b1b 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -43,7 +43,6 @@ raft_interface_thickness = 0.2 raft_margin = 10 raft_speed = 25 raft_surface_layers = 1 -retraction_amount = 4.5 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 675dde693d..49837e24ea 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -20,7 +20,6 @@ machine_nozzle_tip_outer_diameter = 1.0 raft_base_speed = 20 raft_interface_speed = 20 raft_speed = 25 -retraction_amount = 4.5 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index d9a6762732..205ae4b0f2 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -43,7 +43,6 @@ raft_interface_thickness = 0.2 raft_margin = 10 raft_speed = 25 raft_surface_layers = 1 -retraction_amount = 4.5 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index d9a2e78fdb..94a687c951 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -20,7 +20,6 @@ machine_nozzle_tip_outer_diameter = 1.0 raft_base_speed = 20 raft_interface_speed = 20 raft_speed = 25 -retraction_amount = 4.5 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index ae728bfe3a..60dfcafd33 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -42,7 +42,6 @@ raft_interface_thickness = 0.2 raft_margin = 10 raft_speed = 25 raft_surface_layers = 1 -retraction_amount = 4.5 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index c2145a92b1..526f724eea 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -20,7 +20,6 @@ machine_nozzle_tip_outer_diameter = 1.0 raft_base_speed = 20 raft_interface_speed = 20 raft_speed = 25 -retraction_amount = 4.5 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index bf5802de0d..4e9d687d8a 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -42,7 +42,6 @@ raft_interface_thickness = 0.2 raft_margin = 10 raft_speed = 25 raft_surface_layers = 1 -retraction_amount = 4.5 retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index dec114757b..18770b1c4d 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -20,7 +20,6 @@ machine_nozzle_tip_outer_diameter = 1.0 raft_base_speed = 20 raft_interface_speed = 20 raft_speed = 25 -retraction_amount = 4.5 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg b/resources/variants/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg new file mode 100644 index 0000000000..087644e208 --- /dev/null +++ b/resources/variants/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = Hardened Steel 0.4mm Nozzle +version = 4 +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +machine_nozzle_id = Hardened Steel 0.4mm Nozzle diff --git a/resources/variants/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg b/resources/variants/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg new file mode 100644 index 0000000000..1337d87cbc --- /dev/null +++ b/resources/variants/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = Hardened Steel High Temp. 0.6mm Nozzle +version = 4 +definition = xyzprinting_da_vinci_pro_evo + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +machine_nozzle_id = Hardened Steel High Temp. 0.6mm Nozzle diff --git a/run_in_docker.sh b/run_in_docker.sh deleted file mode 100644 index eb364fd887..0000000000 --- a/run_in_docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -Xvfb :1 -screen 0 1280x800x16 & -export DISPLAY=:1.0 -python3 cura_app.py --headless \ No newline at end of file diff --git a/test-in-docker.sh b/test-in-docker.sh deleted file mode 100755 index e5a1116646..0000000000 --- a/test-in-docker.sh +++ /dev/null @@ -1,5 +0,0 @@ -sudo rm -rf ./build ./Uranium -sudo docker run -it --rm \ - -v "$(pwd):/srv/cura" ultimaker/cura-build-environment \ - /srv/cura/docker/build.sh -sudo rm -rf ./build ./Uranium diff --git a/tests/API/TestAccount.py b/tests/API/TestAccount.py index 1ad73462c2..9d62646eff 100644 --- a/tests/API/TestAccount.py +++ b/tests/API/TestAccount.py @@ -1,3 +1,6 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import MagicMock, patch import pytest @@ -26,7 +29,8 @@ def test_login(): mocked_auth_service.startAuthorizationFlow.assert_called_once_with(False) # Fake a successful login - account._onLoginStateChanged(True) + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. + account._onLoginStateChanged(True) # Attempting to log in again shouldn't change anything. account.login() @@ -59,7 +63,8 @@ def test_logout(): assert not account.isLoggedIn # Pretend the stage changed - account._onLoginStateChanged(True) + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. + account._onLoginStateChanged(True) assert account.isLoggedIn account.logout() @@ -72,12 +77,14 @@ def test_errorLoginState(application): account._authorization_service = mocked_auth_service account.loginStateChanged = MagicMock() - account._onLoginStateChanged(True, "BLARG!") + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. + account._onLoginStateChanged(True, "BLARG!") # Even though we said that the login worked, it had an error message, so the login failed. account.loginStateChanged.emit.called_with(False) - account._onLoginStateChanged(True) - account._onLoginStateChanged(False, "OMGZOMG!") + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): + account._onLoginStateChanged(True) + account._onLoginStateChanged(False, "OMGZOMG!") account.loginStateChanged.emit.called_with(False) def test_sync_success(): @@ -86,18 +93,19 @@ def test_sync_success(): service1 = "test_service1" service2 = "test_service2" - account.setSyncState(service1, SyncState.SYNCING) - assert account.syncState == SyncState.SYNCING + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. + account.setSyncState(service1, SyncState.SYNCING) + assert account.syncState == SyncState.SYNCING - account.setSyncState(service2, SyncState.SYNCING) - assert account.syncState == SyncState.SYNCING + account.setSyncState(service2, SyncState.SYNCING) + assert account.syncState == SyncState.SYNCING - account.setSyncState(service1, SyncState.SUCCESS) - # service2 still syncing - assert account.syncState == SyncState.SYNCING + account.setSyncState(service1, SyncState.SUCCESS) + # service2 still syncing + assert account.syncState == SyncState.SYNCING - account.setSyncState(service2, SyncState.SUCCESS) - assert account.syncState == SyncState.SUCCESS + account.setSyncState(service2, SyncState.SUCCESS) + assert account.syncState == SyncState.SUCCESS def test_sync_update_action(): @@ -107,23 +115,24 @@ def test_sync_update_action(): mockUpdateCallback = MagicMock() - account.setSyncState(service1, SyncState.SYNCING) - assert account.syncState == SyncState.SYNCING + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. + account.setSyncState(service1, SyncState.SYNCING) + assert account.syncState == SyncState.SYNCING - account.setUpdatePackagesAction(mockUpdateCallback) - account.onUpdatePackagesClicked() - mockUpdateCallback.assert_called_once_with() - account.setSyncState(service1, SyncState.SUCCESS) + account.setUpdatePackagesAction(mockUpdateCallback) + account.onUpdatePackagesClicked() + mockUpdateCallback.assert_called_once_with() + account.setSyncState(service1, SyncState.SUCCESS) - account.sync() # starting a new sync resets the update action to None + account.sync() # starting a new sync resets the update action to None - account.setSyncState(service1, SyncState.SYNCING) - assert account.syncState == SyncState.SYNCING + account.setSyncState(service1, SyncState.SYNCING) + assert account.syncState == SyncState.SYNCING - account.onUpdatePackagesClicked() # Should not be connected to an action anymore - mockUpdateCallback.assert_called_once_with() # No additional calls - assert account.updatePackagesEnabled is False - account.setSyncState(service1, SyncState.SUCCESS) + account.onUpdatePackagesClicked() # Should not be connected to an action anymore + mockUpdateCallback.assert_called_once_with() # No additional calls + assert account.updatePackagesEnabled is False + account.setSyncState(service1, SyncState.SUCCESS) diff --git a/tests/Settings/TestProfiles.py b/tests/Settings/TestProfiles.py index 5761f712c4..2da455d16d 100644 --- a/tests/Settings/TestProfiles.py +++ b/tests/Settings/TestProfiles.py @@ -106,13 +106,11 @@ def test_validateQualityProfiles(file_name): has_unknown_settings = not quality_setting_keys.issubset(all_setting_ids) if has_unknown_settings: - print("The following setting(s) %s are defined in the quality %s, but not in fdmprinter.def.json" % ([key for key in quality_setting_keys if key not in all_setting_ids], file_name)) - assert False + assert False, "The following setting(s) %s are defined in the quality %s, but not in fdmprinter.def.json" % ([key for key in quality_setting_keys if key not in all_setting_ids], file_name) except Exception as e: # File can't be read, header sections missing, whatever the case, this shouldn't happen! - print("Got an Exception while reading the file [%s]: %s" % (file_name, e)) - assert False + assert False, f"Got an Exception while reading the file [{file_name}]: {e}" @pytest.mark.parametrize("file_name", intent_filepaths) @@ -163,8 +161,7 @@ def test_validateVariantProfiles(file_name): assert False, "The following setting(s) %s are defined in the variant %s, but not in fdmprinter.def.json" % ([key for key in variant_setting_keys if key not in all_setting_ids], file_name) except Exception as e: # File can't be read, header sections missing, whatever the case, this shouldn't happen! - print("Got an Exception while reading the file [%s]: %s" % (file_name, e)) - assert False + assert False, "Got an exception while reading the file {file_name}: {err}".format(file_name = file_name, err = str(e)) @pytest.mark.parametrize("file_name", quality_filepaths + variant_filepaths + intent_filepaths) @@ -182,5 +179,4 @@ def test_versionUpToDate(file_name): assert int(parser["metadata"]["setting_version"]) == CuraApplication.SettingVersion, "The version of this profile is not up to date!" except Exception as e: # File can't be read, header sections missing, whatever the case, this shouldn't happen! - print("Got an exception while reading the file {file_name}: {err}".format(file_name = file_name, err = str(e))) - assert False \ No newline at end of file + assert False, "Got an exception while reading the file {file_name}: {err}".format(file_name = file_name, err = str(e)) \ No newline at end of file diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index 9a1c29da6c..458b7afad3 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -146,7 +146,7 @@ class TestComputeDisallowedAreasStatic: build_volume._global_container_stack = mocked_stack with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"): result = build_volume._computeDisallowedAreasStatic(0, [mocked_extruder]) - assert result == {"zomg": [Polygon([[-84.0, 102.5], [-115.0, 102.5], [-200.0, 112.5], [-82.0, 112.5]])]} + assert result == {"zomg": [Polygon([[-84.0,102.5], [-115.0,102.5], [-200.0,112.5], [-82.0,112.5]]), Polygon([[-100.0,-100.0], [-100.0,100.0], [-99.9,99.9], [-99.9,-99.9]]), Polygon([[100.0,100.0], [100.0,-100.0], [99.9,-99.9], [99.9,99.9]]), Polygon([[-100.0,100.0], [100.0,100.0], [99.9,99.9], [-99.9,99.9]]), Polygon([[100.0,-100.0], [-100.0,-100.0], [-99.9,-99.9], [99.9,-99.9]])]} def test_computeDisalowedAreasMutliExtruder(self, build_volume): mocked_stack = MagicMock() @@ -160,7 +160,12 @@ class TestComputeDisallowedAreasStatic: build_volume._global_container_stack = mocked_stack with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value = extruder_manager)): result = build_volume._computeDisallowedAreasStatic(0, [mocked_extruder]) - assert result == {"zomg": [Polygon([[-84.0, 102.5], [-115.0, 102.5], [-200.0, 112.5], [-82.0, 112.5]])]} + assert result == {"zomg": [Polygon([[-84.0, 102.5], [-115.0, 102.5], [-200.0, 112.5], [-82.0, 112.5]]), + Polygon([[-100.0, -100.0], [-100.0, 100.0], [-99.9, 99.9], [-99.9, -99.9]]), + Polygon([[100.0, 100.0], [100.0, -100.0], [99.9, -99.9], [99.9, 99.9]]), + Polygon([[-100.0, 100.0], [100.0, 100.0], [99.9, 99.9], [-99.9, 99.9]]), + Polygon([[100.0, -100.0], [-100.0, -100.0], [-99.9, -99.9], [99.9, -99.9]])]} + class TestUpdateRaftThickness: setting_property_dict = {"raft_base_thickness": {"value": 1},