Merge branch 'Ultimaker:main' into main

.github/workflows/conan-package-create.yml

@@ -7,13 +7,18 @@ on:
                 required: true
                 type: string
 
+            recipe_id_full:
+                required: true
+                type: string
+
             build_id:
                 required: true
                 type: number
 
-            recipe_id_full:
-                required: true
-                type: string
+            build_info:
+                required: false
+                default: true
+                type: boolean
 
             recipe_id_latest:
                 required: false
@@ -45,11 +50,6 @@ on:
                 default: true
                 type: boolean
 
-            create_from_source:
-                required: false
-                default: false
-                type: boolean
-
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
     CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }}
@@ -92,7 +92,7 @@ jobs:
                     path: |
                         $HOME/.conan/data
                         $HOME/.conan/conan_download_cache
-                    key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache
+                    key: conan-${{ inputs.runs_on }}-${{ runner.arch }}-create-cache
 
             -   name: Cache Conan local repository packages (Powershell)
                 uses: actions/cache@v3
@@ -102,7 +102,7 @@ jobs:
                         C:\Users\runneradmin\.conan\data
                         C:\.conan
                         C:\Users\runneradmin\.conan\conan_download_cache
-                    key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache
+                    key: conan-${{ inputs.runs_on }}-${{ runner.arch }}-create-cache
 
             -   name: Install MacOS system requirements
                 if:  ${{ runner.os == 'Macos' }}
@@ -114,7 +114,7 @@ jobs:
                     sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
                     sudo apt update
                     sudo apt upgrade
-                    sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y
+                    sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config flex bison -y
 
             -   name: Install GCC-12 on ubuntu-22.04
                 if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }}
@@ -140,34 +140,48 @@ jobs:
                 if: ${{ inputs.conan_config_branch == '' }}
                 run: conan config install https://github.com/Ultimaker/conan-config.git
 
-            -   name: Create the Packages
-                if: ${{ !inputs.create_from_source }}
+            -   name: Create the lock file
+                if: ${{ inputs.build_info }}
                 run: |
                     conan_build_info --v2 start ${{ inputs.project_name }} ${{ github.run_number }}000${{ inputs.build_id }}
-                    conan lock create --reference ${{ inputs.recipe_id_full }} --build=missing --update
-                    conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock
-                    conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
-                    conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
-                    conan_build_info --v2 stop
+                    conan lock create --reference ${{ inputs.recipe_id_full }} --lockfile-out=conan.lock                    
 
-            -   name: Create the Packages (from source)
-                if: ${{ inputs.create_from_source }}
-                run: conan create . ${{ inputs.recipe_id_full }} --build=missing --update
+            -   name: Create the Packages using lockfile
+                if: ${{ inputs.build_info }}
+                run: conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock --lockfile-out=conan.lock
 
-            -   name: Remove the latest alias
-                if: ${{ inputs.create_from_source && inputs.recipe_id_latest != '' && runner.os == 'Linux' }}
-                run: |
-                    conan remove ${{ inputs.recipe_id_latest }} -r cura -f || true
-                    conan remove ${{ inputs.recipe_id_latest }} -r cura-ce -f || true
+            -   name: Create the Packages
+                if: ${{ ! inputs.build_info }}
+                run: conan install ${{ inputs.recipe_id_full }} --build=missing --update
 
-            -   name: Create the latest alias
-                if: ${{ inputs.create_from_source && inputs.recipe_id_latest != '' && always() }}
-                run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }}
+            -   name: Create the build info
+                if: ${{ inputs.build_info }}
+                run: conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
 
             -   name: Upload the Package(s)
                 if: always()
                 run: conan upload "*" -r cura --all -c
 
+            -   name: Upload the build info
+                if: ${{ inputs.build_info }}
+                run: |
+                    conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
+                    conan_build_info --v2 stop
+
             -   name: Upload the Package(s) community
                 if: ${{ always() && inputs.conan_upload_community == true }}
                 run: conan upload "*" -r cura-ce -c
+
+            -   name: Upload the log and build artifacts
+                if: always()
+                uses: actions/upload-artifact@v3
+                with:
+                    name: log-${{ inputs.runs_on }}-${{ runner.arch }}
+                    path: |
+                        buildinfo.json
+                        conan.lock
+                        conanbuildinfo.txt
+                        conaninfo.txt
+                        graph_info.json
+                        build/**
+                    retention-days: 1

.github/workflows/conan-package.yml

@@ -81,9 +81,9 @@ jobs:
 
         uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main
         with:
-            project_name: cura
-            build_id: 1
+            project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+            build_id: 1
             runs_on: 'ubuntu-20.04'
             python_version: '3.10.x'
             conan_logging_level: 'info'

.github/workflows/conan-recipe-version.yml

@@ -29,14 +29,18 @@ on:
                 description: "is current branch a release branch?"
                 value: ${{ jobs.get-semver.outputs.release_branch }}
 
-            recipe_user:
+            user:
                 description: "The conan user"
                 value: ${{ jobs.get-semver.outputs.user }}
 
-            recipe_channel:
+            channel:
                 description: "The conan channel"
                 value: ${{ jobs.get-semver.outputs.channel }}
 
+            project_name:
+                description: "The conan projectname"
+                value: ${{ inputs.project_name }}
+
 jobs:
     get-semver:
 
@@ -63,8 +67,7 @@ jobs:
                 if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
                 with:
                     fetch-depth: 0
-                    ref: ${{ github.event.pull_request.head.ref }}
-                    repository: ${{ github.event.pull_request.head.repo.full_name }}
+                    ref: ${{ github.base_ref }}
 
             -   name: Setup Python and pip
                 uses: actions/setup-python@v4
@@ -82,6 +85,7 @@ jobs:
                 name: Get Conan broadcast data
                 run: |
                     import subprocess
+                    import os
                     from conans import tools
                     from conans.errors import ConanException
                     from git import Repo
@@ -115,7 +119,7 @@ jobs:
                         elif ref_name in ("main", "master"):
                             channel = 'testing'
                         else:
-                            channel = repo.active_branch.name.split("_")[0].replace("-", "_").lower()
+                            channel = "_".join(repo.active_branch.name.replace("-", "_").split("_")[:2]).lower()
                     
                         if "pull_request" in event_name:
                             channel = f"pr_{issue_number}"
@@ -167,28 +171,29 @@ jobs:
                                 reset_patch = 0
                                 actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}"
 
-                    # %% print to output
-                    cmd_name = ["echo", f"::set-output name=name::{project_name}"]
-                    subprocess.call(cmd_name)
-                    cmd_version = ["echo", f"::set-output name=version::{actual_version}"]
-                    subprocess.call(cmd_version)
-                    cmd_channel = ["echo", f"::set-output name=channel::{channel}"]
-                    subprocess.call(cmd_channel)
-                    cmd_id_full= ["echo", f"::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}"]
-                    subprocess.call(cmd_id_full)
-                    cmd_id_latest = ["echo", f"::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}"]
-                    subprocess.call(cmd_id_latest)
-                    cmd_semver_full = ["echo", f"::set-output name=semver_full::{actual_version}"]
-                    subprocess.call(cmd_semver_full)
-                    cmd_is_release_branch = ["echo", f"::set-output name=is_release_branch::{str(is_release_branch).lower()}"]
-                    subprocess.call(cmd_is_release_branch)
+                    # %% Set the environment output
+                    output_env = os.environ["GITHUB_OUTPUT"]
+                    content = ""
+                    if os.path.exists(output_env):
+                        with open(output_env, "r") as f:
+                            content = f.read()
+                    
+                    with open(output_env, "w") as f:
+                        f.write(content)
+                        f.writelines(f"name={project_name}\n")
+                        f.writelines(f"version={actual_version}\n")
+                        f.writelines(f"channel={channel}\n")
+                        f.writelines(f"recipe_id_full={project_name}/{actual_version}@{user}/{channel}\n")
+                        f.writelines(f"recipe_id_latest={project_name}/latest@{user}/{channel}\n")
+                        f.writelines(f"semver_full={actual_version}\n")
+                        f.writelines(f"is_release_branch={str(is_release_branch).lower()}\n")
                     
                     print("::group::Conan Recipe Information")
                     print(f"name = {project_name}")
                     print(f"version = {actual_version}")
                     print(f"user = {user}")
                     print(f"channel = {channel}")
-                    print(f"= {project_name}/{actual_version}@{user}/{channel}")
+                    print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}")
                     print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}")
                     print(f"semver_full = {actual_version}")
                     print(f"is_release_branch = {str(is_release_branch).lower()}")

.github/workflows/cura-all-installers.yml

@@ -0,0 +1,112 @@
+name: Cura All Installers
+run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }}
+
+on:
+    workflow_dispatch:
+        inputs:
+            cura_conan_version:
+                description: 'Cura Conan Version'
+                default: 'cura/latest@ultimaker/testing'
+                required: true
+                type: string
+            conan_args:
+                description: 'Conan args: eq.: --require-override'
+                default: ''
+                required: false
+                type: string
+            conan_config:
+                description: 'Conan config branch to use'
+                default: ''
+                required: false
+                type: string
+            enterprise:
+                description: 'Build Cura as an Enterprise edition'
+                default: false
+                required: true
+                type: boolean
+            staging:
+                description: 'Use staging API'
+                default: false
+                required: true
+                type: boolean
+            installer:
+                description: 'Create the installer'
+                default: true
+                required: true
+                type: boolean
+            build_windows:
+                description: 'Build for Windows'
+                default: true
+                required: true
+                type: boolean
+            build_linux:
+                description: 'Build for Linux'
+                default: true
+                required: true
+                type: boolean
+            build_macos:
+                description: 'Build for MacOs'
+                default: true
+                required: true
+                type: boolean
+
+    # Run the nightly at 3:25 UTC on working days
+    schedule:
+    - cron: '25 3 * * 1-5'
+
+jobs:
+    windows-installer-create:
+        if: ${{ inputs.build_windows }}
+        uses: ./.github/workflows/cura-installer.yml
+        with:
+            platform: 'windows-2022'
+            os_name: 'win64'
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            conan_config: ${{ inputs.conan_config }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            installer: ${{ inputs.installer }}
+        secrets: inherit
+
+    linux-installer-create:
+        if: ${{ inputs.build_linux }}
+        uses: ./.github/workflows/cura-installer.yml
+        with:
+            platform: 'ubuntu-20.04'
+            os_name: 'linux'
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            conan_config: ${{ inputs.conan_config }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            installer: ${{ inputs.installer }}
+        secrets: inherit
+
+    linux-modern-installer-create:
+        if: ${{ inputs.build_linux }}
+        uses: ./.github/workflows/cura-installer.yml
+        with:
+            platform: 'ubuntu-22.04'
+            os_name: 'linux-modern'
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            conan_config: ${{ inputs.conan_config }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            installer: ${{ inputs.installer }}
+        secrets: inherit
+
+    macos-installer-create:
+        if: ${{ inputs.build_macos }}
+        uses: ./.github/workflows/cura-installer.yml
+        with:
+            platform: 'macos-11'
+            os_name: 'mac'
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            conan_config: ${{ inputs.conan_config }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            installer: ${{ inputs.installer }}
+        secrets: inherit

.github/workflows/cura-installer.yml

@@ -1,42 +1,50 @@
 name: Cura Installer
-run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }}
+run-name: ${{ inputs.cura_conan_version }} for ${{ inputs.platform }} by @${{ github.actor }}
 
 on:
-    workflow_dispatch:
+    workflow_call:
         inputs:
+            platform:
+                description: 'Selected Installer OS'
+                default: 'ubuntu-20.04'
+                required: true
+                type: string
+            os_name:
+                description: 'OS Friendly Name'
+                default: 'linux'
+                required: true
+                type: string
             cura_conan_version:
                 description: 'Cura Conan Version'
                 default: 'cura/latest@ultimaker/testing'
                 required: true
+                type: string
             conan_args:
                 description: 'Conan args: eq.: --require-override'
                 default: ''
                 required: false
+                type: string
             conan_config:
                 description: 'Conan config branch to use'
                 default: ''
                 required: false
+                type: string
             enterprise:
                 description: 'Build Cura as an Enterprise edition'
-                required: true
                 default: false
+                required: true
                 type: boolean
             staging:
                 description: 'Use staging API'
-                required: true
                 default: false
+                required: true
                 type: boolean
             installer:
                 description: 'Create the installer'
-                required: true
                 default: true
+                required: true
                 type: boolean
 
-    # Run the nightly at 3:25 UTC on working days
-    #FIXME: Provide the same default values as the workflow dispatch
-    schedule:
-    - cron: '25 3 * * 1-5'
-
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
     CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }}
@@ -59,16 +67,7 @@ env:
 
 jobs:
     cura-installer-create:
-        runs-on: ${{ matrix.os }}
-
-        strategy:
-            fail-fast: false
-            matrix:
-                include:
-                    - { os: macos-11, os_id: 'mac' }
-                    - { os: windows-2022, os_id: 'win64' }
-                    - { os: ubuntu-20.04, os_id: 'linux' }
-                    - { os: ubuntu-22.04, os_id: 'linux-modern' }
+        runs-on: ${{ inputs.platform }}
 
         steps:
             -   name: Checkout
@@ -213,38 +212,38 @@ jobs:
                     cp openssl/lib/*.lib ./cura_inst/Lib/
 
             -   name: Create the Cura dist
-                run: pyinstaller ./cura_inst/Ultimaker-Cura.spec
+                run: pyinstaller ./cura_inst/UltiMaker-Cura.spec
 
             -   name: Archive the artifacts (bash)
                 if: ${{ github.event.inputs.installer == 'false' && runner.os != 'Windows' }}
-                run: tar -zcf "./Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}.tar.gz" "./Ultimaker-Cura/"
+                run: tar -zcf "./UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.tar.gz" "./UltiMaker-Cura/"
                 working-directory: dist
 
             -   name: Archive the artifacts (Powershell)
                 if: ${{ github.event.inputs.installer == 'false' && runner.os == 'Windows' }}
-                run: Compress-Archive -Path ".\Ultimaker-Cura" -DestinationPath ".\Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}.zip"
+                run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.zip"
                 working-directory: dist
 
             -   name: Create the Windows exe installer (Powershell)
                 if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }}
                 run: |
-                    python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}.exe"
+                    python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe"
                 working-directory: dist
 
             -   name: Create the Linux AppImage (Bash)
                 if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Linux' }}
-                run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}.AppImage"
+                run: python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.AppImage"
                 working-directory: dist
 
             -   name: Create the MacOS dmg (Bash)
                 if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
-                run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}.dmg"
+                run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.dmg"
                 working-directory: dist
 
             -   name: Upload the artifacts
                 uses: actions/upload-artifact@v3
                 with:
-                    name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ matrix.os_id }}
+                    name: UltiMaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ inputs.os_name }}
                     path: |
                         dist/*.tar.gz
                         dist/*.zip

.github/workflows/printer-linter-format.yml

@@ -0,0 +1,45 @@
+name: printer-linter-format
+
+on:
+    push:
+        branches:
+            - main
+            - '[1-9].[0-9]'
+            - '[1-9].[0-9][0-9]'
+        path:
+            - 'resources/**'
+
+jobs:
+    printer-linter-format:
+        name: Printer linter auto format
+
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3
+
+            -   name: Setup Python and pip
+                uses: actions/setup-python@v4
+                with:
+                    python-version: 3.11.x
+                    cache: 'pip'
+                    cache-dependency-path: .github/workflows/requirements-printer-linter.txt
+
+            -   uses: technote-space/get-diff-action@v6
+                with:
+                    PATTERNS: |
+                        resources/+(definitions|extruders)/*.def.json
+                        resources/+(intent|quality|variants)/**/*.inst.cfg
+
+            -   name: Install Python requirements for runner
+                if: env.GIT_DIFF && !env.MATCHED_FILES
+                run: pip install -r .github/workflows/requirements-printer-linter.txt
+
+#             -   name: Format file
+#                 if: env.GIT_DIFF && !env.MATCHED_FILES
+#                 run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }}
+
+            -   uses: stefanzweifel/git-auto-commit-action@v4
+                if: env.GIT_DIFF && !env.MATCHED_FILES
+                with:
+                    commit_message: "Applied printer-linter format"

.github/workflows/printer-linter-pr-diagnose.yml

@@ -0,0 +1,59 @@
+name: printer-linter-pr-diagnose
+
+on:
+    pull_request:
+        path:
+            - 'resources/**'
+
+jobs:
+    printer-linter-diagnose:
+        name: Printer linter PR diagnose
+
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3
+                with:
+                    fetch-depth: 2
+
+            -   name: Setup Python and pip
+                uses: actions/setup-python@v4
+                with:
+                    python-version: 3.11.x
+                    cache: 'pip'
+                    cache-dependency-path: .github/workflows/requirements-printer-linter.txt
+
+            -   uses: technote-space/get-diff-action@v6
+                with:
+                    PATTERNS: |
+                        resources/+(extruders|definitions)/*.def.json
+                        resources/+(intent|quality|variants)/**/*.inst.cfg
+
+            -   name: Install Python requirements for runner
+                if: env.GIT_DIFF && !env.MATCHED_FILES
+                run: pip install -r .github/workflows/requirements-printer-linter.txt
+
+            -   name: Create results directory
+                run: mkdir printer-linter-result
+
+            -   name: Diagnose file(s)
+                if: env.GIT_DIFF && !env.MATCHED_FILES
+                run: python printer-linter/src/terminal.py --diagnose --report printer-linter-result/fixes.yml ${{ env.GIT_DIFF_FILTERED }}
+
+            -   name: Save PR metadata
+                run: |
+                    echo ${{ github.event.number }} > printer-linter-result/pr-id.txt
+                    echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt
+                    echo ${{ github.event.pull_request.head.ref }} > printer-linter-result/pr-head-ref.txt
+
+            -   uses: actions/upload-artifact@v2
+                with:
+                    name: printer-linter-result
+                    path: printer-linter-result/
+
+            -   name: Run clang-tidy-pr-comments action
+                uses: platisd/clang-tidy-pr-comments@master
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
+                    clang_tidy_fixes: result.yml
+                    request_changes: true

.github/workflows/printer-linter-pr-post.yml

@@ -0,0 +1,80 @@
+name: printer-linter-pr-post
+
+on:
+    workflow_run:
+        workflows: [ "printer-linter-pr-diagnose" ]
+        types: [ completed ]
+
+jobs:
+    clang-tidy-results:
+        # Trigger the job only if the previous (insecure) workflow completed successfully
+        if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Download analysis results
+                uses: actions/github-script@v3.1.0
+                with:
+                    script: |
+                        let artifacts = await github.actions.listWorkflowRunArtifacts({
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            run_id: ${{github.event.workflow_run.id }},
+                        });
+                        let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                            return artifact.name == "printer-linter-result"
+                        })[0];
+                        let download = await github.actions.downloadArtifact({
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            artifact_id: matchArtifact.id,
+                            archive_format: "zip",
+                        });
+                        let fs = require("fs");
+                        fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data));
+
+            -   name: Set environment variables
+                run: |
+                    mkdir printer-linter-result
+                    unzip printer-linter-result.zip -d printer-linter-result
+                    echo "pr_id=$(cat printer-linter-result/pr-id.txt)" >> $GITHUB_ENV
+                    echo "pr_head_repo=$(cat printer-linter-result/pr-head-repo.txt)" >> $GITHUB_ENV
+                    echo "pr_head_ref=$(cat printer-linter-result/pr-head-ref.txt)" >> $GITHUB_ENV
+
+            -   uses: actions/checkout@v2
+                with:
+                    repository: ${{ env.pr_head_repo }}
+                    ref: ${{ env.pr_head_ref }}
+                    persist-credentials: false
+
+            -   name: Redownload analysis results
+                uses: actions/github-script@v3.1.0
+                with:
+                    script: |
+                        let artifacts = await github.actions.listWorkflowRunArtifacts({
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            run_id: ${{github.event.workflow_run.id }},
+                        });
+                        let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                            return artifact.name == "printer-linter-result"
+                        })[0];
+                        let download = await github.actions.downloadArtifact({
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            artifact_id: matchArtifact.id,
+                            archive_format: "zip",
+                        });
+                        let fs = require("fs");
+                        fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data));
+
+            -   name: Extract analysis results
+                run: |
+                    mkdir printer-linter-result
+                    unzip printer-linter-result.zip -d printer-linter-result
+
+            -   name: Run clang-tidy-pr-comments action
+                uses: platisd/clang-tidy-pr-comments@master
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
+                    clang_tidy_fixes: printer-linter-result/fixes.yml
+                    pull_request_id: ${{ env.pr_id }}

.github/workflows/requirements-printer-linter.txt

@@ -0,0 +1 @@
+pyyaml

.gitignore

@@ -99,3 +99,4 @@ conanbuildinfo.txt
 graph_info.json
 Ultimaker-Cura.spec
 .run/
+/printer-linter/src/printerlinter.egg-info/

.printer-linter

@@ -0,0 +1,15 @@
+checks:
+    diagnostic-mesh-file-extension: true
+    diagnostic-mesh-file-size: true
+    diagnostic-definition-redundant-override: true
+fixes:
+    diagnostic-definition-redundant-override: true
+format:
+    format-definition-bracket-newline: true
+    format-definition-paired-coordinate-array: true
+    format-definition-sort-keys: true
+    format-definition-indent: 4
+    format-definition-single-value-single-line: true # Format dicts and lists with a single item on one line "dict": { "value": 10 }
+    format-profile-space-around-delimiters: true
+    format-profile-sort-keys: true
+diagnostic-mesh-file-size: 1200000

CuraVersion.py.jinja

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Ultimaker B.V.
+# Copyright (c) 2022 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
 CuraAppName = "{{ cura_app_name }}"

conanfile.py

@@ -16,12 +16,12 @@ required_conan_version = ">=1.52.0"
 class CuraConan(ConanFile):
     name = "cura"
     license = "LGPL-3.0"
-    author = "Ultimaker B.V."
+    author = "UltiMaker"
     url = "https://github.com/Ultimaker/cura"
     description = "3D printer / slicing GUI built on top of the Uranium framework"
     topics = ("conan", "python", "pyqt5", "qt", "qml", "3d-printing", "slicer")
     build_policy = "missing"
-    exports = "LICENSE*", "Ultimaker-Cura.spec.jinja", "CuraVersion.py.jinja"
+    exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja"
     settings = "os", "compiler", "build_type", "arch"
     no_copy_source = True  # We won't build so no need to copy sources to the build folder
 
@@ -44,7 +44,7 @@ class CuraConan(ConanFile):
         "staging": "False",
         "devtools": False,
         "cloud_api_version": "1",
-        "display_name": "Ultimaker Cura",
+        "display_name": "UltiMaker Cura",
         "cura_debug_mode": False,  # Not yet implemented
         "internal": False,
     }
@@ -226,13 +226,13 @@ class CuraConan(ConanFile):
         # Collect all dll's from PyQt6 and place them in the root
         binaries.extend([(f"{p}", ".") for p in Path(self._site_packages, "PyQt6", "Qt6").glob("**/*.dll")])
 
-        with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f:
+        with open(Path(__file__).parent.joinpath("UltiMaker-Cura.spec.jinja"), "r") as f:
             pyinstaller = Template(f.read())
 
         version = self.conf_info.get("user.cura:version", default = self.version, check_type = str)
         cura_version = Version(version)
 
-        with open(Path(location, "Ultimaker-Cura.spec"), "w") as f:
+        with open(Path(location, "UltiMaker-Cura.spec"), "w") as f:
             f.write(pyinstaller.render(
                 name = str(self.options.display_name).replace(" ", "-"),
                 display_name = self.options.display_name,

cura/ApplicationMetadata.py

@@ -1,11 +1,11 @@
-# Copyright (c) 2022 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 # ---------
 # General constants used in Cura
 # ---------
 DEFAULT_CURA_APP_NAME = "cura"
-DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura"
+DEFAULT_CURA_DISPLAY_NAME = "UltiMaker Cura"
 DEFAULT_CURA_VERSION = "dev"
 DEFAULT_CURA_BUILD_TYPE = ""
 DEFAULT_CURA_DEBUG_MODE = False

cura/CrashHandler.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import platform
@@ -110,7 +110,7 @@ class CrashHandler:
         layout = QVBoxLayout(dialog)
 
         label = QLabel()
-        label.setText(catalog.i18nc("@label crash message", """<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right.</p></b>
+        label.setText(catalog.i18nc("@label crash message", """<p><b>Oops, UltiMaker Cura has encountered something that doesn't seem right.</p></b>
                     <p>We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.</p>
                     <p>Backups can be found in the configuration folder.</p>
                     <p>Please send us this Crash Report to fix the problem.</p>
@@ -119,7 +119,7 @@ class CrashHandler:
         layout.addWidget(label)
 
         # "send report" check box and show details
-        self._send_report_checkbox = QCheckBox(catalog.i18nc("@action:button", "Send crash report to Ultimaker"), dialog)
+        self._send_report_checkbox = QCheckBox(catalog.i18nc("@action:button", "Send crash report to UltiMaker"), dialog)
         self._send_report_checkbox.setChecked(True)
 
         show_details_button = QPushButton(catalog.i18nc("@action:button", "Show detailed crash report"), dialog)

cura/Machines/Models/MachineListModel.py

@@ -5,7 +5,7 @@
 # online cloud connected printers are represented within this ListModel. Additional information such as the number of
 # connected printers for each printer type is gathered.
 
-from typing import Optional
+from typing import Optional, List, cast
 
 from PyQt6.QtCore import Qt, QTimer, QObject, pyqtSlot, pyqtProperty, pyqtSignal
 
@@ -14,7 +14,6 @@ from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.Interfaces import ContainerInterface
 from UM.i18n import i18nCatalog
 from UM.Util import parseBool
-from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from cura.Settings.GlobalStack import GlobalStack
@@ -29,11 +28,13 @@ class MachineListModel(ListModel):
     MachineCountRole = Qt.ItemDataRole.UserRole + 6
     IsAbstractMachineRole = Qt.ItemDataRole.UserRole + 7
     ComponentTypeRole = Qt.ItemDataRole.UserRole + 8
+    IsNetworkedMachineRole = Qt.ItemDataRole.UserRole + 9
 
-    def __init__(self, parent: Optional[QObject] = None) -> None:
+    def __init__(self, parent: Optional[QObject] = None, machines_filter: List[GlobalStack] = None, listenToChanges: bool = True) -> None:
         super().__init__(parent)
 
         self._show_cloud_printers = False
+        self._machines_filter = machines_filter
 
         self._catalog = i18nCatalog("cura")
 
@@ -45,13 +46,14 @@ class MachineListModel(ListModel):
         self.addRoleName(self.MachineCountRole, "machineCount")
         self.addRoleName(self.IsAbstractMachineRole, "isAbstractMachine")
         self.addRoleName(self.ComponentTypeRole, "componentType")
+        self.addRoleName(self.IsNetworkedMachineRole, "isNetworked")
 
         self._change_timer = QTimer()
         self._change_timer.setInterval(200)
         self._change_timer.setSingleShot(True)
         self._change_timer.timeout.connect(self._update)
 
-        # Listen to changes
+        if listenToChanges:
             CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerChanged)
             CuraContainerRegistry.getInstance().containerMetaDataChanged.connect(self._onContainerChanged)
             CuraContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChanged)
@@ -79,17 +81,33 @@ class MachineListModel(ListModel):
     def _updateDelayed(self) -> None:
         self._change_timer.start()
 
+    def _getMachineStacks(self) -> List[ContainerStack]:
+        return CuraContainerRegistry.getInstance().findContainerStacks(type = "machine")
+
+    def _getAbstractMachineStacks(self) -> List[ContainerStack]:
+        return CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True")
+
+    def set_machines_filter(self, machines_filter: Optional[List[GlobalStack]]) -> None:
+        self._machines_filter = machines_filter
+        self._update()
+
     def _update(self) -> None:
         self.clear()
 
         from cura.CuraApplication import CuraApplication
         machines_manager = CuraApplication.getInstance().getMachineManager()
 
-        other_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine")
+        other_machine_stacks = self._getMachineStacks()
         other_machine_stacks.sort(key = lambda machine: machine.getName().upper())
 
-        abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True")
+        abstract_machine_stacks = self._getAbstractMachineStacks()
         abstract_machine_stacks.sort(key = lambda machine: machine.getName().upper(), reverse = True)
+
+        if self._machines_filter is not None:
+            filter_ids = [machine_filter.id for machine_filter in self._machines_filter]
+            other_machine_stacks = [machine for machine in other_machine_stacks if machine.id in filter_ids]
+            abstract_machine_stacks = [machine for machine in abstract_machine_stacks if machine.id in filter_ids]
+
         for abstract_machine in abstract_machine_stacks:
             definition_id = abstract_machine.definition.getId()
             online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True)
@@ -113,17 +131,12 @@ class MachineListModel(ListModel):
                     other_machine_stacks.remove(stack)
 
         if len(abstract_machine_stacks) > 0:
-            if self._show_cloud_printers:
-                self.appendItem({"componentType": "HIDE_BUTTON",
+            self.appendItem({
+                "componentType": "HIDE_BUTTON" if self._show_cloud_printers else "SHOW_BUTTON",
                 "isOnline": True,
                 "isAbstractMachine": False,
-                                 "machineCount": 0
-                                 })
-            else:
-                self.appendItem({"componentType": "SHOW_BUTTON",
-                                 "isOnline": True,
-                                 "isAbstractMachine": False,
-                                 "machineCount": 0
+                "machineCount": 0,
+                "catergory": "connected",
             })
 
         for stack in other_machine_stacks:
@@ -140,5 +153,7 @@ class MachineListModel(ListModel):
             "metadata": container_stack.getMetaData().copy(),
             "isOnline": is_online,
             "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)),
+            "isNetworked": cast(GlobalStack, container_stack).hasNetworkedConnection() if isinstance(container_stack, GlobalStack) else False,
             "machineCount": machine_count,
+            "catergory": "connected" if is_online else "other",
         })

cura/OAuth2/AuthorizationService.py

@@ -274,7 +274,7 @@ class AuthorizationService:
                             self._unable_to_get_data_message.show()
                         else:
                             self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info",
-                                                                                          "Unable to reach the Ultimaker account server."),
+                                                                                          "Unable to reach the UltiMaker account server."),
                                                                        title = i18n_catalog.i18nc("@info:title", "Log-in failed"),
                                                                        message_type = Message.MessageType.ERROR)
                             Logger.warning("Unable to get user profile using auth data from preferences.")

cura/Settings/ActiveQuality.py

@@ -0,0 +1,48 @@
+from dataclasses import dataclass
+from typing import List
+
+from UM import i18nCatalog
+
+catalog = i18nCatalog("cura")
+
+
+@dataclass
+class ActiveQuality:
+    """ Represents the active intent+profile combination, contains all information needed to display active quality. """
+    intent_category: str = ""       # Name of the base intent. For example "visual" or "engineering".
+    intent_name: str = ""           # Name of the base intent formatted for display. For Example "Visual" or "Engineering"
+    profile: str = ""               # Name of the base profile. For example "Fine" or "Fast"
+    custom_profile: str = ""        # Name of the custom profile, this is based on profile. For example "MyCoolCustomProfile"
+    layer_height: float = None      # Layer height of quality in mm. For example 0.4
+    is_experimental: bool = False   # If the quality experimental.
+
+    def getMainStringParts(self) -> List[str]:
+        string_parts = []
+
+        if self.custom_profile is not None:
+            string_parts.append(self.custom_profile)
+        else:
+            string_parts.append(self.profile)
+            if self.intent_category is not "default":
+                string_parts.append(self.intent_name)
+
+        return string_parts
+
+    def getTailStringParts(self) -> List[str]:
+        string_parts = []
+
+        if self.custom_profile is not None:
+            string_parts.append(self.profile)
+            if self.intent_category is not "default":
+                string_parts.append(self.intent_name)
+
+        if self.layer_height:
+            string_parts.append(f"{self.layer_height}mm")
+
+        if self.is_experimental:
+            string_parts.append(catalog.i18nc("@label", "Experimental"))
+
+        return string_parts
+
+    def getStringParts(self) -> List[str]:
+        return self.getMainStringParts() + self.getTailStringParts()

cura/Settings/MachineManager.py

@@ -40,6 +40,7 @@ from cura.Settings.cura_empty_instance_containers import (empty_definition_chang
                                                           empty_material_container, empty_quality_container,
                                                           empty_quality_changes_container, empty_intent_container)
 from cura.UltimakerCloud.UltimakerCloudConstants import META_UM_LINKED_TO_ACCOUNT
+from .ActiveQuality import ActiveQuality
 
 from .CuraStackBuilder import CuraStackBuilder
 
@@ -1631,33 +1632,31 @@ class MachineManager(QObject):
     #        Examples:
     #          - "my_profile - Fine" (only based on a default quality, no intent involved)
     #          - "my_profile - Engineering - Fine" (based on an intent)
-    @pyqtProperty("QVariantMap", notify = activeQualityDisplayNameChanged)
-    def activeQualityDisplayNameMap(self) -> Dict[str, str]:
+    @pyqtProperty("QList<QString>", notify = activeQualityDisplayNameChanged)
+    def activeQualityDisplayNameStringParts(self) -> List[str]:
+        return self.activeQualityDisplayNameMap().getStringParts()
+
+    @pyqtProperty("QList<QString>", notify = activeQualityDisplayNameChanged)
+    def activeQualityDisplayNameMainStringParts(self) -> List[str]:
+        return self.activeQualityDisplayNameMap().getMainStringParts()
+
+    @pyqtProperty("QList<QString>", notify = activeQualityDisplayNameChanged)
+    def activeQualityDisplayNameTailStringParts(self) -> List[str]:
+        return self.activeQualityDisplayNameMap().getTailStringParts()
+
+    def activeQualityDisplayNameMap(self) -> ActiveQuality:
         global_stack = self._application.getGlobalContainerStack()
         if global_stack is None:
-            return {"main": "",
-                    "suffix": ""}
+            return ActiveQuality()
 
-        display_name = global_stack.quality.getName()
-
-        intent_category = self.activeIntentCategory
-        if intent_category != "default":
-            intent_display_name = IntentCategoryModel.translation(intent_category,
-                                                                  "name",
-                                                                  intent_category.title())
-            display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name,
-                                                               the_rest = display_name)
-
-        main_part = display_name
-        suffix_part = ""
-
-        # Not a custom quality
-        if global_stack.qualityChanges != empty_quality_changes_container:
-            main_part = self.activeQualityOrQualityChangesName
-            suffix_part = display_name
-
-        return {"main": main_part,
-                "suffix": suffix_part}
+        return ActiveQuality(
+            profile = global_stack.quality.getName(),
+            intent_category = self.activeIntentCategory,
+            intent_name = IntentCategoryModel.translation(self.activeIntentCategory, "name", self.activeIntentCategory.title()),
+            custom_profile = self.activeQualityOrQualityChangesName if global_stack.qualityChanges is not empty_quality_changes_container else None,
+            layer_height = self.activeQualityLayerHeight if self.isActiveQualitySupported else None,
+            is_experimental = self.isActiveQualityExperimental and self.isActiveQualitySupported
+        )
 
     @pyqtSlot(str)
     def setIntentByCategory(self, intent_category: str) -> None:
@@ -1776,7 +1775,9 @@ class MachineManager(QObject):
     @pyqtProperty(bool, notify = activeQualityGroupChanged)
     def hasNotSupportedQuality(self) -> bool:
         global_container_stack = self._application.getGlobalContainerStack()
-        return (not global_container_stack is None) and global_container_stack.quality == empty_quality_container and global_container_stack.qualityChanges == empty_quality_changes_container
+        return global_container_stack is not None\
+               and global_container_stack.quality == empty_quality_container \
+               and global_container_stack.qualityChanges == empty_quality_changes_container
 
     @pyqtProperty(bool, notify = activeQualityGroupChanged)
     def isActiveQualityCustom(self) -> bool:

packaging/AppImage/AppRun

@@ -17,4 +17,4 @@ export OPENSSL_CONF="$scriptdir/openssl.cnf"
 # unset `QT_STYLE_OVERRIDE` as a precaution
 unset QT_STYLE_OVERRIDE
 
-$scriptdir/Ultimaker-Cura "$@"
+$scriptdir/UltiMaker-Cura "$@"

packaging/AppImage/create_appimage.py

@@ -1,6 +1,7 @@
-# Copyright (c) 2022 Ultimaker B.V.
+# Copyright (c) 2022 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
+
 import argparse  # Command line arguments parsing and help.
 from jinja2 import Template
 import os  # Finding installation directory.
@@ -71,6 +72,6 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser(description = "Create AppImages of Cura.")
     parser.add_argument("dist_path", type=str, help="Path to where PyInstaller installed the distribution of Cura.")
     parser.add_argument("version", type=str, help="Full version number of Cura (e.g. '5.1.0-beta')")
-    parser.add_argument("filename", type = str, help = "Filename of the AppImage (e.g. 'Ultimaker-Cura-5.1.0-beta-Linux-X64.AppImage')")
+    parser.add_argument("filename", type = str, help = "Filename of the AppImage (e.g. 'UltiMaker-Cura-5.1.0-beta-Linux-X64.AppImage')")
     args = parser.parse_args()
     build_appimage(args.dist_path, args.version, args.filename)

packaging/AppImage/cura.appdata.xml

@@ -3,16 +3,16 @@
 	<id>com.ultimaker.cura</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>LGPL-3.0</project_license>
-	<name>Ultimaker Cura</name>
+	<name>UltiMaker Cura</name>
 	<summary>Slicer to prepare your 3D printing projects</summary>
 	<description>
-		<p>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.</p>
+		<p>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.</p>
 	</description>
 	<url type="homepage">https://ultimaker.com/en/software/ultimaker-cura</url>
 	<screenshots>
 		<screenshot type="default">
 			<caption>Print preparation screen</caption>
-			<image>https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png</image>
+			<image>https://raw.githubusercontent.com/Ultimaker/Cura/main/cura-logo.PNG</image>
 		</screenshot>
 	</screenshots>
 </component>

packaging/AppImage/cura.desktop.jinja

@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=Ultimaker Cura
-Name[de]=Ultimaker Cura
+Name=UltiMaker Cura
+Name[de]=UltiMaker Cura
 GenericName=3D Printing Software
 GenericName[de]=3D-Druck-Software
 GenericName[nl]=3D-Print Software
 Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
-Exec=Ultimaker-Cura %F
+Exec=UltiMaker-Cura %F
 Icon=cura-icon
 Terminal=false
 Type=Application

packaging/NSIS/Ultimaker-Cura.nsi.jinja

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Ultimaker B.V.
+# Copyright (c) 2022 UltiMaker B.V.
 # Cura's build system is released under the terms of the AGPLv3 or higher.
 
 !define APP_NAME "{{ app_name }}"
@@ -64,7 +64,7 @@ InstallDir "$PROGRAMFILES64\${APP_NAME}"
 
 !ifdef REG_START_MENU
 !define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Ultimaker Cura"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltiMaker Cura"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
@@ -113,8 +113,8 @@ CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE
 CreateShortCut "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
 
 !ifdef WEB_SITE
-WriteIniStr "$INSTDIR\Ultimaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\Ultimaker Cura website.lnk" "$INSTDIR\Ultimaker Cura website.url"
+WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
+CreateShortCut "$SMPROGRAMS\$SM_Folder\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
 !endif
 !insertmacro MUI_STARTMENU_WRITE_END
 !endif
@@ -125,8 +125,8 @@ CreateShortCut "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP
 CreateShortCut "$SMPROGRAMS\{{ app_name }}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
 
 !ifdef WEB_SITE
-WriteIniStr "$INSTDIR\Ultimaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\{{ app_name }}\Ultimaker Cura website.lnk" "$INSTDIR\Ultimaker Cura website.url"
+WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
+CreateShortCut "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
 !endif
 !endif
 
@@ -170,7 +170,7 @@ RmDir /r /REBOOTOK "$INSTDIR"
 Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk"
 !ifdef WEB_SITE
-Delete "$SMPROGRAMS\$SM_Folder\Ultimaker Cura website.lnk"
+Delete "$SMPROGRAMS\$SM_Folder\UltiMaker Cura website.lnk"
 !endif
 RmDir "$SMPROGRAMS\$SM_Folder"
 !endif
@@ -179,7 +179,7 @@ RmDir "$SMPROGRAMS\$SM_Folder"
 Delete "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\{{ app_name }}\Uninstall ${APP_NAME}.lnk"
 !ifdef WEB_SITE
-Delete "$SMPROGRAMS\{{ app_name }}\Ultimaker Cura website.lnk"
+Delete "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk"
 !endif
 RmDir "$SMPROGRAMS\{{ app_name }}"
 !endif

packaging/NSIS/create_windows_installer.py

@@ -1,5 +1,7 @@
-# Copyright (c) 2022 Ultimaker B.V.
+# Copyright (c) 2022 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
+
+
 import os
 import argparse  # Command line arguments parsing and help.
 import subprocess
@@ -16,15 +18,15 @@ def generate_nsi(source_path: str, dist_path: str, filename: str):
     dist_loc = Path(os.getcwd(), dist_path)
     source_loc = Path(os.getcwd(), source_path)
     instdir = Path("$INSTDIR")
-    dist_paths = [p.relative_to(dist_loc.joinpath("Ultimaker-Cura")) for p in sorted(dist_loc.joinpath("Ultimaker-Cura").rglob("*")) if p.is_file()]
+    dist_paths = [p.relative_to(dist_loc.joinpath("UltiMaker-Cura")) for p in sorted(dist_loc.joinpath("UltiMaker-Cura").rglob("*")) if p.is_file()]
     mapped_out_paths = {}
     for dist_path in dist_paths:
         if "__pycache__" not in dist_path.parts:
             out_path = instdir.joinpath(dist_path).parent
             if out_path not in mapped_out_paths:
-                mapped_out_paths[out_path] = [(dist_loc.joinpath("Ultimaker-Cura", dist_path), instdir.joinpath(dist_path))]
+                mapped_out_paths[out_path] = [(dist_loc.joinpath("UltiMaker-Cura", dist_path), instdir.joinpath(dist_path))]
             else:
-                mapped_out_paths[out_path].append((dist_loc.joinpath("Ultimaker-Cura", dist_path), instdir.joinpath(dist_path)))
+                mapped_out_paths[out_path].append((dist_loc.joinpath("UltiMaker-Cura", dist_path), instdir.joinpath(dist_path)))
 
     rmdir_paths = set()
     for rmdir_f in mapped_out_paths.values():
@@ -40,13 +42,13 @@ def generate_nsi(source_path: str, dist_path: str, filename: str):
 
 
     nsis_content = template.render(
-        app_name = f"Ultimaker Cura {os.getenv('CURA_VERSION_FULL')}",
-        main_app = "Ultimaker-Cura.exe",
+        app_name = f"UltiMaker Cura {os.getenv('CURA_VERSION_FULL')}",
+        main_app = "UltiMaker-Cura.exe",
         version = os.getenv('CURA_VERSION_FULL'),
         version_major = os.environ.get("CURA_VERSION_MAJOR"),
         version_minor = os.environ.get("CURA_VERSION_MINOR"),
         version_patch = os.environ.get("CURA_VERSION_PATCH"),
-        company = "Ultimaker B.V.",
+        company = "UltiMaker",
         web_site = "https://ultimaker.com",
         year = datetime.now().year,
         cura_license_file = str(source_loc.joinpath("packaging", "cura_license.txt")),
@@ -58,7 +60,7 @@ def generate_nsi(source_path: str, dist_path: str, filename: str):
         destination = filename
     )
 
-    with open(dist_loc.joinpath("Ultimaker-Cura.nsi"), "w") as f:
+    with open(dist_loc.joinpath("UltiMaker-Cura.nsi"), "w") as f:
         f.write(nsis_content)
 
     shutil.copy(source_loc.joinpath("packaging", "NSIS", "fileassoc.nsh"), dist_loc.joinpath("fileassoc.nsh"))
@@ -66,7 +68,7 @@ def generate_nsi(source_path: str, dist_path: str, filename: str):
 
 def build(dist_path: str):
     dist_loc = Path(os.getcwd(), dist_path)
-    command = ["makensis", "/V2", "/P4", str(dist_loc.joinpath("Ultimaker-Cura.nsi"))]
+    command = ["makensis", "/V2", "/P4", str(dist_loc.joinpath("UltiMaker-Cura.nsi"))]
     subprocess.run(command)
 
 
@@ -74,7 +76,7 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser(description = "Create Windows exe installer of Cura.")
     parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.")
     parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder")
-    parser.add_argument("filename", type = str, help = "Filename of the exe (e.g. 'Ultimaker-Cura-5.1.0-beta-Windows-X64.exe')")
+    parser.add_argument("filename", type = str, help = "Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.exe')")
     args = parser.parse_args()
     generate_nsi(args.source_path, args.dist_path, args.filename)
     build(args.dist_path)

packaging/dmg/dmg_sign_noterize.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2022 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+
 import os
 import argparse  # Command line arguments parsing and help.
 import subprocess
@@ -14,11 +18,11 @@ def build_dmg(source_path: str, dist_path: str, filename: str) -> None:
                  "--app-drop-link", "520", "272",
                  "--volicon", f"{source_path}/packaging/icons/VolumeIcons_Cura.icns",
                  "--icon-size", "90",
-                 "--icon", "Ultimaker-Cura.app", "169", "272",
+                 "--icon", "UltiMaker-Cura.app", "169", "272",
                  "--eula", f"{source_path}/packaging/cura_license.txt",
                  "--background", f"{source_path}/packaging/dmg/cura_background_dmg.png",
                  f"{dist_path}/{filename}",
-                 f"{dist_path}/Ultimaker-Cura.app"]
+                 f"{dist_path}/UltiMaker-Cura.app"]
 
     subprocess.run(arguments)
 
@@ -57,7 +61,7 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser(description = "Create dmg of Cura.")
     parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.")
     parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder")
-    parser.add_argument("filename", type = str, help = "Filename of the dmg (e.g. 'Ultimaker-Cura-5.1.0-beta-Linux-X64.dmg')")
+    parser.add_argument("filename", type = str, help = "Filename of the dmg (e.g. 'UltiMaker-Cura-5.1.0-beta-Linux-X64.dmg')")
     args = parser.parse_args()
     build_dmg(args.source_path, args.dist_path, args.filename)
     sign(args.dist_path, args.filename)

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -9,6 +9,7 @@ from typing import cast, Dict, List, Optional, Tuple, Any, Set
 
 import xml.etree.ElementTree as ET
 
+from UM.Util import parseBool
 from UM.Workspace.WorkspaceReader import WorkspaceReader
 from UM.Application import Application
 
@@ -599,7 +600,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         self._dialog.setNumUserSettings(num_user_settings)
         self._dialog.setActiveMode(active_mode)
         self._dialog.setUpdatableMachines(updatable_machines)
-        self._dialog.setMachineName(machine_name)
         self._dialog.setMaterialLabels(material_labels)
         self._dialog.setMachineType(machine_type)
         self._dialog.setExtruders(extruders)
@@ -608,6 +608,36 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         self._dialog.setMissingPackagesMetadata(missing_package_metadata)
         self._dialog.show()
 
+        # Choosing the initially selected printer in MachineSelector
+        is_networked_machine = False
+        is_abstract_machine = False
+        if global_stack and isinstance(global_stack, GlobalStack):
+            # The machine included in the project file exists locally already, no need to change selected printers.
+            is_networked_machine = global_stack.hasNetworkedConnection()
+            is_abstract_machine = parseBool(existing_global_stack.getMetaDataEntry("is_abstract_machine", False))
+            self._dialog.setMachineToOverride(global_stack.getId())
+            self._dialog.setResolveStrategy("machine", "override")
+        elif self._dialog.updatableMachinesModel.count > 0:
+            # The machine included in the project file does not exist. There is another machine of the same type.
+            # This will always default to an abstract machine first.
+            machine = self._dialog.updatableMachinesModel.getItem(0)
+            machine_name = machine["name"]
+            is_networked_machine = machine["isNetworked"]
+            is_abstract_machine = machine["isAbstractMachine"]
+            self._dialog.setMachineToOverride(machine["id"])
+            self._dialog.setResolveStrategy("machine", "override")
+        else:
+            # The machine included in the project file does not exist. There are no other printers of the same type. Default to "Create New".
+            machine_name = i18n_catalog.i18nc("@button", "Create new")
+            is_networked_machine = False
+            is_abstract_machine = False
+            self._dialog.setMachineToOverride(None)
+            self._dialog.setResolveStrategy("machine", "new")
+
+        self._dialog.setIsNetworkedMachine(is_networked_machine)
+        self._dialog.setIsAbstractMachine(is_abstract_machine)
+        self._dialog.setMachineName(machine_name)
+
         # Block until the dialog is closed.
         self._dialog.waitForClose()
 
@@ -670,7 +700,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         temp_preferences = Preferences()
         try:
             serialized = archive.open("Cura/preferences.cfg").read().decode("utf-8")
-        except KeyError:
+        except KeyError as e:
             # If there is no preferences file, it's not a workspace, so notify user of failure.
             Logger.log("w", "File %s is not a valid workspace.", file_name)
             message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tags <filename> or <message>!",
@@ -702,7 +732,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         application.expandedCategoriesChanged.emit()  # Notify the GUI of the change
 
         # If there are no machines of the same type, create a new machine.
-        if self._resolve_strategies["machine"] != "override" or self._dialog.updatableMachinesModel.count <= 1:
+        if self._resolve_strategies["machine"] != "override" or self._dialog.updatableMachinesModel.count == 0:
             # We need to create a new machine
             machine_name = self._container_registry.uniqueName(self._machine_info.name)
 

plugins/3MFReader/UpdatableMachinesModel.py

@@ -1,43 +0,0 @@
-# Copyright (c) 2020 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
-
-from typing import Dict, List
-
-from PyQt6.QtCore import Qt
-
-from UM.Qt.ListModel import ListModel
-from cura.Settings.GlobalStack import GlobalStack
-
-create_new_list_item = {
-    "id":   "new",
-    "name": "Create new",
-    "displayName": "Create new",
-    "type": "default_option"  # to make sure we are not mixing the "Create new" option with a printer with id "new"
-}  # type: Dict[str, str]
-
-
-class UpdatableMachinesModel(ListModel):
-    """Model that holds cura packages.
-
-    By setting the filter property the instances held by this model can be changed.
-    """
-
-    def __init__(self, parent = None) -> None:
-        super().__init__(parent)
-
-        self.addRoleName(Qt.ItemDataRole.UserRole + 1, "id")
-        self.addRoleName(Qt.ItemDataRole.UserRole + 2, "name")
-        self.addRoleName(Qt.ItemDataRole.UserRole + 3, "displayName")
-        self.addRoleName(Qt.ItemDataRole.UserRole + 4, "type")  # Either "default_option" or "machine"
-
-    def update(self, machines: List[GlobalStack]) -> None:
-        items = [create_new_list_item]  # type: List[Dict[str, str]]
-
-        for machine in sorted(machines, key = lambda printer: printer.name):
-            items.append({
-                "id":   machine.id,
-                "name": machine.name,
-                "displayName": "Update " + machine.name,
-                "type": "machine"
-            })
-        self.setItems(items)

plugins/3MFReader/WorkspaceDialog.py

@@ -5,6 +5,7 @@ from PyQt6.QtCore import pyqtSignal, QObject, pyqtProperty, QCoreApplication, QU
 from PyQt6.QtGui import QDesktopServices
 from typing import List, Optional, Dict, cast
 
+from cura.Machines.Models.MachineListModel import MachineListModel
 from cura.Settings.GlobalStack import GlobalStack
 from UM.Application import Application
 from UM.FlameProfiler import pyqtSlot
@@ -14,8 +15,6 @@ from UM.Message import Message
 from UM.PluginRegistry import PluginRegistry
 from UM.Settings.ContainerRegistry import ContainerRegistry
 
-from .UpdatableMachinesModel import UpdatableMachinesModel
-
 import os
 import threading
 import time
@@ -63,10 +62,12 @@ class WorkspaceDialog(QObject):
         self._extruders = []
         self._objects_on_plate = False
         self._is_printer_group = False
-        self._updatable_machines_model = UpdatableMachinesModel(self)
+        self._updatable_machines_model = MachineListModel(self, listenToChanges=False)
         self._missing_package_metadata: List[Dict[str, str]] = []
         self._plugin_registry: PluginRegistry = CuraApplication.getInstance().getPluginRegistry()
         self._install_missing_package_dialog: Optional[QObject] = None
+        self._is_abstract_machine = False
+        self._is_networked_machine = False
 
     machineConflictChanged = pyqtSignal()
     qualityChangesConflictChanged = pyqtSignal()
@@ -80,6 +81,8 @@ class WorkspaceDialog(QObject):
     intentNameChanged = pyqtSignal()
     machineNameChanged = pyqtSignal()
     updatableMachinesChanged = pyqtSignal()
+    isAbstractMachineChanged = pyqtSignal()
+    isNetworkedChanged = pyqtSignal()
     materialLabelsChanged = pyqtSignal()
     objectsOnPlateChanged = pyqtSignal()
     numUserSettingsChanged = pyqtSignal()
@@ -161,13 +164,31 @@ class WorkspaceDialog(QObject):
             self.machineNameChanged.emit()
 
     @pyqtProperty(QObject, notify = updatableMachinesChanged)
-    def updatableMachinesModel(self) -> UpdatableMachinesModel:
-        return cast(UpdatableMachinesModel, self._updatable_machines_model)
+    def updatableMachinesModel(self) -> MachineListModel:
+        return cast(MachineListModel, self._updatable_machines_model)
 
     def setUpdatableMachines(self, updatable_machines: List[GlobalStack]) -> None:
-        self._updatable_machines_model.update(updatable_machines)
+        self._updatable_machines_model.set_machines_filter(updatable_machines)
         self.updatableMachinesChanged.emit()
 
+    @pyqtProperty(bool, notify = isAbstractMachineChanged)
+    def isAbstractMachine(self) -> bool:
+        return self._is_abstract_machine
+
+    @pyqtSlot(bool)
+    def setIsAbstractMachine(self, is_abstract_machine: bool) -> None:
+        self._is_abstract_machine = is_abstract_machine
+        self.isAbstractMachineChanged.emit()
+
+    @pyqtProperty(bool, notify = isNetworkedChanged)
+    def isNetworked(self) -> bool:
+        return self._is_networked_machine
+
+    @pyqtSlot(bool)
+    def setIsNetworkedMachine(self, is_networked_machine: bool) -> None:
+        self._is_networked_machine = is_networked_machine
+        self.isNetworkedChanged.emit()
+
     @pyqtProperty(str, notify=qualityTypeChanged)
     def qualityType(self) -> str:
         return self._quality_type

plugins/3MFReader/WorkspaceDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Ultimaker B.V.
+// Copyright (c) 2022 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -11,47 +11,48 @@ import Cura 1.1 as Cura
 
 UM.Dialog
 {
-    id: base
+    id: workspaceDialog
     title: catalog.i18nc("@title:window", "Open Project")
 
-    minimumWidth: UM.Theme.getSize("popup_dialog").width
-    minimumHeight: UM.Theme.getSize("popup_dialog").height
-    width: minimumWidth
-    backgroundColor: UM.Theme.getColor("main_background")
     margin: UM.Theme.getSize("default_margin").width
-    property int comboboxHeight: UM.Theme.getSize("default_margin").height
+    minimumWidth: UM.Theme.getSize("modal_window_minimum").width
+    minimumHeight: UM.Theme.getSize("modal_window_minimum").height
 
-    onClosing: manager.notifyClosed()
-    onVisibleChanged:
+    backgroundColor: UM.Theme.getColor("detail_background")
+
+    headerComponent: Rectangle
     {
-        if (visible)
+        height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height
+        color: UM.Theme.getColor("main_background")
+
+        UM.Label
         {
-            machineResolveComboBox.currentIndex = 0
-            qualityChangesResolveComboBox.currentIndex = 0
-            materialResolveComboBox.currentIndex = 0
+            id: titleLabel
+            text: catalog.i18nc("@action:title", "Summary - Cura Project")
+            font: UM.Theme.getFont("large")
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.leftMargin: UM.Theme.getSize("default_margin").height
         }
     }
 
+    Rectangle
+    {
+        anchors.fill: parent
+        UM.I18nCatalog { id: catalog; name: "cura" }
+        color: UM.Theme.getColor("main_background")
+
         Flickable
         {
-        clip: true
+            id: dialogSummaryItem
             width: parent.width
             height: parent.height
-        contentHeight: dialogSummaryItem.height
-        ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar }
 
-        Item
-        {
-            id: dialogSummaryItem
-            width: verticalScrollBar.visible ? parent.width - verticalScrollBar.width - UM.Theme.getSize("default_margin").width : parent.width
-            height: childrenRect.height
-            anchors.margins: 10 * screenScaleFactor
+            clip: true
 
-            UM.I18nCatalog
-            {
-                id: catalog
-                name: "cura"
-            }
+            contentHeight: contentColumn.height
+            ScrollBar.vertical: UM.ScrollBar { id: scrollbar }
 
             ListModel
             {
@@ -68,373 +69,245 @@ UM.Dialog
 
             Column
             {
-                width: parent.width
+                id: contentColumn
+                width: parent.width - scrollbar.width - UM.Theme.getSize("default_margin").width
                 height: childrenRect.height
+
                 spacing: UM.Theme.getSize("default_margin").height
+                leftPadding: UM.Theme.getSize("default_margin").width
+                rightPadding: UM.Theme.getSize("default_margin").width
 
-                Column
+                WorkspaceSection
                 {
-                    width: parent.width
-                    height: childrenRect.height
+                    id: printerSection
+                    title: catalog.i18nc("@action:label", "Printer settings")
+                    iconSource: UM.Theme.getIcon("Printer")
+                    content: Column
+                    {
+                        spacing: UM.Theme.getSize("default_margin").height
+                        leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
 
-                    UM.Label
+                        WorkspaceRow
                         {
-                        id: titleLabel
-                        text: catalog.i18nc("@action:title", "Summary - Cura Project")
-                        font: UM.Theme.getFont("large")
+                            leftLabelText: catalog.i18nc("@action:label", "Type")
+                            rightLabelText: manager.machineType
                         }
 
-                    Rectangle
+                        WorkspaceRow
                         {
-                        id: separator
-                        color: UM.Theme.getColor("text")
-                        width: parent.width
-                        height: UM.Theme.getSize("default_lining").height
+                            leftLabelText: catalog.i18nc("@action:label", manager.isPrinterGroup ? "Printer Group" : "Printer Name")
+                            rightLabelText: manager.machineName == catalog.i18nc("@button", "Create new") ? "" : manager.machineName
                         }
                     }
 
-                Item
+                    comboboxTitle: catalog.i18nc("@action:label", "Open With")
+                    comboboxTooltipText: catalog.i18nc("@info:tooltip", "Printer settings will be updated to match the settings saved with the project.")
+                    comboboxVisible: workspaceDialog.visible && manager.updatableMachinesModel.count > 1
+                    combobox: Cura.MachineSelector
                     {
+                        id: machineSelector
+                        headerCornerSide: Cura.RoundedRectangle.Direction.All
                         width: parent.width
-                    height: childrenRect.height
+                        height: parent.height
+                        machineListModel: manager.updatableMachinesModel
+                        machineName: manager.machineName
 
-                    UM.TooltipArea
+                        isConnectedCloudPrinter: false
+                        isCloudRegistered: false
+                        isNetworkPrinter: manager.isNetworked
+                        isGroup: manager.isAbstractMachine
+                        connectionStatus: ""
+
+                        minDropDownWidth: machineSelector.width
+
+                        buttons: [
+                            Cura.SecondaryButton
                             {
-                        id: machineResolveStrategyTooltip
-                        anchors.top: parent.top
-                        anchors.right: parent.right
-                        width: (parent.width / 3) | 0
-                        height: visible ? comboboxHeight : 0
-                        visible: base.visible && machineResolveComboBox.model.count > 1
-                        text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
-                        Cura.ComboBox
+                                id: createNewPrinter
+                                text: catalog.i18nc("@button", "Create new")
+                                fixedWidthMode: true
+                                width: parent.width - leftPadding * 1.5
+                                onClicked:
                                 {
-                            id: machineResolveComboBox
-                            model: manager.updatableMachinesModel
-                            visible: machineResolveStrategyTooltip.visible
-                            textRole: "displayName"
-                            width: parent.width
-                            height: UM.Theme.getSize("button").height
+                                    toggleContent()
+                                    manager.setResolveStrategy("machine", "new")
+                                    machineSelector.machineName = catalog.i18nc("@button", "Create new")
+                                    manager.setIsAbstractMachine(false)
+                                    manager.setIsNetworkedMachine(false)
+                                }
+                            }
+                        ]
+
+                        onSelectPrinter: function(machine)
+                        {
+                            toggleContent();
+                            machineSelector.machineName = machine.name
+                            manager.setResolveStrategy("machine", "override")
+                            manager.setMachineToOverride(machine.id)
+                            manager.setIsAbstractMachine(machine.isAbstractMachine)
+                            manager.setIsNetworkedMachine(machine.isNetworked)
+                        }
+                    }
+                }
+
+                WorkspaceSection
+                {
+                    id: profileSection
+                    title: catalog.i18nc("@action:label", "Profile settings")
+                    iconSource: UM.Theme.getIcon("Sliders")
+                    content: Column
+                    {
+                        id: profileSettingsValuesTable
+                        spacing: UM.Theme.getSize("default_margin").height
+                        leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
+
+                        WorkspaceRow
+                        {
+                            leftLabelText: catalog.i18nc("@action:label", "Name")
+                            rightLabelText: manager.qualityName
+                        }
+
+                        WorkspaceRow
+                        {
+                            leftLabelText: catalog.i18nc("@action:label", "Intent")
+                            rightLabelText: manager.intentName
+                        }
+
+                        WorkspaceRow
+                        {
+                            leftLabelText: catalog.i18nc("@action:label", "Not in profile")
+                            rightLabelText: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.numUserSettings).arg(manager.numUserSettings)
+                            visible: manager.numUserSettings != 0
+                        }
+
+                        WorkspaceRow
+                        {
+                            leftLabelText: catalog.i18nc("@action:label", "Derivative from")
+                            rightLabelText: catalog.i18ncp("@action:label", "%1, %2 override", "%1, %2 overrides", manager.numSettingsOverridenByQualityChanges).arg(manager.qualityType).arg(manager.numSettingsOverridenByQualityChanges)
+                            visible: manager.numSettingsOverridenByQualityChanges != 0
+                        }
+                    }
+
+                    comboboxVisible: manager.qualityChangesConflict
+                    combobox: Cura.ComboBox
+                    {
+                        id: qualityChangesResolveComboBox
+                        model: resolveStrategiesModel
+                        textRole: "label"
+                        visible: manager.qualityChangesConflict
+                        contentLeftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
+                        textFont: UM.Theme.getFont("medium")
+
+                        background: Cura.RoundedRectangle
+                        {
+                            border.width: UM.Theme.getSize("default_lining").width
+                            border.color: UM.Theme.getColor("lining")
+                            color: qualityChangesResolveComboBox.hovered ? UM.Theme.getColor("expandable_hover") : UM.Theme.getColor("action_button")
+                            cornerSide: Cura.RoundedRectangle.Direction.All
+                            radius: UM.Theme.getSize("default_radius").width
+                        }
+
+                        // This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded
+                        currentIndex:
+                        {
+                            currentIndex = 0
+                        }
+
                         onCurrentIndexChanged:
                         {
-                                if (model.getItem(currentIndex).id == "new"
-                                    && model.getItem(currentIndex).type == "default_option")
-                                {
-                                    manager.setResolveStrategy("machine", "new")
-                                }
-                                else
-                                {
-                                    manager.setResolveStrategy("machine", "override")
-                                    manager.setMachineToOverride(model.getItem(currentIndex).id)
-                                }
-                            }
-
-                            onVisibleChanged:
-                            {
-                                if (!visible) {return}
-
-                                currentIndex = 0
-                                // If the project printer exists in Cura, set it as the default dropdown menu option.
-                                // No need to check object 0, which is the "Create new" option
-                                for (var i = 1; i < model.count; i++)
-                                {
-                                    if (model.getItem(i).name == manager.machineName)
-                                    {
-                                        currentIndex = i
-                                        break
-                                    }
-                                }
-                                // The project printer does not exist in Cura. If there is at least one printer of the same
-                                // type, select the first one, else set the index to "Create new"
-                                if (currentIndex == 0 && model.count > 1)
-                                {
-                                    currentIndex = 1
-                                }
-                            }
-                        }
-                    }
-
-                    Column
-                    {
-                        width: parent.width
-                        height: childrenRect.height
-
-                        UM.Label
-                        {
-                            id: printer_settings_label
-                            text: catalog.i18nc("@action:label", "Printer settings")
-                            font: UM.Theme.getFont("default_bold")
-                        }
-
-                        Row
-                        {
-                            width: parent.width
-                            height: childrenRect.height
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", "Type")
-                                width: (parent.width / 3) | 0
-                            }
-                            UM.Label
-                            {
-                                text: manager.machineType
-                                width: (parent.width / 3) | 0
-                            }
-                        }
-
-                        Row
-                        {
-                            width: parent.width
-                            height: childrenRect.height
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", manager.isPrinterGroup ? "Printer Group" : "Printer Name")
-                                width: (parent.width / 3) | 0
-                            }
-                            UM.Label
-                            {
-                                text: manager.machineName
-                                width: (parent.width / 3) | 0
-                                wrapMode: Text.WordWrap
-                            }
-                        }
-                    }
-                }
-
-                Item
-                {
-                    width: parent.width
-                    height: childrenRect.height
-
-                    UM.TooltipArea
-                    {
-                        anchors.right: parent.right
-                        anchors.top: parent.top
-                        width: (parent.width / 3) | 0
-                        height: visible ? comboboxHeight : 0
-                        visible: manager.qualityChangesConflict
-                        text: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?")
-                        Cura.ComboBox
-                        {
-                            model: resolveStrategiesModel
-                            textRole: "label"
-                            id: qualityChangesResolveComboBox
-                            width: parent.width
-                            height: UM.Theme.getSize("button").height
-                            onActivated:
-                            {
-                                manager.setResolveStrategy("quality_changes", resolveStrategiesModel.get(index).key)
+                            manager.setResolveStrategy("quality_changes", resolveStrategiesModel.get(currentIndex).key)
                         }
                     }
                 }
 
-                    Column
+                WorkspaceSection
                 {
-                        width: parent.width
-                        height: childrenRect.height
-
-                        UM.Label
+                    id: materialSection
+                    title: catalog.i18nc("@action:label", "Material settings")
+                    iconSource: UM.Theme.getIcon("Spool")
+                    content: Column
                     {
-                            text: catalog.i18nc("@action:label", "Profile settings")
-                            font: UM.Theme.getFont("default_bold")
-                        }
-
-                        Row
-                        {
-                            width: parent.width
-                            height: childrenRect.height
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", "Name")
-                                width: (parent.width / 3) | 0
-                            }
-                            UM.Label
-                            {
-                                text: manager.qualityName
-                                width: (parent.width / 3) | 0
-                                wrapMode: Text.WordWrap
-                            }
-                        }
-
-                        Row
-                        {
-                            width: parent.width
-                            height: childrenRect.height
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", "Intent")
-                                width: (parent.width / 3) | 0
-                            }
-                            UM.Label
-                            {
-                                text: manager.intentName
-                                width: (parent.width / 3) | 0
-                                wrapMode: Text.WordWrap
-                            }
-                        }
-
-                        Row
-                        {
-                            width: parent.width
-                            height: childrenRect.height
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", "Not in profile")
-                                visible: manager.numUserSettings != 0
-                                width: (parent.width / 3) | 0
-                            }
-                            UM.Label
-                            {
-                                text: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.numUserSettings).arg(manager.numUserSettings)
-                                visible: manager.numUserSettings != 0
-                                width: (parent.width / 3) | 0
-                            }
-                        }
-
-                        Row
-                        {
-                            width: parent.width
-                            height: childrenRect.height
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", "Derivative from")
-                                visible: manager.numSettingsOverridenByQualityChanges != 0
-                                width: (parent.width / 3) | 0
-                            }
-                            UM.Label
-                            {
-                                text: catalog.i18ncp("@action:label", "%1, %2 override", "%1, %2 overrides", manager.numSettingsOverridenByQualityChanges).arg(manager.qualityType).arg(manager.numSettingsOverridenByQualityChanges)
-                                width: (parent.width / 3) | 0
-                                visible: manager.numSettingsOverridenByQualityChanges != 0
-                                wrapMode: Text.WordWrap
-                            }
-                        }
-                    }
-                }
-
-                Item
-                {
-                    width: parent.width
-                    height: childrenRect.height
-
-                    UM.TooltipArea
-                    {
-                        id: materialResolveTooltip
-                        anchors.right: parent.right
-                        anchors.top: parent.top
-                        width: (parent.width / 3) | 0
-                        height: visible ? comboboxHeight : 0
-                        visible: manager.materialConflict
-                        text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
-                        Cura.ComboBox
-                        {
-                            model: resolveStrategiesModel
-                            textRole: "label"
-                            id: materialResolveComboBox
-                            width: parent.width
-                            height: UM.Theme.getSize("button").height
-                            onActivated:
-                            {
-                                manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key)
-                            }
-                        }
-                    }
-
-                    Column
-                    {
-                        width: parent.width
-                        height: childrenRect.height
-                        Row
-                        {
-                            height: childrenRect.height
-                            width: parent.width
-                            spacing: UM.Theme.getSize("narrow_margin").width
-
-                            UM.Label
-                            {
-                                text: catalog.i18nc("@action:label", "Material settings")
-                                font: UM.Theme.getFont("default_bold")
-                                width: (parent.width / 3) | 0
-                            }
-                        }
+                        spacing: UM.Theme.getSize("default_margin").height
+                        leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
 
                         Repeater
                         {
                             model: manager.materialLabels
-                            delegate: Row
+                            delegate: WorkspaceRow
                             {
-                                width: parent.width
-                                height: childrenRect.height
-                                UM.Label
-                                {
-                                    text: catalog.i18nc("@action:label", "Name")
-                                    width: (parent.width / 3) | 0
-                                }
-                                UM.Label
-                                {
-                                    text: modelData
-                                    width: (parent.width / 3) | 0
-                                    wrapMode: Text.WordWrap
-                                }
-                            }
+                                leftLabelText: catalog.i18nc("@action:label", "Name")
+                                rightLabelText: modelData
                             }
                         }
                     }
 
-                Column
-                {
-                    width: parent.width
-                    height: childrenRect.height
+                    comboboxVisible: manager.materialConflict
 
-                    UM.Label
+                    combobox: Cura.ComboBox
                     {
-                        text: catalog.i18nc("@action:label", "Setting visibility")
-                        font: UM.Theme.getFont("default_bold")
+                        id: materialResolveComboBox
+                        model: resolveStrategiesModel
+                        textRole: "label"
+                        visible: manager.materialConflict
+                        contentLeftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
+                        textFont: UM.Theme.getFont("medium")
+
+                        background: Cura.RoundedRectangle
+                        {
+                            border.width: UM.Theme.getSize("default_lining").width
+                            border.color: UM.Theme.getColor("lining")
+                            color: materialResolveComboBox.hovered ? UM.Theme.getColor("expandable_hover") : UM.Theme.getColor("action_button")
+                            cornerSide: Cura.RoundedRectangle.Direction.All
+                            radius: UM.Theme.getSize("default_radius").width
                         }
-                    Row
+
+                        // This is a hack. This will trigger onCurrentIndexChanged and set the index when this component in loaded
+                        currentIndex:
                         {
-                        width: parent.width
-                        height: childrenRect.height
-                        UM.Label
-                        {
-                            text: catalog.i18nc("@action:label", "Mode")
-                            width: (parent.width / 3) | 0
+                            currentIndex = 0
                         }
-                        UM.Label
+
+                        onCurrentIndexChanged:
                         {
-                            text: manager.activeMode
-                            width: (parent.width / 3) | 0
+                            manager.setResolveStrategy("material", resolveStrategiesModel.get(currentIndex).key)
                         }
                     }
-                    Row
+                }
+
+                WorkspaceSection
                 {
-                        width: parent.width
-                        height: childrenRect.height
+                    id: visibilitySection
+                    title: catalog.i18nc("@action:label", "Setting visibility")
+                    iconSource: UM.Theme.getIcon("Eye")
+                    content: Column
+                    {
+                        spacing: UM.Theme.getSize("default_margin").height
+                        leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
+                        bottomPadding: UM.Theme.getSize("narrow_margin").height
+
+                        WorkspaceRow
+                        {
+                            leftLabelText: catalog.i18nc("@action:label", "Mode")
+                            rightLabelText: manager.activeMode
+                        }
+
+                        WorkspaceRow
+                        {
+                            leftLabelText: catalog.i18nc("@action:label", "%1 out of %2" ).arg(manager.numVisibleSettings).arg(manager.totalNumberOfSettings)
+                            rightLabelText: manager.activeMode
                             visible: manager.hasVisibleSettingsField
-                        UM.Label
-                        {
-                            text: catalog.i18nc("@action:label", "Visible settings:")
-                            width: (parent.width / 3) | 0
-                        }
-                        UM.Label
-                        {
-                            text: catalog.i18nc("@action:label", "%1 out of %2" ).arg(manager.numVisibleSettings).arg(manager.totalNumberOfSettings)
-                            width: (parent.width / 3) | 0
                         }
                     }
                 }
 
                 Row
                 {
+                    id: clearBuildPlateWarning
                     width: parent.width
                     height: childrenRect.height
+                    spacing: UM.Theme.getSize("default_margin").width
                     visible: manager.hasObjectsOnPlate
+
                     UM.ColorImage
                     {
                         width: warningLabel.height
@@ -459,14 +332,18 @@ UM.Dialog
         color: warning ? UM.Theme.getColor("warning") : "transparent"
         anchors.bottom: parent.bottom
         width: parent.width
-        height: childrenRect.height + 2 * base.margin
+        height: childrenRect.height + (warning ? 2 * workspaceDialog.margin : workspaceDialog.margin)
 
         Column
         {
             height: childrenRect.height
-            spacing: base.margin
+            spacing: workspaceDialog.margin
+
+            anchors.leftMargin: workspaceDialog.margin
+            anchors.rightMargin: workspaceDialog.margin
+            anchors.bottomMargin: workspaceDialog.margin
+            anchors.topMargin: warning ? workspaceDialog.margin : 0
 
-            anchors.margins: base.margin
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.top: parent.top
@@ -476,7 +353,7 @@ UM.Dialog
                 id: warningRow
                 height: childrenRect.height
                 visible: warning
-                spacing: base.margin
+                spacing: workspaceDialog.margin
                 UM.ColorImage
                 {
                     width: UM.Theme.getSize("extruder_icon").width
@@ -500,7 +377,7 @@ UM.Dialog
         }
     }
 
-    buttonSpacing: UM.Theme.getSize("default_margin").width
+    buttonSpacing: UM.Theme.getSize("wide_margin").width
 
     rightButtons: [
         Cura.TertiaryButton
@@ -532,6 +409,19 @@ UM.Dialog
         }
     ]
 
+    onClosing: manager.notifyClosed()
     onRejected: manager.onCancelButtonClicked()
     onAccepted: manager.onOkButtonClicked()
+    onVisibleChanged:
+    {
+        if (visible)
+        {
+            // Force relead the comboboxes
+            // Since this dialog is only created once the first time you open it, these comboxes need to be reloaded
+            // each time it is shown after the first time so that the indexes will update correctly.
+            materialSection.reloadValues()
+            profileSection.reloadValues()
+            printerSection.reloadValues()
+        }
+    }
 }

plugins/3MFReader/WorkspaceRow.qml

@@ -0,0 +1,34 @@
+// Copyright (c) 2022 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+import QtQuick.Window 2.2
+
+import UM 1.5 as UM
+import Cura 1.1 as Cura
+
+Row
+{
+    property alias leftLabelText: leftLabel.text
+    property alias rightLabelText: rightLabel.text
+
+    width: parent.width
+    height: visible ? childrenRect.height : 0
+
+    UM.Label
+    {
+        id: leftLabel
+        text: catalog.i18nc("@action:label", "Type")
+        width: Math.round(parent.width / 4)
+        wrapMode: Text.WordWrap
+    }
+    UM.Label
+    {
+        id: rightLabel
+        text: manager.machineType
+        width: Math.round(parent.width / 3)
+        wrapMode: Text.WordWrap
+    }
+}

plugins/3MFReader/WorkspaceSection.qml

@@ -0,0 +1,128 @@
+// Copyright (c) 2022 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+
+
+import UM 1.5 as UM
+
+
+Item
+{
+    property alias title: sectionTitle.text
+    property alias iconSource: sectionTitleIcon.source
+    property Component content: Item { visible: false  }
+
+    property alias comboboxTitle: comboboxLabel.text
+    property Component combobox: Item { visible: false }
+    property string comboboxTooltipText: ""
+    property bool comboboxVisible: false
+
+    width: parent.width
+    height: childrenRect.height
+    anchors.leftMargin: UM.Theme.getSize("default_margin").width
+
+    Row
+    {
+        id: sectionTitleRow
+        anchors.top: parent.top
+        bottomPadding: UM.Theme.getSize("default_margin").height
+        spacing: UM.Theme.getSize("default_margin").width
+
+        UM.ColorImage
+        {
+            id: sectionTitleIcon
+            anchors.verticalCenter: parent.verticalCenter
+            source: ""
+            height: UM.Theme.getSize("medium_button_icon").height
+            color: UM.Theme.getColor("text")
+            width: height
+        }
+        UM.Label
+        {
+            id: sectionTitle
+            text: ""
+            anchors.verticalCenter: parent.verticalCenter
+            font: UM.Theme.getFont("default_bold")
+        }
+    }
+
+    Item
+    {
+        id: comboboxTooltip
+        width: Math.round(parent.width / 2.5)
+        height: visible ? UM.Theme.getSize("default_margin").height : 0
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.rightMargin: UM.Theme.getSize("default_margin").width
+        visible: comboboxVisible
+
+        UM.Label
+        {
+            id: comboboxLabel
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            visible: comboboxVisible && text != ""
+            text: ""
+            font: UM.Theme.getFont("default_bold")
+        }
+
+        Loader
+        {
+            id: comboboxLoader
+            width: parent.width
+            height: UM.Theme.getSize("button").height
+            anchors.top: comboboxLabel.bottom
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.left: parent.left
+            sourceComponent: combobox
+        }
+
+        MouseArea
+        {
+            id: helpIconMouseArea
+            anchors.right: parent.right
+            anchors.verticalCenter: comboboxLabel.verticalCenter
+            width: childrenRect.width
+            height: childrenRect.height
+            hoverEnabled: true
+
+            UM.ColorImage
+            {
+                width: UM.Theme.getSize("section_icon").width
+                height: width
+
+                visible: comboboxTooltipText != ""
+                source: UM.Theme.getIcon("Help")
+                color: UM.Theme.getColor("text")
+
+                UM.ToolTip
+                {
+                    text: comboboxTooltipText
+                    visible: helpIconMouseArea.containsMouse
+                    targetPoint: Qt.point(parent.x + Math.round(parent.width / 2), parent.y)
+                    x: 0
+                    y: parent.y + parent.height + UM.Theme.getSize("default_margin").height
+                    width: UM.Theme.getSize("tooltip").width
+                }
+            }
+        }
+    }
+
+
+    Loader
+    {
+        width: parent.width
+        height: content.height
+        anchors.top: sectionTitleRow.bottom
+        sourceComponent: content
+    }
+
+    function reloadValues()
+    {
+        comboboxLoader.sourceComponent = null
+        comboboxLoader.sourceComponent = combobox
+    }
+}

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2021-2022 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import argparse #To run the engine in debug mode if the front-end is in debug mode.
@@ -166,7 +166,7 @@ class CuraEngineBackend(QObject, Backend):
         self._slicing_error_message.addAction(
             action_id = "report_bug",
             name = catalog.i18nc("@message:button", "Report a bug"),
-            description = catalog.i18nc("@message:description", "Report a bug on Ultimaker Cura's issue tracker."),
+            description = catalog.i18nc("@message:description", "Report a bug on UltiMaker Cura's issue tracker."),
             icon = "[no_icon]"
         )
         self._slicing_error_message.actionTriggered.connect(self._reportBackendError)

plugins/Marketplace/CloudSync/CloudPackageChecker.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import json
@@ -142,7 +142,7 @@ class CloudPackageChecker(QObject):
         sync_message = Message(self._i18n_catalog.i18nc(
             "@info:generic",
             "Do you want to sync material and software packages with your account?"),
-            title = self._i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account", ))
+            title = self._i18n_catalog.i18nc("@info:title", "Changes detected from your UltiMaker account", ))
         sync_message.addAction("sync",
                                name = self._i18n_catalog.i18nc("@action:button", "Sync"),
                                icon = "",

plugins/Marketplace/CloudSync/DownloadPresenter.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import tempfile
@@ -92,7 +92,7 @@ class DownloadPresenter:
             lifetime = 0,
             use_inactivity_timer = False,
             progress = 0.0,
-            title = i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account"))
+            title = i18n_catalog.i18nc("@info:title", "Changes detected from your UltiMaker account"))
 
     def _onFinished(self, package_id: str, reply: QNetworkReply) -> None:
         self._progress[package_id]["received"] = self._progress[package_id]["total"]

plugins/Marketplace/PackageModel.py

@@ -92,7 +92,7 @@ class PackageModel(QObject):
             "display_name": display_name,
             "package_version": package_version,
             "package_type": package_type,
-            "description": "The material package associated with the Cura project could not be found on the Ultimaker marketplace. Use the partial material profile definition stored in the Cura project file at your own risk."
+            "description": catalog.i18nc("@label:label Ultimaker Marketplace is a brand name, don't translate", "The material package associated with the Cura project could not be found on the Ultimaker Marketplace. Use the partial material profile definition stored in the Cura project file at your own risk.")
         }
         package_model = cls(package_data)
         package_model.setIsMissingPackageInformation(True)

plugins/Marketplace/resources/qml/ManagedPackages.qml

@@ -1,5 +1,6 @@
-// Copyright (c) 2021 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
+
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
@@ -12,7 +13,7 @@ Packages
 
     bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner");
     bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight")
-    bannerText: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.")
+    bannerText: catalog.i18nc("@text", "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.")
     bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/4411125921426/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-manage"
     onRemoveBanner: function() {
         UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false);

plugins/Marketplace/resources/qml/Materials.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import UM 1.4 as UM
@@ -9,7 +9,7 @@ Packages
 
     bannerVisible:  UM.Preferences.getValue("cura/market_place_show_material_banner")
     bannerIcon: UM.Theme.getIcon("Spool")
-    bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.")
+    bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your UltiMaker 3D printers.")
     bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-materials"
     onRemoveBanner: function() {
         UM.Preferences.setValue("cura/market_place_show_material_banner", false);

plugins/Marketplace/resources/qml/Plugins.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import UM 1.4 as UM
@@ -9,7 +9,7 @@ Packages
 
     bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner")
     bannerIcon: UM.Theme.getIcon("Shop")
-    bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.")
+    bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users.")
     bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-plugins"
     onRemoveBanner: function() {
         UM.Preferences.setValue("cura/market_place_show_plugin_banner", false)

plugins/Marketplace/resources/qml/VerifiedIcon.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.15
@@ -18,9 +18,9 @@ Control
         {
             switch(packageData.packageType)
             {
-                case "plugin": return catalog.i18nc("@info", "Ultimaker Verified Plug-in");
-                case "material": return catalog.i18nc("@info", "Ultimaker Certified Material");
-                default: return catalog.i18nc("@info", "Ultimaker Verified Package");
+                case "plugin": return catalog.i18nc("@info", "UltiMaker Verified Plug-in");
+                case "material": return catalog.i18nc("@info", "UltiMaker Certified Material");
+                default: return catalog.i18nc("@info", "UltiMaker Verified Package");
             }
         }
         visible: parent.hovered

plugins/MonitorStage/MonitorMenu.qml

@@ -19,5 +19,7 @@ Item
         width: UM.Theme.getSize("machine_selector_widget").width
         height: parent.height
         anchors.centerIn: parent
+
+        machineListModel: Cura.MachineListModel {}
     }
 }

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -150,6 +150,7 @@ Item
             width: parent.width / 2 - UM.Theme.getSize("default_margin").width
             height: UM.Theme.getSize("setting_control").height
             textRole: "text"
+            forceHighlight: base.hovered
 
             model: ListModel
             {

plugins/PrepareStage/PrepareMenu.qml

@@ -55,6 +55,50 @@ Item
                 Layout.preferredWidth: parent.machineSelectorWidth
                 Layout.fillWidth: true
                 Layout.fillHeight: true
+
+                machineManager: Cura.MachineManager
+                onSelectPrinter: function(machine)
+                {
+                    toggleContent();
+                    Cura.MachineManager.setActiveMachine(machine.id);
+                }
+
+                machineListModel: Cura.MachineListModel {}
+
+                buttons: [
+                    Cura.SecondaryButton
+                    {
+                        id: addPrinterButton
+                        leftPadding: UM.Theme.getSize("default_margin").width
+                        rightPadding: UM.Theme.getSize("default_margin").width
+                        text: catalog.i18nc("@button", "Add printer")
+                        // The maximum width of the button is half of the total space, minus the padding of the parent, the left
+                        // padding of the component and half the spacing because of the space between buttons.
+                        fixedWidthMode: true
+                        width: Math.round(parent.width / 2 - leftPadding * 1.5)
+                        onClicked:
+                        {
+                            machineSelection.toggleContent()
+                            Cura.Actions.addMachine.trigger()
+                        }
+                    },
+                    Cura.SecondaryButton
+                    {
+                        id: managePrinterButton
+                        leftPadding: UM.Theme.getSize("default_margin").width
+                        rightPadding: UM.Theme.getSize("default_margin").width
+                        text: catalog.i18nc("@button", "Manage printers")
+                        fixedWidthMode: true
+                        // The maximum width of the button is half of the total space, minus the padding of the parent, the right
+                        // padding of the component and half the spacing because of the space between buttons.
+                        width: Math.round(parent.width / 2 - rightPadding * 1.5)
+                        onClicked:
+                        {
+                            machineSelection.toggleContent()
+                            Cura.Actions.configureMachines.trigger()
+                        }
+                    }
+                ]
             }
 
             Cura.ConfigurationMenu

plugins/SliceInfoPlugin/MoreInfoWindow.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -70,7 +70,7 @@ Window
                     left: parent.left
                     right: parent.right
                 }
-                text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:")
+                text: catalog.i18nc("@text:window", "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:")
                 wrapMode: Text.WordWrap
             }
 

plugins/UFPReader/UFPReader.py

@@ -21,7 +21,7 @@ class UFPReader(MeshReader):
         MimeTypeDatabase.addMimeType(
             MimeType(
                 name = "application/x-ufp",
-                comment = "Ultimaker Format Package",
+                comment = "UltiMaker Format Package",
                 suffixes = ["ufp"]
             )
         )

plugins/UFPReader/__init__.py

@@ -1,4 +1,4 @@
-#Copyright (c) 2019 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import sys
@@ -19,7 +19,7 @@ def getMetaData():
             {
                 "mime_type": "application/x-ufp",
                 "extension": "ufp",
-                "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package")
+                "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package")
             }
         ]
     }

plugins/UFPWriter/UFPWriter.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2022 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 import json
+from dataclasses import asdict
 from typing import cast, List, Dict
 
 from Charon.VirtualFile import VirtualFile  # To open UFP files.
@@ -40,7 +41,7 @@ class UFPWriter(MeshWriter):
         MimeTypeDatabase.addMimeType(
             MimeType(
                 name = "application/x-ufp",
-                comment = "Ultimaker Format Package",
+                comment = "UltiMaker Format Package",
                 suffixes = ["ufp"]
             )
         )
@@ -225,8 +226,7 @@ class UFPWriter(MeshWriter):
                 "changes": {},
                 "all_settings": {},
             },
-            "intent": machine_manager.activeIntentCategory,
-            "quality": machine_manager.activeQualityOrQualityChangesName,
+            "quality": asdict(machine_manager.activeQualityDisplayNameMap()),
         }
 
         global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())

plugins/UFPWriter/__init__.py

@@ -1,4 +1,4 @@
-#Copyright (c) 2018 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import sys
@@ -25,7 +25,7 @@ def getMetaData():
                     "mime_type": "application/x-ufp",
                     "mode": MeshWriter.OutputMode.BinaryMode,
                     "extension": "ufp",
-                    "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package")
+                    "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package")
                 }
             ]
         }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.3
@@ -284,7 +284,7 @@ Item
         MonitorInfoBlurb
         {
             id: cameraDisabledInfo
-            text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." +
+            text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." +
                 " Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam.")
             target: cameraButton
         }

plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.15

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 from time import time

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 import os

plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py

@@ -1,5 +1,6 @@
-# Copyright (c) 2022 Ultimaker B.V.
+#  Copyright (c) 2022 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
+
 from UM import i18nCatalog
 from UM.Message import Message
 from cura.CuraApplication import CuraApplication

plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -27,7 +27,7 @@ Cura.MachineAction
             anchors.topMargin: UM.Theme.getSize("default_margin").height
             width: parent.width
             wrapMode: Text.WordWrap
-            text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original")
+            text: catalog.i18nc("@label","Please select any upgrades made to this UltiMaker Original")
             font: UM.Theme.getFont("medium")
         }
 

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -1125,21 +1125,28 @@ class XmlMaterialProfile(InstanceContainer):
         id_list = list(id_list)
         return id_list
 
+    __product_to_id_map: Optional[Dict[str, List[str]]] = None
+
     @classmethod
     def getProductIdMap(cls) -> Dict[str, List[str]]:
         """Gets a mapping from product names in the XML files to their definition IDs.
 
         This loads the mapping from a file.
         """
+        if cls.__product_to_id_map is not None:
+            return cls.__product_to_id_map
 
         plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("XmlMaterialProfile"))
         product_to_id_file = os.path.join(plugin_path, "product_to_id.json")
         with open(product_to_id_file, encoding = "utf-8") as f:
-            product_to_id_map = json.load(f)
-        product_to_id_map = {key: [value] for key, value in product_to_id_map.items()}
+            contents = ""
+            for line in f:
+                contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)])
+            cls.__product_to_id_map = json.loads(contents)
+        cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()}
         #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores.
         #However it is not always loaded with that default; this mapping is also used in serialize() without that default.
-        return product_to_id_map
+        return cls.__product_to_id_map
 
     @staticmethod
     def _parseCompatibleValue(value: str):

plugins/XmlMaterialProfile/product_to_id.json

@@ -1,14 +1,11 @@
 {
-    "Ultimaker 2": "ultimaker2",
-    "Ultimaker 2 Extended": "ultimaker2_extended",
-    "Ultimaker 2 Extended+": "ultimaker2_extended_plus",
-    "Ultimaker 2 Go": "ultimaker2_go",
-    "Ultimaker 2+": "ultimaker2_plus",
-    "Ultimaker 2+ Connect": "ultimaker2_plus_connect",
-    "Ultimaker 3": "ultimaker3",
-    "Ultimaker 3 Extended": "ultimaker3_extended",
-    "Ultimaker S3": "ultimaker_s3",
-    "Ultimaker S5": "ultimaker_s5",
+    "Ultimaker #": "ultimaker#",
+    "Ultimaker # Extended": "ultimaker#_extended",
+    "Ultimaker # Extended+": "ultimaker#_extended_plus",
+    "Ultimaker # Go": "ultimaker#_go",
+    "Ultimaker #+": "ultimaker#_plus",
+    "Ultimaker #+ Connect": "ultimaker#_plus_connect",
+    "Ultimaker S#": "ultimaker_s#",
     "Ultimaker Original": "ultimaker_original",
     "Ultimaker Original+": "ultimaker_original_plus",
     "Ultimaker Original Dual Extrusion": "ultimaker_original_dual",

printer-linter/README.md

@@ -0,0 +1,33 @@
+# Printer Linter
+Printer linter is a python package that does linting on Cura definitions files.
+Running this on your definition files will get them ready for a pull request.
+
+## Running Locally
+From the Cura root folder.
+
+```python3 printer-linter/src/terminal.py "flashforge_dreamer_nx.def.json" "flashforge_base.def.json" --fix  --format```
+
+## Developing
+### Printer Linter Rules
+Inside ```.printer-linter``` you can find a list of rules. These are seperated into roughly three categories. 
+
+1. Checks
+   1. These rules are about checking if a file meets some requirements that can't be fixed by replacing its content. 
+   2. An example of a check is ```diagnostic-mesh-file-extension``` this checks if a mesh file extension is acceptable.
+2. Format
+   1. These rules are purely about how a file is structured, not content.
+   2. An example of a format rule is ```format-definition-bracket-newline``` This rule says that when assigning a dict value the bracket should go on a new line.
+3. Fixes
+   1. These are about the content of the file.
+   2. An example of a fix is ```diagnostic-definition-redundant-override``` This removes settings that have already been defined by a parent definition
+
+### Linters
+Linters find issues within a file. There are separate linters for each type of file. The linter that is used is decided by the create function in factory.py. All linters implement the abstract class Linter.
+
+A Linter class returns an iterator of Diagnostics, each diagnostic is an issue with the file. The diagnostics can also contain suggested fixes.
+
+### Formatters
+Formatters load a file reformat it and write it to disk. There are separate formatters for each file type. All formatters implement the abstract class Formatter.
+
+Formatters should format based on the Format rules in .printer-linter
+

printer-linter/pyproject.toml

@@ -0,0 +1,17 @@
+[project]
+name = "printerlinter"
+description = "Cura UltiMaker printer linting tool"
+version = "0.1.0"
+authors = [
+    { name = "UltiMaker", email = "cura@ultimaker.com" }
+]
+dependencies = [
+    "pyyaml"
+]
+
+[project.scripts]
+printer-linter = "terminal:main"
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

printer-linter/setup.cfg

@@ -0,0 +1,10 @@
+[metadata]
+name = printerlinter
+
+[options]
+package_dir=
+    =src
+packages=find:
+
+[options.packages.find]
+where=src

printer-linter/setup.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+if __name__ == "__main__":
+    setup()

printer-linter/src/printerlinter/__init__.py

@@ -0,0 +1,4 @@
+from .diagnostic import Diagnostic
+from .factory import getLinter
+
+__all__ = ["Diagnostic", "getLinter"]

printer-linter/src/printerlinter/diagnostic.py

@@ -0,0 +1,34 @@
+from pathlib import Path
+from typing import Optional, List, Dict, Any
+
+from .replacement import Replacement
+
+
+class Diagnostic:
+    def __init__(self, file: Path, diagnostic_name: str, message: str, level: str, offset: int, replacements: Optional[List[Replacement]] = None) -> None:
+        """ A diagnosis of an issue in "file" at "offset" in that file. May include suggested replacements.
+
+        @param file: The path to the file this diagnostic is for.
+        @param diagnostic_name: The name of the diagnostic rule that spawned this result. A list can be found in .printer-linter.
+        @param message: A message explaining the issue with this file.
+        @param level: How important this diagnostic is, ranges from Warning -> Error.
+        @param offset: The offset in file where the issue is.
+        @param replacements: A list of Replacement that contain replacement text.
+        """
+        self.file = file
+        self.diagnostic_name = diagnostic_name
+        self.message = message
+        self.offset = offset
+        self.level = level
+        self.replacements = replacements
+
+    def toDict(self) -> Dict[str, Any]:
+        return {"DiagnosticName": self.diagnostic_name,
+                "DiagnosticMessage": {
+                    "Message": self.message,
+                    "FilePath": self.file.as_posix(),
+                    "FileOffset": self.offset,
+                    "Replacements": [] if self.replacements is None else [r.toDict() for r in self.replacements],
+                },
+                "Level": self.level
+                }

printer-linter/src/printerlinter/factory.py

@@ -0,0 +1,26 @@
+from pathlib import Path
+from typing import Optional
+
+from .linters.profile import Profile
+from .linters.defintion import Definition
+from .linters.linter import Linter
+from .linters.meshes import Meshes
+
+
+def getLinter(file: Path, settings: dict) -> Optional[Linter]:
+    """ Returns a Linter depending on the file format """
+    if not file.exists():
+        return None
+
+    if ".inst" in file.suffixes and ".cfg" in file.suffixes:
+        return Profile(file, settings)
+
+    if ".def" in file.suffixes and ".json" in file.suffixes:
+        if file.stem in ("fdmprinter.def", "fdmextruder.def"):
+            return None
+        return Definition(file, settings)
+
+    if file.parent.stem == "meshes":
+        return Meshes(file, settings)
+
+    return None

printer-linter/src/printerlinter/formatters/__init__.py

@@ -0,0 +1,4 @@
+from .def_json_formatter import DefJsonFormatter
+from .inst_cfg_formatter import InstCfgFormatter
+
+__all__ = ["DefJsonFormatter", "InstCfgFormatter"]

printer-linter/src/printerlinter/formatters/def_json_formatter.py

@@ -0,0 +1,84 @@
+import json
+import re
+from collections import OrderedDict
+from pathlib import Path
+from typing import Dict
+
+from .formatter import FileFormatter
+
+
+# Dictionary items with matching keys will be sorted as if they were the value
+# Example: "version" will be sorted as if it was "0"
+TOP_LEVEL_SORT_PRIORITY = {
+    "version":      "0",
+    "name":         "1",
+    "inherits":     "3",
+}
+
+METADATA_SORT_PRIORITY = {
+    "visible":      "0",
+    "author":       "1",
+    "manufacturer": "2",
+    "file_formats": "3",
+    "platform":     "4",
+}
+
+
+class DefJsonFormatter(FileFormatter):
+    def formatFile(self, file: Path):
+        """ Format .def.json files according to the rules in settings.
+
+        You can assume that you will be running regex on standard formatted json files, because we load the json first and then
+        dump it to a string. This means you only have to write regex that works on the output of json.dump()
+        """
+
+        definition = json.loads(file.read_text(), object_pairs_hook=OrderedDict)
+
+        if self._settings["format"].get("format-definition-sort-keys", True):
+            definition = self.order_keys(definition)
+
+        content = json.dumps(definition, indent=self._settings["format"].get("format-definition-indent", 4))
+
+        if self._settings["format"].get("format-definition-bracket-newline", True):
+            newline = re.compile(r"(\B\s+)(\"[\w\"]+)(\:\s\{)")
+            content = newline.sub(r"\1\2:\1{", content)
+
+        if self._settings["format"].get("format-definition-single-value-single-line", True):
+            single_value_dict = re.compile(r"(:)(\s*\n?.*\{\s+)(\".*)(\d*\s*\})(.*\n,?)")
+            content = single_value_dict.sub(r"\1 { \3 }\5", content)
+
+            single_value_list = re.compile(r"(:)(\s*\n?.*\[\s+)(\".*)(\d*\s*\])(.*\n,?)")
+            content = single_value_list.sub(r"\1 [ \3 ]\5", content)
+
+        if self._settings["format"].get("format-definition-paired-coordinate-array", True):
+            paired_coordinates = re.compile(r"(\s*\[)\s*([-\d\.]+),\s*([-\d\.]+)[\s]*(\])")
+            content = paired_coordinates.sub(r"\1\2, \3\4", content)
+
+        file.write_text(content)
+
+    def order_keys(self, json_content: OrderedDict) -> OrderedDict:
+        """ Orders json keys lexicographically """
+        # First order all keys (Recursive) lexicographically
+        json_content_text = json.dumps(json_content, sort_keys=True)
+        json_content = json.loads(json_content_text, object_pairs_hook=OrderedDict)
+
+        # Do a custom ordered sort on the top level items in the json. This is so that keys like "version" appear at the top.
+        json_content = self.custom_sort_keys(json_content, TOP_LEVEL_SORT_PRIORITY)
+
+        # Do a custom ordered sort on collections that are one level deep into the json
+        if "metadata" in json_content.keys():
+            json_content["metadata"] = self.custom_sort_keys(json_content["metadata"], METADATA_SORT_PRIORITY)
+
+        return json_content
+
+
+    def custom_sort_keys(self, ordered_dictionary: OrderedDict, sort_priority: Dict[str, str]) -> OrderedDict:
+        """ Orders keys in dictionary lexicographically, except for keys with matching strings in sort_priority.
+
+        Keys in ordered_dictionary that match keys in sort_priority will sort based on the value in sort_priority.
+
+        @param ordered_dictionary: A dictionary that will have it's top level keys sorted
+        @param sort_priority: A mapping from string keys to alternative strings to be used instead when sorting.
+        @return: A dictionary sorted by it's top level keys
+        """
+        return OrderedDict(sorted(ordered_dictionary.items(), key=lambda x: sort_priority[x[0]] if str(x[0]) in sort_priority.keys() else str(x[0])))

printer-linter/src/printerlinter/formatters/formatter.py

@@ -0,0 +1,16 @@
+from abc import ABC, abstractmethod
+from pathlib import Path
+
+
+class FileFormatter(ABC):
+    def __init__(self, settings: dict) -> None:
+        """ Yields Diagnostics for file, these are issues with the file such as bad text format or too large file size.
+
+        @param file: A file to generate diagnostics for
+        @param settings: A list of settings containing rules for creating diagnostics
+        """
+        self._settings = settings
+
+    @abstractmethod
+    def formatFile(self, file: Path) -> None:
+        pass

printer-linter/src/printerlinter/formatters/inst_cfg_formatter.py

@@ -0,0 +1,21 @@
+import configparser
+import json
+import re
+from collections import OrderedDict
+from pathlib import Path
+
+from .formatter import FileFormatter
+
+class InstCfgFormatter(FileFormatter):
+    def formatFile(self, file: Path):
+        """ Format .inst.cfg files according to the rules in settings """
+        config = configparser.ConfigParser()
+        config.read(file)
+
+        if self._settings["format"].get("format-profile-sort-keys", True):
+            for section in config._sections:
+                config._sections[section] = OrderedDict(sorted(config._sections[section].items(), key=lambda t: t[0]))
+            config._sections = OrderedDict(sorted(config._sections.items(), key=lambda t: t[0]))
+
+        with open(file, "w") as f:
+            config.write(f, space_around_delimiters=self._settings["format"].get("format-profile-space-around-delimiters", True))

printer-linter/src/printerlinter/linters/__init__.py

@@ -0,0 +1,6 @@
+from .profile import Profile
+from .meshes import Meshes
+from .linter import Linter
+from .defintion import Definition
+
+__all__ = ["Profile", "Meshes", "Linter", "Definition"]

printer-linter/src/printerlinter/linters/defintion.py

@@ -0,0 +1,122 @@
+import json
+import re
+from pathlib import Path
+from typing import Iterator
+
+from ..diagnostic import Diagnostic
+from .linter import Linter
+from ..replacement import Replacement
+
+
+class Definition(Linter):
+    """ Finds issues in definition files, such as overriding default parameters """
+    def __init__(self, file: Path, settings: dict) -> None:
+        super().__init__(file, settings)
+        self._definitions = {}
+        self._loadDefinitionFiles(file)
+        self._content = self._file.read_text()
+        self._loadBasePrinterSettings()
+
+    @property
+    def base_def(self):
+        if "fdmextruder" in self._definitions:
+            return "fdmextruder"
+        return "fdmprinter"
+
+    def check(self) -> Iterator[Diagnostic]:
+        if self._settings["checks"].get("diagnostic-definition-redundant-override", False):
+            for check in self.checkRedefineOverride():
+                yield check
+
+        # Add other which will yield Diagnostic's
+        # TODO: A check to determine if the user set value is with the min and max value defined in the parent and doesn't trigger a warning
+        # TODO: A check if the key exist in the first place
+        # TODO: Check if the model platform exist
+
+        yield
+
+    def checkRedefineOverride(self) -> Iterator[Diagnostic]:
+        """ Checks if definition file overrides its parents settings with the same value. """
+        definition_name = list(self._definitions.keys())[0]
+        definition = self._definitions[definition_name]
+        if "overrides" in definition and definition_name not in ("fdmprinter", "fdmextruder"):
+            for key, value_dict in definition["overrides"].items():
+                is_redefined, value, parent = self._isDefinedInParent(key, value_dict, definition['inherits'])
+                if is_redefined:
+                    redefined = re.compile(r'.*(\"' + key + r'\"[\s\S]*?\{)[\s\S]*?(\}[,\"]?)')
+                    found = redefined.search(self._content)
+                    yield Diagnostic(
+                        file = self._file,
+                        diagnostic_name = "diagnostic-definition-redundant-override",
+                        message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}",
+                        level = "Warning",
+                        offset = found.span(0)[0],
+                        replacements = [Replacement(
+                            file = self._file,
+                            offset = found.span(1)[0],
+                            length = found.span(2)[1] - found.span(1)[0],
+                            replacement_text = "")]
+                    )
+
+    def _loadDefinitionFiles(self, definition_file) -> None:
+        """ Loads definition file contents into self._definitions. Also load parent definition if it exists. """
+        definition_name = Path(definition_file.stem).stem
+
+        if not definition_file.exists() or definition_name in self._definitions:
+            return
+
+        # Load definition file into dictionary
+        self._definitions[definition_name] = json.loads(definition_file.read_text())
+
+        # Load parent definition if it exists
+        if "inherits" in self._definitions[definition_name]:
+            if self._definitions[definition_name]['inherits'] in ("fdmextruder", "fdmprinter"):
+                parent_file = definition_file.parent.parent.joinpath("definitions", f"{self._definitions[definition_name]['inherits']}.def.json")
+            else:
+                parent_file = definition_file.parent.joinpath(f"{self._definitions[definition_name]['inherits']}.def.json")
+            self._loadDefinitionFiles(parent_file)
+
+    def _isDefinedInParent(self, key, value_dict, inherits_from):
+        if "overrides" not in self._definitions[inherits_from]:
+            return self._isDefinedInParent(key, value_dict, self._definitions[inherits_from]["inherits"])
+
+        parent = self._definitions[inherits_from]["overrides"]
+        if key not in self._definitions[self.base_def]["overrides"]:
+            is_number = False
+        else:
+            is_number = self._definitions[self.base_def]["overrides"][key]["type"] in ("float", "int")
+        for value in value_dict.values():
+            if key in parent:
+                check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None]
+                for check_value in check_values:
+                    if is_number:
+                        try:
+                            v = str(float(value))
+                        except:
+                            v = value
+                        try:
+                            cv = str(float(check_value))
+                        except:
+                            cv = check_value
+                    else:
+                        v = value
+                        cv = check_value
+                    if v == cv:
+                        return True, value, parent
+
+                if "inherits" in parent:
+                    return self._isDefinedInParent(key, value_dict, parent["inherits"])
+        return False, None, None
+
+    def _loadBasePrinterSettings(self):
+        """ TODO @Jelle please explain why this """
+        settings = {}
+        for k, v in self._definitions[self.base_def]["settings"].items():
+            self._getSetting(k, v, settings)
+        self._definitions[self.base_def] = {"overrides": settings}
+
+    def _getSetting(self, name, setting, settings) -> None:
+        if "children" in setting:
+            for childname, child in setting["children"].items():
+                self._getSetting(childname, child, settings)
+        settings |= {name: setting}

printer-linter/src/printerlinter/linters/linter.py

@@ -0,0 +1,20 @@
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Iterator
+
+from ..diagnostic import Diagnostic
+
+
+class Linter(ABC):
+    def __init__(self, file: Path, settings: dict) -> None:
+        """ Yields Diagnostics for file, these are issues with the file such as bad text format or too large file size.
+
+        @param file: A file to generate diagnostics for
+        @param settings: A list of settings containing rules for creating diagnostics
+        """
+        self._settings = settings
+        self._file = file
+
+    @abstractmethod
+    def check(self) -> Iterator[Diagnostic]:
+        pass

printer-linter/src/printerlinter/linters/meshes.py

@@ -0,0 +1,47 @@
+from pathlib import Path
+from typing import Iterator
+
+from ..diagnostic import Diagnostic
+from .linter import Linter
+
+
+class Meshes(Linter):
+    def __init__(self, file: Path, settings: dict) -> None:
+        """ Finds issues in model files, such as incorrect file format or too large size """
+        super().__init__(file, settings)
+        self._max_file_size = self._settings.get("diagnostic-mesh-file-size", 1e6)
+
+    def check(self) -> Iterator[Diagnostic]:
+        if self._settings["checks"].get("diagnostic-mesh-file-extension", False):
+            for check in self.checkFileFormat():
+                yield check
+
+        if self._settings["checks"].get("diagnostic-mesh-file-size", False):
+            for check in self.checkFileSize():
+                yield check
+
+        yield
+
+    def checkFileFormat(self) -> Iterator[Diagnostic]:
+        """ Check if mesh is in supported format """
+        if self._file.suffix.lower() not in (".3mf", ".obj", ".stl"):
+            yield Diagnostic(
+                file = self._file,
+                diagnostic_name = "diagnostic-mesh-file-extension",
+                message = f"Extension {self._file.suffix} not supported, use 3mf, obj or stl",
+                level = "Error",
+                offset = 1
+            )
+        yield
+
+    def checkFileSize(self) -> Iterator[Diagnostic]:
+        """ Check if file is within size limits for Cura """
+        if self._file.stat().st_size > self._max_file_size:
+            yield Diagnostic(
+                file = self._file,
+                diagnostic_name = "diagnostic-mesh-file-size",
+                message = f"Mesh file with a size {self._file.stat().st_size} is bigger then allowed maximum of {self._max_file_size}",
+                level = "Error",
+                offset = 1
+            )
+        yield

printer-linter/src/printerlinter/linters/profile.py

@@ -0,0 +1,9 @@
+from typing import Iterator
+
+from ..diagnostic import Diagnostic
+from .linter import Linter
+
+
+class Profile(Linter):
+    def check(self) -> Iterator[Diagnostic]:
+        yield

printer-linter/src/printerlinter/replacement.py

@@ -0,0 +1,21 @@
+from pathlib import Path
+
+class Replacement:
+    def __init__(self, file: Path, offset: int, length: int, replacement_text: str):
+        """ Replacement text for file between offset and offset+length.
+
+        @param file: File to replace text in
+        @param offset: Offset in file to start text replace
+        @param length: Length of text that will be replaced. offset -> offset+length is the section of text to replace.
+        @param replacement_text: Text to insert of offset in file.
+        """
+        self.file = file
+        self.offset = offset
+        self.length = length
+        self.replacement_text = replacement_text
+
+    def toDict(self) -> dict:
+        return {"FilePath": self.file.as_posix(),
+                "Offset": self.offset,
+                "Length": self.length,
+                "ReplacementText": self.replacement_text}

printer-linter/src/terminal.py

@@ -0,0 +1,117 @@
+from argparse import ArgumentParser
+from os import getcwd
+from pathlib import Path
+from typing import List
+
+import yaml
+
+from printerlinter import factory
+from printerlinter.diagnostic import Diagnostic
+from printerlinter.formatters.def_json_formatter import DefJsonFormatter
+from printerlinter.formatters.inst_cfg_formatter import InstCfgFormatter
+
+
+def main() -> None:
+    parser = ArgumentParser(
+        description="UltiMaker Cura printer linting, static analysis and formatting of Cura printer definitions and other resources")
+    parser.add_argument("--setting", required=False, type=Path, help="Path to the `.printer-linter` setting file")
+    parser.add_argument("--report", required=False, type=Path, help="Path where the diagnostic report should be stored")
+    parser.add_argument("--format", action="store_true", help="Format the files")
+    parser.add_argument("--diagnose", action="store_true", help="Diagnose the files")
+    parser.add_argument("--fix", action="store_true", help="Attempt to apply the suggested fixes on the files")
+    parser.add_argument("Files", metavar="F", type=Path, nargs="+", help="Files or directories to format")
+
+    args = parser.parse_args()
+    files = extractFilePaths(args.Files)
+    setting_path = args.setting
+    to_format = args.format
+    to_fix = args.fix
+    to_diagnose = args.diagnose
+    report = args.report
+
+    if not setting_path:
+        setting_path = Path(getcwd(), ".printer-linter")
+
+    if not setting_path.exists():
+        print(f"Can't find the settings: {setting_path}")
+        return
+
+    with open(setting_path, "r") as f:
+        settings = yaml.load(f, yaml.FullLoader)
+
+    full_body_check = {"Diagnostics": []}
+
+    if to_fix or to_diagnose:
+        for file in files:
+            diagnostics = diagnoseIssuesWithFile(file, settings)
+            full_body_check["Diagnostics"].extend([d.toDict() for d in diagnostics])
+
+            results = yaml.dump(full_body_check, default_flow_style=False, indent=4, width=240)
+
+            if report:
+                report.write_text(results)
+            else:
+                print(results)
+
+    if to_fix:
+        for file in files:
+            if f"{file.as_posix()}" in full_body_check:
+                applyFixesToFile(file, settings, full_body_check)
+
+    if to_format:
+        for file in files:
+            applyFormattingToFile(file, settings)
+
+
+def diagnoseIssuesWithFile(file: Path, settings: dict) -> List[Diagnostic]:
+    """ For file, runs all diagnostic checks in settings and returns a list of diagnostics """
+    linter = factory.getLinter(file, settings)
+
+    if not linter:
+        return []
+
+    return list(filter(lambda d: d is not None, linter.check()))
+
+
+def applyFixesToFile(file, settings, full_body_check) -> None:
+    if not file.exists():
+        return
+    ext = ".".join(file.name.split(".")[-2:])
+
+    if ext == "def.json":
+        issues = full_body_check[f"{file.as_posix()}"]
+        for issue in issues:
+            if issue["diagnostic"] == "diagnostic-definition-redundant-override" and settings["fixes"].get(
+                    "diagnostic-definition-redundant-override", True):
+                pass
+
+
+def applyFormattingToFile(file: Path, settings) -> None:
+    if not file.exists():
+        return
+
+    ext = ".".join(file.name.split(".")[-2:])
+
+    if ext == "def.json":
+        formatter = DefJsonFormatter(settings)
+        formatter.formatFile(file)
+
+    if ext == "inst.cfg":
+        formatter = InstCfgFormatter(settings)
+        formatter.formatFile(file)
+
+
+def extractFilePaths(paths: List[Path]) -> List[Path]:
+    """ Takes list of files and directories, returns the files as well as all files within directories as a List """
+    file_paths = []
+    for path in paths:
+        if path.is_dir():
+            file_paths.extend(path.rglob("**/*"))
+        else:
+            file_paths.append(path)
+
+    return file_paths
+
+
+if __name__ == "__main__":
+    main()

requirements-dev.txt

@@ -1,5 +1,6 @@
 pytest
 pyinstaller
 pyinstaller-hooks-contrib
+pyyaml
 sip==6.5.1
 jinja2

resources/bundled_packages/cura.json

@@ -10,7 +10,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -27,7 +27,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -61,7 +61,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -78,7 +78,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -95,7 +95,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -112,7 +112,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -129,7 +129,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -146,7 +146,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -163,7 +163,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -180,7 +180,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -197,7 +197,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -214,7 +214,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -248,7 +248,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -265,7 +265,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -282,7 +282,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -316,7 +316,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -333,7 +333,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -350,7 +350,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -367,7 +367,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -384,7 +384,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -401,7 +401,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -418,7 +418,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -435,7 +435,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -452,7 +452,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -469,7 +469,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -486,7 +486,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -503,7 +503,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -520,7 +520,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -537,7 +537,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -554,7 +554,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -571,7 +571,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -588,7 +588,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -605,7 +605,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -622,7 +622,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -639,7 +639,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -656,7 +656,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -673,7 +673,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -690,7 +690,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -707,7 +707,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -724,7 +724,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -741,7 +741,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -758,7 +758,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -775,7 +775,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -792,7 +792,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -809,7 +809,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -826,7 +826,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -843,7 +843,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -860,7 +860,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -877,7 +877,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -894,7 +894,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -911,7 +911,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -928,7 +928,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -945,7 +945,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -962,7 +962,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -979,7 +979,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -997,7 +997,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -1031,7 +1031,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -1048,7 +1048,7 @@
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "plugins@ultimaker.com",
                 "website": "https://ultimaker.com"
             }
@@ -1609,7 +1609,7 @@
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1628,7 +1628,7 @@
             "website": "https://ultimaker.com/products/materials/breakaway",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1647,7 +1647,7 @@
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1666,7 +1666,7 @@
             "website": "https://ultimaker.com/products/materials/cpe",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1685,7 +1685,7 @@
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1704,7 +1704,7 @@
             "website": "https://ultimaker.com/products/materials/pc",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1723,7 +1723,7 @@
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1742,7 +1742,7 @@
             "website": "https://ultimaker.com/products/materials/pp",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1761,7 +1761,7 @@
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1780,7 +1780,7 @@
             "website": "https://ultimaker.com/products/materials/tpu-95a",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",
@@ -1799,7 +1799,7 @@
             "website": "https://ultimaker.com/products/materials/tough-pla",
             "author": {
                 "author_id": "UltimakerPackages",
-                "display_name": "Ultimaker B.V.",
+                "display_name": "UltiMaker",
                 "email": "materials@ultimaker.com",
                 "website": "https://ultimaker.com",
                 "description": "Professional 3D printing made accessible.",

resources/definitions/anycubic_i3_mega_s.def.json

@@ -29,7 +29,7 @@
         "machine_center_is_zero": { "default_value": false },
         "gantry_height": { "value": "0" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X50 F500                                ; wipe away from the filament line\nG1 X100 F9000                              ; Quickly wipe away from the filament line" },
+        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM900 K0                                    ; disable lin. adv. if not set in GCODE\nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X50 F500                                ; wipe away from the filament line\nG1 X100 F9000                              ; Quickly wipe away from the filament line" },
         "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
 
         "machine_max_acceleration_x": { "value": 3000 },

resources/definitions/dxu_umo.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "UMO+ DXU",
+    "inherits": "dxu",
+    "overrides": {
+        "machine_disallowed_areas": {
+            "default_value": [
+                [[100,  -102.5], [ 110,  -102.5], [ 110,  -62.5], [100,  -62.5]]
+            ]
+        },
+        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 205 },
+        "machine_height": { "default_value": 200 },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 1.95
+        },
+        "machine_nozzle_cool_down_speed": { 
+            "default_value": 0.8
+        },
+        "machine_start_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here:  https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200 ;change Y20 to Y0 ansonl\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y0 F7200\\nG92 E-12.0 ; increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nG1 Y50 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\""
+        },
+        "machine_end_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\""
+        }
+    }
+}

resources/definitions/dxu_umo_dual.def.json

@@ -0,0 +1,33 @@
+{
+    "version": 2,
+    "name": "UMO+ DXU Dual",
+    "inherits": "dxu_dual",
+    "overrides": {
+        "machine_disallowed_areas": {
+            "default_value": [
+                [[100,  -102.5], [ 110,  -102.5], [ 110,  -62.5], [100,  -62.5]]
+            ]
+        },
+        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 205 },
+        "machine_height": { "default_value": 200 },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 1.95
+        },
+        "machine_nozzle_cool_down_speed": { 
+            "default_value": 0.8
+        },        
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_start_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here:  https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n; --- Multi-Extruder Settings\\n; speed_z_hop_0 = {speed_z_hop, 0}\\n; speed_z_hop_1 = {speed_z_hop, 1}\\n; retraction_amount_0 = {retraction_amount, 0}\\n; retraction_amount_1 = {retraction_amount, 1}\\n; retraction_hop_0 = {retraction_hop, 0}\\n; retraction_hop_1 = {retraction_hop, 1}\\n; retraction_hop_enabled_0 = {retraction_hop_enabled, 0}\\n; retraction_hop_enabled_1 = {retraction_hop_enabled, 1}\\n; retraction_prime_speed_0 = {retraction_prime_speed, 0}\\n; retraction_prime_speed_1 = {retraction_prime_speed, 1}\\n; retraction_retract_speed_0 = {retraction_retract_speed, 0}\\n; retraction_retract_speed_1 = {retraction_retract_speed, 1}\\n; retraction_speed_0 = {retraction_speed, 0}\\n; retraction_speed_1 = {retraction_speed, 1}\\n; retraction_enable_0 = {retraction_enable, 0}\\n; retraction_enable_1 = {retraction_enable, 1}\\n; speed_travel_0 = {speed_travel, 0}\\n; speed_travel_1 = {speed_travel, 1}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0 ;prime distance ;increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0\\nG1 E0 F200 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\nG1 Y100 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\""
+        },
+        "machine_end_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\""
+        }
+    }
+}

resources/definitions/fdmprinter.def.json

@@ -4682,6 +4682,54 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
+                "support_interface_wall_count":
+                {
+                    "label": "Support Interface Wall Line Count",
+                    "description": "The number of walls with which to surround support interface. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used.",
+                    "default_value": 0,
+                    "minimum_value": "0",
+                    "minimum_value_warning": "0",
+                    "maximum_value_warning": "0 if (support_skip_some_zags and support_interface_pattern == 'zigzag') else 3",
+                    "maximum_value": "999999",
+                    "type": "int",
+                    "value": "1 if (support_interface_pattern == 'zigzag') else 0",
+                    "enabled": "support_interface_enable or support_meshes_present",
+                    "limit_to_extruder": "support_interface_extruder_nr",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "children": {
+                        "support_roof_wall_count": {
+                            "label": "Support Roof Wall Line Count",
+                            "description": "The number of walls with which to surround support interface roof. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used.",
+                            "default_value": 0,
+                            "minimum_value": "0",
+                            "minimum_value_warning": "0",
+                            "maximum_value_warning": "0 if (support_skip_some_zags and support_interface_pattern == 'zigzag') else 3",
+                            "maximum_value": "999999",
+                            "type": "int",
+                            "value": "support_interface_wall_count",
+                            "enabled": "support_interface_enable or support_meshes_present",
+                            "limit_to_extruder": "support_interface_extruder_nr",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true
+                        },
+                        "support_bottom_wall_count": {
+                            "label": "Support Bottom Wall Line Count",
+                            "description": "The number of walls with which to surround support interface floor. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used.",
+                            "default_value": 0,
+                            "minimum_value": "0",
+                            "minimum_value_warning": "0",
+                            "maximum_value_warning": "0 if (support_skip_some_zags and support_interface_pattern == 'zigzag') else 3",
+                            "maximum_value": "999999",
+                            "type": "int",
+                            "value": "support_interface_wall_count",
+                            "enabled": "support_interface_enable or support_meshes_present",
+                            "limit_to_extruder": "support_interface_extruder_nr",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true
+                        }
+                    }
+                },
                 "zig_zaggify_support":
                 {
                     "label": "Connect Support Lines",
@@ -6346,6 +6394,81 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
+                "interlocking_enable":
+                {
+                    "label": "Generate Interlocking Structure",
+                    "description": "Whether to generate a structure at the interface between two models of a different material in order to improve the adhesion. The structure consists of cells of horizontal beams with alternating direction which connect to each other over the Z direction in order to interlock with the beams of the other material.",
+                    "type": "bool",
+                    "enabled": "extruders_enabled_count > 1",
+                    "default_value": false,
+                    "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false
+                },
+                "interlocking_beam_width":
+                {
+                    "label": "Interlocking Beam Width",
+                    "description": "The width of the beams of this material in the interlocking structure.",
+                    "type": "float",
+                    "unit": "mm",
+                    "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')",
+                    "default_value": 0.8,
+                    "value": "2 * wall_line_width_0",
+                    "minimum_value": "0.001",
+                    "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
+                    "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6",
+                    "settable_per_mesh": true,
+                    "settable_per_extruder": true
+                },
+                "interlocking_orientation":
+                {
+                    "label": "Interlocking Structure Orientation",
+                    "description": "The direction of the beams of the interlocking structure in the XY plane as a rotation about the Z axis.",
+                    "unit": "°",
+                    "type": "float",
+                    "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')",
+                    "default_value": 22.5,
+                    "resolve": "min(extruderValues('interlocking_orientation'))",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false
+                },
+                "interlocking_beam_layer_count":
+                {
+                    "label": "Interlocking Beam Layer Count",
+                    "description": "The height of the beams of the interlocking structure as measured in number of layers. Less layers is stronger, but more prone to manufacturing defects.",
+                    "type": "int",
+                    "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')",
+                    "default_value": 2,
+                    "minimum_value": "1",
+                    "resolve": "max(extruderValues('interlocking_beam_layer_count'))",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false
+                },
+                "interlocking_depth":
+                {
+                    "label": "Interlocking Depth",
+                    "description": "The number of cells along the depth of the interface between two models where an interlocking structure is to be generated. Less cells is better, but too little cells can cause the not to be connected properly, which reduces the adhesion performance of the interlocking structure.",
+                    "type": "int",
+                    "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')",
+                    "default_value": 2,
+                    "minimum_value": "1",
+                    "resolve": "max(extruderValues('interlocking_depth'))",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false
+                },
+                "interlocking_boundary_avoidance":
+                {
+                    "label": "Interlocking Boundary Avoidance",
+                    "description": "The distance close to the boundary of the print where not to generate an interlocking structure as measued in number of cells times 2. If set to a value lower than the Inerlocking Depth then the interlocking structure can become visible on the outside of the print near the interfaces where two models meet.",
+                    "type": "int",
+                    "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')",
+                    "default_value": 3,
+                    "minimum_value": "0",
+                    "resolve": "max(extruderValues('interlocking_boundary_avoidance'))",
+                    "minimum_value_warning": "resolveOrValue('interlocking_depth')",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false
+                },
                 "switch_extruder_retraction_amount":
                 {
                     "label": "Nozzle Switch Retraction Distance",

resources/definitions/ultimaker.def.json

@@ -70,7 +70,7 @@
         },
         "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" },
         "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" },
-        "minimum_support_area": { "value": "(2 + support_offset)**2" },
+        "minimum_support_area": { "value": "4.0" },
         "raft_base_speed": { "value": "raft_speed" },
         "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" },
         "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" },
@@ -86,6 +86,7 @@
             "enabled": false
         },
         "retraction_combing": { "value": "'no_outer_surfaces'" },
+        "retraction_combing_max_distance": { "value": 15 },
         "retraction_count_max": { "value": 25 },
         "retraction_extrusion_window": { "value": 1 },
         "roofing_layer_count": { "value": "1" },
@@ -93,7 +94,7 @@
         "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },
         "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" },
         "skin_material_flow": { "value": "0.95 * material_flow" },
-        "skin_material_flow_layer_0": { "value": "0.80 * material_flow_layer_0" },
+        "skin_material_flow_layer_0": { "value": "0.85 * material_flow_layer_0" },
         "skin_monotonic" : { "value": "roofing_layer_count == 0" },
         "speed_equalize_flow_width_factor": { "value": "110.0" },
         "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" },

resources/i18n/cs_CZ/cura.po

@@ -1,5 +1,5 @@
 # Cura
-# Copyright (C) 2022 Ultimaker B.V.
+# Copyright (C) 2022 UltiMaker.
 # This file is distributed under the same license as the Cura package.
 # Ultimaker <plugins@ultimaker.com>, 2022.
 #
@@ -424,8 +424,8 @@ msgstr "Nepodařilo se mi spustit nový proces přihlášení. Zkontrolujte, zda
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Nelze se dostat na server účtu Ultimaker."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "Nelze se dostat na server účtu UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -701,8 +701,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Poslat záznam o pádu do Ultimakeru"
+msgid "Send crash report to UltiMaker"
+msgstr "Poslat záznam o pádu do UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -902,7 +902,7 @@ msgstr "Chyba sítě"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
+msgid "New printer detected from your UltiMaker account"
 msgid_plural "New printers detected from your Ultimaker account"
 msgstr[0] "Z vašeho Ultimaker účtu byla detekována nová tiskárna"
 msgstr[1] "Z vašeho Ultimaker účtu byly detekovány nové tiskárny"
@@ -1056,8 +1056,8 @@ msgstr "Odstranit tiskárnu"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
-msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware."
-msgstr "Pokoušíte se připojit k tiskárně, na které není spuštěna aplikace Ultimaker Connect. Aktualizujte tiskárnu na nejnovější firmware."
+msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware."
+msgstr "Pokoušíte se připojit k tiskárně, na které není spuštěna aplikace UltiMaker Connect. Aktualizujte tiskárnu na nejnovější firmware."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1289,8 +1289,8 @@ msgstr "Nemohu zapsat do UFP souboru:"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Balíček ve formátu Ultimaker"
+msgid "UltiMaker Format Package"
+msgstr "Balíček ve formátu UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1411,8 +1411,8 @@ msgstr "Chcete synchronizovat materiálové a softwarové balíčky s vaším ú
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Zjištěny změny z vašeho účtu Ultimaker"
+msgid "Changes detected from your UltiMaker account"
+msgstr "Zjištěny změny z vašeho účtu UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1572,8 +1572,8 @@ msgstr "Nahlásit chybu"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Nahlásit chybu v Ultimaker Cura issue trackeru."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "Nahlásit chybu v UltiMaker Cura issue trackeru."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1702,8 +1702,8 @@ msgstr "Soubor projektu <filename>{0}</filename> je poškozený: <message>{1}</m
 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723
 #, python-brace-format
 msgctxt "@info:error Don't translate the XML tag <filename>!"
-msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of Ultimaker Cura."
-msgstr "Soubor projektu <filename>{0}</filename> je vytvořený profily, které jsou této verzi Ultimaker Cura neznámé."
+msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of UltiMaker Cura."
+msgstr "Soubor projektu <filename>{0}</filename> je vytvořený profily, které jsou této verzi UltiMaker Cura neznámé."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -2348,8 +2348,8 @@ msgstr "Aktualizujte firmware tiskárny a spravujte frontu vzdáleně."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
-msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "Vstup z webové kamery nemůže být pro cloudové tiskárny zobrazen v Ultimaker Cura. Klikněte na \"Spravovat tiskárnu\", abyste navštívili Ultimaker Digital Factory a zobrazili tuto webkameru."
+msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
+msgstr "Vstup z webové kamery nemůže být pro cloudové tiskárny zobrazen v UltiMaker Cura. Klikněte na \"Spravovat tiskárnu\", abyste navštívili Ultimaker Digital Factory a zobrazili tuto webkameru."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
 msgctxt "@label:status"
@@ -2714,8 +2714,8 @@ msgstr "Další informace o anonymním shromažďování údajů"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
-msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu. Níže uvádíme příklad všech sdílených dat:"
+msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
+msgstr "UltiMaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu. Níže uvádíme příklad všech sdílených dat:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2739,8 +2739,8 @@ msgstr "Uložit projekt Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Vyberte prosím všechny upgrady provedené v tomto originálu Ultimaker"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Vyberte prosím všechny upgrady provedené v tomto originálu UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2835,8 +2835,8 @@ msgstr "Nainstalovat moduly"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
-msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users."
-msgstr "Urychlete váš postup práce a přizpůsobte si zážitek s Ultimaker Cura pomocí modulů, kterými přispěla naše úžasná komunita uživatelů."
+msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users."
+msgstr "Urychlete váš postup práce a přizpůsobte si zážitek s UltiMaker Cura pomocí modulů, kterými přispěla naše úžasná komunita uživatelů."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -2894,8 +2894,8 @@ msgstr "Instalovat materiály"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
-msgid "Select and install material profiles optimised for your Ultimaker 3D printers."
-msgstr "Vyberte a nainstalujte materiálové profily optimalizované pro vaše 3D tiskárny Ultimaker."
+msgid "Select and install material profiles optimised for your UltiMaker 3D printers."
+msgstr "Vyberte a nainstalujte materiálové profily optimalizované pro vaše 3D tiskárny UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -3016,18 +3016,18 @@ msgstr "Načíst více"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Modul ověřený společností Ultimaker"
+msgid "UltiMaker Verified Plug-in"
+msgstr "Modul ověřený společností UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Materiál certifikovaný společností Ultimaker"
+msgid "UltiMaker Certified Material"
+msgstr "Materiál certifikovaný společností UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Balíček ověřený společností Ultimaker"
+msgid "UltiMaker Verified Package"
+msgstr "Balíček ověřený společností UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -3036,8 +3036,8 @@ msgstr "Spravovat balíčky"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
-msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
-msgstr "Zde můžete spravovat své Ultimaker Cura moduly a materiály. Udržujte své moduly aktuální a pravidelně zálohujte své nastavení."
+msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
+msgstr "Zde můžete spravovat své UltiMaker Cura moduly a materiály. Udržujte své moduly aktuální a pravidelně zálohujte své nastavení."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
 msgctxt "@title"
@@ -4308,8 +4308,8 @@ msgstr "Soukromí"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
-msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
-msgstr "Měla by být anonymní data o vašem tisku zaslána společnosti Ultimaker? Upozorňujeme, že nejsou odesílány ani ukládány žádné modely, adresy IP ani jiné osobní údaje."
+msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
+msgstr "Měla by být anonymní data o vašem tisku zaslána společnosti UltiMaker? Upozorňujeme, že nejsou odesílány ani ukládány žádné modely, adresy IP ani jiné osobní údaje."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4623,8 +4623,8 @@ msgstr "Podpora při problémech"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Přihlásit se do platformy Ultimaker"
+msgid "Sign in to the UltiMaker platform"
+msgstr "Přihlásit se do platformy UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4638,8 +4638,8 @@ msgstr "Zálohovat a synchronizovat nastavení materiálů a moduly"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Sdílejte nápady a získejte pomoc od více než 48 0000 uživatelů v Ultimaker komunitě"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "Sdílejte nápady a získejte pomoc od více než 48 0000 uživatelů v UltiMaker komunitě"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4648,18 +4648,18 @@ msgstr "Přeskočit"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "Vytvořit účet Ultimaker zdarma"
+msgid "Create a free UltiMaker Account"
+msgstr "Vytvořit účet UltiMaker zdarma"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Pomožte nám zlepšovat Ultimaker Cura"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "Pomožte nám zlepšovat UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
-msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:"
-msgstr "Ultimaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu, včetně:"
+msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:"
+msgstr "UltiMaker Cura shromažďuje anonymní data za účelem zlepšení kvality tisku a uživatelského komfortu, včetně:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4683,8 +4683,8 @@ msgstr "Nastavení tisku"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
-msgid "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Data shromážděná společností Ultimaker Cura nebudou obsahovat žádné osobní údaje."
+msgid "Data collected by UltiMaker Cura will not contain any personal information."
+msgstr "Data shromážděná společností UltiMaker Cura nebudou obsahovat žádné osobní údaje."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4754,8 +4754,8 @@ msgstr "Nelze se připojit k zařízení."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "Nemůžete se připojit k Vaší tiskárně Ultimaker?"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "Nemůžete se připojit k Vaší tiskárně UltiMaker?"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4774,13 +4774,13 @@ msgstr "Připojit"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Vítejte v Ultimaker Cura"
+msgid "Welcome to UltiMaker Cura"
+msgstr "Vítejte v UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
-msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments."
-msgstr "Při nastavování postupujte podle těchto pokynů Ultimaker Cura. Bude to trvat jen několik okamžiků."
+msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments."
+msgstr "Při nastavování postupujte podle těchto pokynů UltiMaker Cura. Bude to trvat jen několik okamžiků."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5465,7 +5465,7 @@ msgstr "Komplexní řešení pro 3D tisk z taveného filamentu."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
 msgstr ""
 "Cura vyvíjí Ultimaker B.V. ve spolupráci s komunitou.\n"
@@ -5674,23 +5674,23 @@ msgstr "Sledujte tiskové úlohy a znovu tiskněte z historie."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "Rozšiřte Ultimaker Cura pomocí modulů a materiálových profilů."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "Rozšiřte UltiMaker Cura pomocí modulů a materiálových profilů."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Staňte se expertem na 3D tisk díky Ultimaker e-learningu."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "Staňte se expertem na 3D tisk díky UltiMaker e-learningu."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Ultimaker podpora"
+msgid "UltiMaker support"
+msgstr "UltiMaker podpora"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Zjistěte, jak začít s Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "Zjistěte, jak začít s UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5699,8 +5699,8 @@ msgstr "Položit otázku"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Poraďte se s Ultimaker komunitou."
+msgid "Consult the UltiMaker Community."
+msgstr "Poraďte se s UltiMaker komunitou."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5714,8 +5714,8 @@ msgstr "Dejte vývojářům vědět, že je něco špatně."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Navštivte web Ultimaker."
+msgid "Visit the UltiMaker website."
+msgstr "Navštivte web UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -6011,8 +6011,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "Vytvořit účet Ultimaker zdarma"
+msgid "Create a free UltiMaker account"
+msgstr "Vytvořit účet UltiMaker zdarma"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -6026,8 +6026,8 @@ msgstr "Poslední aktualizace: %1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Ultimaker Account"
+msgid "UltiMaker Account"
+msgstr "UltiMaker Account"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6241,13 +6241,13 @@ msgstr "Post Processing"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Spravuje síťová připojení k síťovým tiskárnám Ultimaker."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "Spravuje síťová připojení k síťovým tiskárnám UltiMaker."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Síťové připojení Ultimaker"
+msgid "UltiMaker Network Connection"
+msgstr "Síťové připojení UltiMaker"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6281,8 +6281,8 @@ msgstr "Informace o slicování"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Poskytuje podporu pro psaní balíčků formátu Ultimaker."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "Poskytuje podporu pro psaní balíčků formátu UltiMaker."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6297,7 +6297,7 @@ msgstr "Připojuje k Digitální knihovně. Umožňuje Cuře otevírat a ukláda
 #: /DigitalLibrary/plugin.json
 msgctxt "name"
 msgid "Ultimaker Digital Library"
-msgstr "Digitální knihovna Ultimaker"
+msgstr "Digitální knihovna UltiMaker"
 
 #: /GCodeProfileReader/plugin.json
 msgctxt "description"
@@ -6331,13 +6331,13 @@ msgstr "Čtečka trimesh"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "description"
-msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
-msgstr "Poskytuje akce strojů pro stroje Ultimaker (jako je průvodce vyrovnáváním postele, výběr upgradů atd.)."
+msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
+msgstr "Poskytuje akce strojů pro stroje UltiMaker (jako je průvodce vyrovnáváním postele, výběr upgradů atd.)."
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Akce zařízení Ultimaker"
+msgid "UltiMaker machine actions"
+msgstr "Akce zařízení UltiMaker"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6351,8 +6351,8 @@ msgstr "Čtečka kompresovaného G kódu"
 
 #: /Marketplace/plugin.json
 msgctxt "description"
-msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website."
-msgstr "Spravuje rozšíření aplikace a umožňuje prohlížení rozšíření z webu Ultimaker."
+msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website."
+msgstr "Spravuje rozšíření aplikace a umožňuje prohlížení rozšíření z webu UltiMaker."
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6701,8 +6701,8 @@ msgstr "Zapisovač G kódu"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Poskytuje podporu pro čtení balíčků formátu Ultimaker."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "Poskytuje podporu pro čtení balíčků formátu UltiMaker."
 
 #: /UFPReader/plugin.json
 msgctxt "name"
@@ -7018,8 +7018,8 @@ msgstr "Fáze přípravy"
 #~ msgstr "Email"
 
 #~ msgctxt "@description"
-#~ msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
-#~ msgstr "Přihlaste se, abyste získali ověřené pluginy a materiály pro Ultimaker Cura Enterprise"
+#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise"
+#~ msgstr "Přihlaste se, abyste získali ověřené pluginy a materiály pro UltiMaker Cura Enterprise"
 
 #~ msgctxt "@label"
 #~ msgid "Version"
@@ -7176,16 +7176,16 @@ msgstr "Fáze přípravy"
 #~ msgstr "Poskytuje zobrazení simulace."
 
 #~ msgctxt "@info:status"
-#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account."
-#~ msgstr "Odesílejte a sledujte tiskové úlohy odkudkoli pomocí účtu Ultimaker."
+#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account."
+#~ msgstr "Odesílejte a sledujte tiskové úlohy odkudkoli pomocí účtu UltiMaker."
 
 #~ msgctxt "@info:status Ultimaker Cloud should not be translated."
 #~ msgid "Connect to Ultimaker Digital Factory"
 #~ msgstr "Připojit se k Ultimaker Digital Factory"
 
 #~ msgctxt "@info"
-#~ msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura."
-#~ msgstr "Vstup z webových kamer pro cloudové tiskárny nemůže být v Ultimaker Cura zobrazen."
+#~ msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura."
+#~ msgstr "Vstup z webových kamer pro cloudové tiskárny nemůže být v UltiMaker Cura zobrazen."
 
 #~ msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!"
 #~ msgid "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, it is recommended to update the firmware on your printer to version {latest_version}."
@@ -7255,8 +7255,8 @@ msgstr "Fáze přípravy"
 #~ msgstr "Dokončit"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker Account"
-#~ msgstr "Účet Ultimaker"
+#~ msgid "UltiMaker Account"
+#~ msgstr "Účet UltiMaker"
 
 #~ msgctxt "@text"
 #~ msgid "Your key to connected 3D printing"
@@ -7271,8 +7271,8 @@ msgstr "Fáze přípravy"
 #~ msgstr "- Zůstaňte flexibilní díky synchronizaci nastavení a přístupu k ní kdekoli"
 
 #~ msgctxt "@text"
-#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers"
-#~ msgstr "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách Ultimaker"
+#~ msgid "- Increase efficiency with a remote workflow on UltiMaker printers"
+#~ msgstr "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách UltiMaker"
 
 #~ msgctxt "@text"
 #~ msgid ""
@@ -7283,8 +7283,8 @@ msgstr "Fáze přípravy"
 #~ "Ultimaker Cura. Bude to trvat jen několik okamžiků."
 
 #~ msgctxt "@label"
-#~ msgid "What's new in Ultimaker Cura"
-#~ msgstr "Co je nového v Ultimaker Cura"
+#~ msgid "What's new in UltiMaker Cura"
+#~ msgstr "Co je nového v UltiMaker Cura"
 
 #~ msgctxt "@label ({} is object name)"
 #~ msgid "Are you sure you wish to remove {}? This cannot be undone!"
@@ -7316,11 +7316,11 @@ msgstr "Fáze přípravy"
 
 #~ msgctxt "info:status"
 #~ msgid "<ul>{}</ul>To establish a connection, please visit the <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>."
-#~ msgstr "<ul>{}</ul> Chcete-li navázat spojení, navštivte <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>."
+#~ msgstr "<ul>{}</ul> Chcete-li navázat spojení, navštivte <a href='https://mycloud.UltiMaker.com/'>Ultimaker Digital Factory</a>."
 
 #~ msgctxt "@label ({} is printer name)"
 #~ msgid "{} will be removed until the next account sync. <br> To remove {} permanently, visit <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>. <br><br>Are you sure you want to remove {} temporarily?"
-#~ msgstr "{} bude odebrána až do další synchronizace účtu. <br> Chcete-li {} trvale odebrat, navštivte <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>. <br><br>Opravdu chcete dočasně odebrat {}?"
+#~ msgstr "{} bude odebrána až do další synchronizace účtu. <br> Chcete-li {} trvale odebrat, navštivte <a href='https://mycloud.UltiMaker.com/'>Ultimaker Digital Factory</a>. <br><br>Opravdu chcete dočasně odebrat {}?"
 
 #~ msgctxt "@label"
 #~ msgid ""
@@ -7396,8 +7396,8 @@ msgstr "Fáze přípravy"
 #~ msgstr "Připojeno přes Cloud"
 
 #~ msgctxt "@info:status Ultimaker Cloud should not be translated."
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Připojit k Ultimaker Cloudu"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Připojit k UltiMaker Cloudu"
 
 #~ msgctxt "@label"
 #~ msgid "You need to login first before you can rate"
@@ -7424,16 +7424,16 @@ msgstr "Fáze přípravy"
 #~ msgstr "Autor"
 
 #~ msgctxt "@description"
-#~ msgid "Get plugins and materials verified by Ultimaker"
-#~ msgstr "Získejte pluginy a materiály ověřené společností Ultimaker"
+#~ msgid "Get plugins and materials verified by UltiMaker"
+#~ msgstr "Získejte pluginy a materiály ověřené společností UltiMaker"
 
 #~ msgctxt "@label The argument is a username."
 #~ msgid "Hi %1"
 #~ msgstr "Zdravím, %1"
 
 #~ msgctxt "@button"
-#~ msgid "Ultimaker account"
-#~ msgstr "Ultimaker účet"
+#~ msgid "UltiMaker account"
+#~ msgstr "UltiMaker účet"
 
 #~ msgctxt "@button"
 #~ msgid "Sign out"
@@ -7512,20 +7512,20 @@ msgstr "Fáze přípravy"
 #~ msgstr "Jazyk:"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker Cloud"
-#~ msgstr "Ultimaker Cloud"
+#~ msgid "UltiMaker Cloud"
+#~ msgstr "UltiMaker Cloud"
 
 #~ msgctxt "@text"
 #~ msgid "The next generation 3D printing workflow"
 #~ msgstr "Pracovní postup 3D tisku nové generace"
 
 #~ msgctxt "@text"
-#~ msgid "- Send print jobs to Ultimaker printers outside your local network"
-#~ msgstr "- Odeslat tiskové úlohy do tiskáren Ultimaker mimo vaši místní síť"
+#~ msgid "- Send print jobs to UltiMaker printers outside your local network"
+#~ msgstr "- Odeslat tiskové úlohy do tiskáren UltiMaker mimo vaši místní síť"
 
 #~ msgctxt "@text"
-#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere"
-#~ msgstr "- Uložte svá nastavení Ultimaker Cura do cloudu pro použití kdekoli"
+#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere"
+#~ msgstr "- Uložte svá nastavení UltiMaker Cura do cloudu pro použití kdekoli"
 
 #~ msgctxt "@text"
 #~ msgid "- Get exclusive access to print profiles from leading brands"

resources/i18n/cura.pot

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

resources/i18n/de_DE/cura.po

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

resources/i18n/es_ES/cura.po

@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Cura
+# Copyright (C) 2022 UltiMaker.
+# This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 #, fuzzy
 msgid ""
@@ -443,8 +443,8 @@ msgstr "No se puede iniciar un nuevo proceso de inicio de sesión. Compruebe si
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "No se puede acceder al servidor de cuentas de Ultimaker."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "No se puede acceder al servidor de cuentas de UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -722,7 +722,7 @@ msgstr "Cura no puede iniciarse"
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113
 msgctxt "@label crash message"
 msgid ""
-"<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right."
+"<p><b>Oops, UltiMaker Cura has encountered something that doesn't seem right."
 "</p></b>\n"
 "                    <p>We encountered an unrecoverable error during start "
 "up. It was possibly caused by some incorrect configuration files. We suggest "
@@ -732,15 +732,15 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</"
 "p>\n"
 "                "
-msgstr "<p><b>¡Vaya! Ultimaker Cura ha encontrado un error.</p></b>\n                    <p>Hemos detectado un error irreversible durante el inicio, posiblemente"
+msgstr "<p><b>¡Vaya! UltiMaker Cura ha encontrado un error.</p></b>\n                    <p>Hemos detectado un error irreversible durante el inicio, posiblemente"
 " como consecuencia de varios archivos de configuración erróneos. Le recomendamos que realice una copia de seguridad y que restablezca los ajustes.</p>\n"
 "                    <p>Las copias de seguridad se encuentran en la carpeta de configuración.</p>\n                    <p>Envíenos el informe de errores"
 " para que podamos solucionar el problema.</p>\n                "
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Enviar informe de errores a Ultimaker"
+msgid "Send crash report to UltiMaker"
+msgstr "Enviar informe de errores a UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -940,10 +940,10 @@ msgstr "Error de red"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
-msgid_plural "New printers detected from your Ultimaker account"
-msgstr[0] "Se ha detectado una nueva impresora en su cuenta de Ultimaker"
-msgstr[1] "Se han detectado nuevas impresoras en su cuenta de Ultimaker"
+msgid "New printer detected from your UltiMaker account"
+msgid_plural "New printers detected from your UltiMaker account"
+msgstr[0] "Se ha detectado una nueva impresora en su cuenta de UltiMaker"
+msgstr[1] "Se han detectado nuevas impresoras en su cuenta de UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29
 #, python-brace-format
@@ -1096,9 +1096,9 @@ msgstr "Eliminar impresoras"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
 msgid ""
-"You are attempting to connect to a printer that is not running Ultimaker "
+"You are attempting to connect to a printer that is not running UltiMaker "
 "Connect. Please update the printer to the latest firmware."
-msgstr "Está intentando conectarse a una impresora que no está ejecutando Ultimaker Connect. Actualice la impresora al firmware más reciente."
+msgstr "Está intentando conectarse a una impresora que no está ejecutando UltiMaker Connect. Actualice la impresora al firmware más reciente."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1326,8 +1326,8 @@ msgstr "No se puede escribir en el archivo UFP:"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Paquete de formato Ultimaker"
+msgid "UltiMaker Format Package"
+msgstr "Paquete de formato UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1451,8 +1451,8 @@ msgstr "¿Desea sincronizar el material y los paquetes de software con su cuenta
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Se han detectado cambios desde su cuenta de Ultimaker"
+msgid "Changes detected from your UltiMaker account"
+msgstr "Se han detectado cambios desde su cuenta de UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1614,8 +1614,8 @@ msgstr "Informar del error"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Informar de un error en el rastreador de problemas de Ultimaker Cura."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "Informar de un error en el rastreador de problemas de UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1763,8 +1763,8 @@ msgstr "El archivo de proyecto <filename>{0}</filename> está dañado: <message>
 msgctxt "@info:error Don't translate the XML tag <filename>!"
 msgid ""
 "Project file <filename>{0}</filename> is made using profiles that are "
-"unknown to this version of Ultimaker Cura."
-msgstr "El archivo de proyecto <filename>{0}</filename> se ha creado con perfiles desconocidos para esta versión de Ultimaker Cura."
+"unknown to this version of UltiMaker Cura."
+msgstr "El archivo de proyecto <filename>{0}</filename> se ha creado con perfiles desconocidos para esta versión de UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -2437,9 +2437,9 @@ msgstr "Actualice el firmware de la impresora para gestionar la cola de forma re
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
 msgid ""
-"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click "
+"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click "
 "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "Las transmisiones de la cámara web para impresoras en la nube no se pueden ver en Ultimaker Cura. Haga clic en \"Administrar impresora\" para ir a Ultimaker"
+msgstr "Las transmisiones de la cámara web para impresoras en la nube no se pueden ver en UltiMaker Cura. Haga clic en \"Administrar impresora\" para ir a UltiMaker"
 " Digital Factory y ver esta cámara web."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
@@ -2820,9 +2820,9 @@ msgstr "Más información sobre la recopilación de datos anónimos"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
 msgid ""
-"Ultimaker Cura collects anonymous data in order to improve the print quality "
+"UltiMaker Cura collects anonymous data in order to improve the print quality "
 "and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario. A continuación, hay un ejemplo de todos los datos"
+msgstr "UltiMaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario. A continuación, hay un ejemplo de todos los datos"
 " que se comparten:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
@@ -2847,8 +2847,8 @@ msgstr "Guardar el proyecto de Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Seleccione cualquier actualización de Ultimaker Original"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Seleccione cualquier actualización de UltiMaker Original"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2952,9 +2952,9 @@ msgstr "Instalar complementos"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
 msgid ""
-"Streamline your workflow and customize your Ultimaker Cura experience with "
+"Streamline your workflow and customize your UltiMaker Cura experience with "
 "plugins contributed by our amazing community of users."
-msgstr "Optimice su flujo de trabajo y personalice su experiencia de Ultimaker Cura con complementos proporcionados por nuestra increíble comunidad de usuarios."
+msgstr "Optimice su flujo de trabajo y personalice su experiencia de UltiMaker Cura con complementos proporcionados por nuestra increíble comunidad de usuarios."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -3015,9 +3015,9 @@ msgstr "Instalar materiales"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
 msgid ""
-"Select and install material profiles optimised for your Ultimaker 3D "
+"Select and install material profiles optimised for your UltiMaker 3D "
 "printers."
-msgstr "Seleccione e instale perfiles de material optimizados para sus impresoras 3D Ultimaker."
+msgstr "Seleccione e instale perfiles de material optimizados para sus impresoras 3D UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -3138,18 +3138,18 @@ msgstr "Cargar más"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Complemento verificado por Ultimaker"
+msgid "UltiMaker Verified Plug-in"
+msgstr "Complemento verificado por UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Material certificado por Ultimaker"
+msgid "UltiMaker Certified Material"
+msgstr "Material certificado por UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Paquete verificado por Ultimaker"
+msgid "UltiMaker Verified Package"
+msgstr "Paquete verificado por UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -3159,9 +3159,9 @@ msgstr "Gestionar paquetes"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
 msgid ""
-"Manage your Ultimaker Cura plugins and material profiles here. Make sure to "
+"Manage your UltiMaker Cura plugins and material profiles here. Make sure to "
 "keep your plugins up to date and backup your setup regularly."
-msgstr "Gestionar los complementos y los perfiles de materiales de Ultimaker Cura aquí. Asegúrese de mantener los complementos actualizados y hacer una copia de"
+msgstr "Gestionar los complementos y los perfiles de materiales de UltiMaker Cura aquí. Asegúrese de mantener los complementos actualizados y hacer una copia de"
 " seguridad de su configuración regularmente."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
@@ -4485,10 +4485,10 @@ msgstr "Privacidad"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
 msgid ""
-"Should anonymous data about your print be sent to Ultimaker? Note, no "
+"Should anonymous data about your print be sent to UltiMaker? Note, no "
 "models, IP addresses or other personally identifiable information is sent or "
 "stored."
-msgstr "¿Deben enviarse datos anónimos sobre la impresión a Ultimaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información"
+msgstr "¿Deben enviarse datos anónimos sobre la impresión a UltiMaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información"
 " de identificación personal."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
@@ -4807,8 +4807,8 @@ msgstr "Solución de problemas"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Inicie sesión en la plataforma Ultimaker"
+msgid "Sign in to the UltiMaker platform"
+msgstr "Inicie sesión en la plataforma UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4822,8 +4822,8 @@ msgstr "Realice copias de seguridad y sincronice los ajustes y complementos de s
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Comparta ideas y obtenga ayuda de más de 48 000 usuarios de la comunidad Ultimaker"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "Comparta ideas y obtenga ayuda de más de 48 000 usuarios de la comunidad UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4832,20 +4832,20 @@ msgstr "Omitir"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "Cree una cuenta gratuita de Ultimaker"
+msgid "Create a free UltiMaker Account"
+msgstr "Cree una cuenta gratuita de UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Ayúdenos a mejorar Ultimaker Cura"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "Ayúdenos a mejorar UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
 msgid ""
 "Ultimaker Cura collects anonymous data to improve print quality and user "
 "experience, including:"
-msgstr "Ultimaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario, entre otros:"
+msgstr "UltiMaker Cura recopila datos anónimos para mejorar la calidad de impresión y la experiencia de usuario, entre otros:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4871,7 +4871,7 @@ msgstr "Ajustes de impresión"
 msgctxt "@text"
 msgid ""
 "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Los datos recopilados por Ultimaker Cura no contendrán información personal."
+msgstr "Los datos recopilados por UltiMaker Cura no contendrán información personal."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4941,8 +4941,8 @@ msgstr "No se ha podido conectar al dispositivo."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "¿No puede conectarse a la impresora Ultimaker?"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "¿No puede conectarse a la impresora UltiMaker?"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4963,15 +4963,15 @@ msgstr "Conectar"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Le damos la bienvenida a Ultimaker Cura"
+msgid "Welcome to UltiMaker Cura"
+msgstr "Le damos la bienvenida a UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
 msgid ""
 "Please follow these steps to set up Ultimaker Cura. This will only take a "
 "few moments."
-msgstr "Siga estos pasos para configurar\nUltimaker Cura. Solo le llevará unos minutos."
+msgstr "Siga estos pasos para configurar\nUltiMaker Cura. Solo le llevará unos minutos."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5669,9 +5669,9 @@ msgstr "Solución completa para la impresión 3D de filamento fundido."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
-msgstr "Ultimaker B.V. ha desarrollado Cura en cooperación con la comunidad.\nCura se enorgullece de utilizar los siguientes proyectos de código abierto:"
+msgstr "UltiMaker B.V. ha desarrollado Cura en cooperación con la comunidad.\nCura se enorgullece de utilizar los siguientes proyectos de código abierto:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138
 msgctxt "@label Description for application component"
@@ -5876,23 +5876,23 @@ msgstr "Supervise los trabajos de impresión y vuelva a imprimir desde su histor
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "Amplíe Ultimaker Cura con complementos y perfiles de materiales."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "Amplíe UltiMaker Cura con complementos y perfiles de materiales."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Conviértase en un experto en impresión 3D con el aprendizaje electrónico de Ultimaker."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "Conviértase en un experto en impresión 3D con el aprendizaje electrónico de UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Soporte técnico de Ultimaker"
+msgid "UltiMaker support"
+msgstr "Soporte técnico de UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Aprenda cómo empezar a utilizar Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "Aprenda cómo empezar a utilizar UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5901,8 +5901,8 @@ msgstr "Haga una pregunta"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Consulte en la Comunidad Ultimaker."
+msgid "Consult the UltiMaker Community."
+msgstr "Consulte en la Comunidad UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5916,8 +5916,8 @@ msgstr "Informe a los desarrolladores de que algo no funciona bien."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Visite el sitio web de Ultimaker."
+msgid "Visit the UltiMaker website."
+msgstr "Visite el sitio web de UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -6236,8 +6236,8 @@ msgstr "- Añada perfiles de materiales y complementos del Marketplace \n- Reali
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "Cree una cuenta gratuita de Ultimaker"
+msgid "Create a free UltiMaker account"
+msgstr "Cree una cuenta gratuita de UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -6251,8 +6251,8 @@ msgstr "Última actualización: %1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Cuenta de Ultimaker"
+msgid "UltiMaker Account"
+msgstr "Cuenta de UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6476,13 +6476,13 @@ msgstr "Posprocesamiento"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Gestiona las conexiones de red de las impresoras Ultimaker conectadas."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "Gestiona las conexiones de red de las impresoras UltiMaker conectadas."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Conexión en red de Ultimaker"
+msgid "UltiMaker Network Connection"
+msgstr "Conexión en red de UltiMaker"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6516,8 +6516,8 @@ msgstr "Info de la segmentación"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Permite la escritura de paquetes de formato Ultimaker."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "Permite la escritura de paquetes de formato UltiMaker."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6571,13 +6571,13 @@ msgctxt "description"
 msgid ""
 "Provides machine actions for Ultimaker machines (such as bed leveling "
 "wizard, selecting upgrades, etc.)."
-msgstr "Proporciona las acciones de la máquina de las máquinas Ultimaker (como un asistente para la nivelación de la plataforma, la selección de actualizaciones,"
+msgstr "Proporciona las acciones de la máquina de las máquinas UltiMaker (como un asistente para la nivelación de la plataforma, la selección de actualizaciones,"
 " etc.)."
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Acciones de la máquina Ultimaker"
+msgid "UltiMaker machine actions"
+msgstr "Acciones de la máquina UltiMaker"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6594,7 +6594,7 @@ msgctxt "description"
 msgid ""
 "Manages extensions to the application and allows browsing extensions from "
 "the Ultimaker website."
-msgstr "Gestiona las extensiones de la aplicación y permite navegar por las extensiones desde el sitio web de Ultimaker."
+msgstr "Gestiona las extensiones de la aplicación y permite navegar por las extensiones desde el sitio web de UltiMaker."
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6946,8 +6946,8 @@ msgstr "Escritor de GCode"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Proporciona soporte para la lectura de paquetes de formato Ultimaker."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "Proporciona soporte para la lectura de paquetes de formato UltiMaker."
 
 #: /UFPReader/plugin.json
 msgctxt "name"

resources/i18n/fi_FI/cura.po

@@ -1,6 +1,7 @@
 # Cura
-# Copyright (C) 2022 Ultimaker B.V.
+# Copyright (C) 2022 UltiMaker.
 # This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 msgid ""
 msgstr ""
@@ -423,7 +424,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
+msgid "Unable to reach the UltiMaker account server."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
@@ -695,7 +696,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
+msgid "Send crash report to UltiMaker"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
@@ -893,7 +894,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
+msgid "New printer detected from your UltiMaker account"
 msgid_plural "New printers detected from your Ultimaker account"
 msgstr[0] ""
 msgstr[1] ""
@@ -1041,7 +1042,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
-msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware."
+msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
@@ -1265,7 +1266,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
+msgid "UltiMaker Format Package"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
@@ -1387,7 +1388,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
+msgid "Changes detected from your UltiMaker account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
@@ -1548,7 +1549,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
@@ -1674,7 +1675,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723
 #, python-brace-format
 msgctxt "@info:error Don't translate the XML tag <filename>!"
-msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of Ultimaker Cura."
+msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of UltiMaker Cura."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
@@ -2314,7 +2315,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
-msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
+msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
@@ -2680,7 +2681,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
-msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
+msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
@@ -2705,8 +2706,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Valitse tähän Ultimaker Original -laitteeseen tehdyt päivitykset"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Valitse tähän UltiMaker Original -laitteeseen tehdyt päivitykset"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2801,7 +2802,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
-msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users."
+msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
@@ -2860,7 +2861,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
-msgid "Select and install material profiles optimised for your Ultimaker 3D printers."
+msgid "Select and install material profiles optimised for your UltiMaker 3D printers."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
@@ -2982,17 +2983,17 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
+msgid "UltiMaker Verified Plug-in"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
+msgid "UltiMaker Certified Material"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
+msgid "UltiMaker Verified Package"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
@@ -3002,7 +3003,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
-msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
+msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
@@ -4267,8 +4268,8 @@ msgstr "Tietosuoja"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
-msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
-msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää Ultimakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta."
+msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
+msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää UltiMakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4581,7 +4582,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
+msgid "Sign in to the UltiMaker platform"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
@@ -4596,7 +4597,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
@@ -4606,17 +4607,17 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
+msgid "Create a free UltiMaker Account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
+msgid "Help us to improve UltiMaker Cura"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
-msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:"
+msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
@@ -4641,7 +4642,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
-msgid "Data collected by Ultimaker Cura will not contain any personal information."
+msgid "Data collected by UltiMaker Cura will not contain any personal information."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
@@ -4712,7 +4713,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
+msgid "Can't connect to your UltiMaker printer?"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
@@ -4732,12 +4733,12 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
+msgid "Welcome to UltiMaker Cura"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
-msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments."
+msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
@@ -5420,7 +5421,7 @@ msgstr "Kokonaisvaltainen sulatettavan tulostuslangan 3D-tulostusratkaisu."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
 msgstr ""
 "Cura-ohjelman on kehittänyt Ultimaker B.V. yhteistyössä käyttäjäyhteisön kanssa.\n"
@@ -5629,22 +5630,22 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
+msgid "UltiMaker support"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
@@ -5654,7 +5655,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
+msgid "Consult the UltiMaker Community."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
@@ -5669,7 +5670,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
+msgid "Visit the UltiMaker website."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
@@ -5963,7 +5964,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
+msgid "Create a free UltiMaker account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
@@ -5978,7 +5979,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
+msgid "UltiMaker Account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
@@ -6193,12 +6194,12 @@ msgstr "Jälkikäsittely"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
+msgid "Manages network connections to UltiMaker networked printers."
 msgstr ""
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
+msgid "UltiMaker Network Connection"
 msgstr ""
 
 #: /3MFWriter/plugin.json
@@ -6233,7 +6234,7 @@ msgstr "Viipalointitiedot"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
+msgid "Provides support for writing UltiMaker Format Packages."
 msgstr ""
 
 #: /UFPWriter/plugin.json
@@ -6283,13 +6284,13 @@ msgstr ""
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "description"
-msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
+msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
 msgstr ""
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Ultimaker-laitteen toiminnot"
+msgid "UltiMaker machine actions"
+msgstr "UltiMaker-laitteen toiminnot"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6303,7 +6304,7 @@ msgstr ""
 
 #: /Marketplace/plugin.json
 msgctxt "description"
-msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website."
+msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website."
 msgstr ""
 
 #: /Marketplace/plugin.json
@@ -6653,7 +6654,7 @@ msgstr ""
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
+msgid "Provides support for reading UltiMaker Format Packages."
 msgstr ""
 
 #: /UFPReader/plugin.json
@@ -6928,8 +6929,8 @@ msgstr ""
 #~ msgstr "Päivitä nykyinen"
 
 #~ msgctxt "@label"
-#~ msgid "Please select any upgrades made to this Ultimaker 2."
-#~ msgstr "Valitse tähän Ultimaker 2 -laitteeseen tehdyt päivitykset."
+#~ msgid "Please select any upgrades made to this UltiMaker 2."
+#~ msgstr "Valitse tähän UltiMaker 2 -laitteeseen tehdyt päivitykset."
 
 #~ msgctxt "@label"
 #~ msgid "Olsson Block"
@@ -7321,16 +7322,16 @@ msgstr ""
 #~ msgstr "Alustan tarttuvuus"
 
 #~ msgctxt "@label"
-#~ msgid "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>"
-#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen?<br>Lue <a href='%1'>Ultimakerin vianmääritysoppaat</a>"
+#~ msgid "Need help improving your prints?<br>Read the <a href='%1'>UltiMaker Troubleshooting Guides</a>"
+#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen?<br>Lue <a href='%1'>UltiMakerin vianmääritysoppaat</a>"
 
 #~ msgctxt "@title:window"
 #~ msgid "Engine Log"
 #~ msgstr "Moottorin loki"
 
 #~ msgctxt "@tooltip"
-#~ msgid "Click to check the material compatibility on Ultimaker.com."
-#~ msgstr "Napsauta ja tarkista materiaalin yhteensopivuus sivustolla Ultimaker.com."
+#~ msgid "Click to check the material compatibility on UltiMaker.com."
+#~ msgstr "Napsauta ja tarkista materiaalin yhteensopivuus sivustolla UltiMaker.com."
 
 #~ msgctxt "description"
 #~ msgid "Shows changes since latest checked version."
@@ -7389,16 +7390,16 @@ msgstr ""
 #~ msgstr "Avaa Doodle3D Connect -verkkoliittymä"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers."
-#~ msgstr "Tätä tulostinta ei ole määritetty Ultimaker 3 -tulostinryhmän isännäksi."
+#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers."
+#~ msgstr "Tätä tulostinta ei ole määritetty UltiMaker 3 -tulostinryhmän isännäksi."
 
 #~ msgctxt "@label"
-#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers."
-#~ msgstr "Tämä tulostin on {count} tulostimen Ultimaker 3 -ryhmän isäntä."
+#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers."
+#~ msgstr "Tämä tulostin on {count} tulostimen UltiMaker 3 -ryhmän isäntä."
 
 #~ msgctxt "@label: arg 1 is group name"
-#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers"
-#~ msgstr "%1 ei ole määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi"
+#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers"
+#~ msgstr "%1 ei ole määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi"
 
 #~ msgctxt "@action:button"
 #~ msgid "View print jobs"
@@ -7508,12 +7509,12 @@ msgstr ""
 #~ msgstr "Lisäosien selain"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker 3"
-#~ msgstr "Ultimaker 3"
+#~ msgid "UltiMaker 3"
+#~ msgstr "UltiMaker 3"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker 3 Extended"
-#~ msgstr "Ultimaker 3 Extended"
+#~ msgid "UltiMaker 3 Extended"
+#~ msgstr "UltiMaker 3 Extended"
 
 #~ msgctxt "@action:menu"
 #~ msgid "Browse plugins..."
@@ -7532,8 +7533,8 @@ msgstr ""
 #~ msgstr "Toiminnon avulla voidaan vaihtaa laitteen asetuksia (esim. tulostustilavuus, suuttimen koko yms.)"
 
 #~ msgctxt "description"
-#~ msgid "Manages network connections to Ultimaker 3 printers"
-#~ msgstr "Ultimaker 3 -tulostimien verkkoyhteyksien hallinta"
+#~ msgid "Manages network connections to UltiMaker 3 printers"
+#~ msgstr "UltiMaker 3 -tulostimien verkkoyhteyksien hallinta"
 
 #~ msgctxt "name"
 #~ msgid "SolidWorks Integration"
@@ -7556,8 +7557,8 @@ msgstr ""
 #~ msgstr "Lisäosien selain"
 
 #~ msgctxt "description"
-#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)"
-#~ msgstr "Ultimaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)"
+#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)"
+#~ msgstr "UltiMaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)"
 
 #~ msgctxt "@item:inlistbox"
 #~ msgid "GCode File"
@@ -7659,12 +7660,12 @@ msgstr ""
 #~ msgid "Resuming print..."
 #~ msgstr "Tulostusta jatketaan..."
 
-#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers."
-#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi."
+#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers."
+#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi."
 
 #~ msgctxt "Count is number of printers."
-#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers."
-#~ msgstr "Tämä tulostin on {count} tulostimen yhdistetyn Ultimaker 3 -ryhmän isäntä."
+#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers."
+#~ msgstr "Tämä tulostin on {count} tulostimen yhdistetyn UltiMaker 3 -ryhmän isäntä."
 
 #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate."
 #~ msgstr "{printer_name} on tulostanut työn '{job_name}'. Nouda työ ja vahvista alustan tyhjennys."
@@ -7673,8 +7674,8 @@ msgstr ""
 #~ msgstr "{printer_name} on varattu työn {job_name} tulostamiseen. Muuta tulostimen määritys vastaamaan työtä, jotta tulostus alkaa."
 
 #~ msgctxt "@info:status"
-#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers."
-#~ msgstr "Uuden tulostustyön lähetys ei onnistu: tätä 3D-tulostinta ei ole (vielä) määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi."
+#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers."
+#~ msgstr "Uuden tulostustyön lähetys ei onnistu: tätä 3D-tulostinta ei ole (vielä) määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi."
 
 #~ msgctxt "@info:status"
 #~ msgid "Unable to send print job to group {cluster_name}."
@@ -7963,12 +7964,12 @@ msgstr ""
 #~ msgstr "OK"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers"
-#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn Ultimaker 3 -tulostinryhmän isännäksi"
+#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers"
+#~ msgstr "Tätä tulostinta ei ole määritetty yhdistetyn UltiMaker 3 -tulostinryhmän isännäksi"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers"
-#~ msgstr "Tämä tulostin on %1 tulostimen yhdistetyn Ultimaker 3 -ryhmän isäntä"
+#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers"
+#~ msgstr "Tämä tulostin on %1 tulostimen yhdistetyn UltiMaker 3 -ryhmän isäntä"
 
 #~ msgctxt "@label"
 #~ msgid "Completed on: "
@@ -8284,8 +8285,8 @@ msgstr ""
 #~ msgstr "Tukee irrotettavan aseman kytkemistä lennossa ja sille kirjoittamista."
 
 #~ msgctxt "@info:whatsthis"
-#~ msgid "Manages network connections to Ultimaker 3 printers"
-#~ msgstr "Ultimaker 3 -tulostimien verkkoyhteyksien hallinta"
+#~ msgid "Manages network connections to UltiMaker 3 printers"
+#~ msgstr "UltiMaker 3 -tulostimien verkkoyhteyksien hallinta"
 
 #~ msgctxt "@label"
 #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}"
@@ -8448,12 +8449,12 @@ msgstr ""
 #~ msgstr "Tukee 3MF-tiedostojen kirjoittamista."
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker machine actions"
-#~ msgstr "Ultimaker-laitteen toiminnot"
+#~ msgid "UltiMaker machine actions"
+#~ msgstr "UltiMaker-laitteen toiminnot"
 
 #~ msgctxt "@info:whatsthis"
-#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)"
-#~ msgstr "Ultimaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)"
+#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)"
+#~ msgstr "UltiMaker-laitteiden toimintojen käyttö (esim. pöydän tasaaminen, päivitysten valinta yms.)"
 
 #~ msgctxt "@label"
 #~ msgid "Cura Profile Reader"
@@ -8492,8 +8493,8 @@ msgstr ""
 #~ msgstr "Jos tulostinta ei ole luettelossa, lue <a href='%1'>verkkotulostuksen vianetsintäopas</a>"
 
 #~ msgctxt "@item:inlistbox"
-#~ msgid "Ultimaker"
-#~ msgstr "Ultimaker"
+#~ msgid "UltiMaker"
+#~ msgstr "UltiMaker"
 
 #~ msgctxt "@label"
 #~ msgid "Support library for scientific computing "
@@ -8642,8 +8643,8 @@ msgstr ""
 #~ msgstr "Ota tukirakenteet käyttöön. Nämä rakenteet tukevat mallin osia, joissa on merkittäviä ulokkeita."
 
 #~ msgctxt "@label"
-#~ msgid "Need help improving your prints? Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>"
-#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen? Lue <a href=’%1’>Ultimakerin vianetsintäoppaat</a>"
+#~ msgid "Need help improving your prints? Read the <a href='%1'>UltiMaker Troubleshooting Guides</a>"
+#~ msgstr "Tarvitsetko apua tulosteiden parantamiseen? Lue <a href=’%1’>UltiMakerin vianetsintäoppaat</a>"
 
 #~ msgctxt "@info:status"
 #~ msgid "Connected over the network to {0}. Please approve the access request on the printer."

resources/i18n/hu_HU/cura.po

@@ -1,6 +1,7 @@
 # Cura
-# Copyright (C) 2022 Ultimaker B.V.
+# Copyright (C) 2022 UltiMaker.
 # This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 msgid ""
 msgstr ""
@@ -423,8 +424,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Az Ultimaker fiókkiszolgáló elérhetetlen."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "Az UltiMaker fiókkiszolgáló elérhetetlen."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -700,8 +701,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Hibajelentés küldése az Ultimaker -nek"
+msgid "Send crash report to UltiMaker"
+msgstr "Hibajelentés küldése az UltiMaker -nek"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -901,7 +902,7 @@ msgstr "Hálózati hiba"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
+msgid "New printer detected from your UltiMaker account"
 msgid_plural "New printers detected from your Ultimaker account"
 msgstr[0] ""
 msgstr[1] ""
@@ -1049,8 +1050,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
-msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware."
-msgstr "Olyan nyomtatóval próbál csatlakozni, amelyen nem fut az Ultimaker Connect. Kérjük, frissítse a nyomtatón a firmware-t."
+msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware."
+msgstr "Olyan nyomtatóval próbál csatlakozni, amelyen nem fut az UltiMaker Connect. Kérjük, frissítse a nyomtatón a firmware-t."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1273,8 +1274,8 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Ultimaker formátumcsomag"
+msgid "UltiMaker Format Package"
+msgstr "UltiMaker formátumcsomag"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1395,7 +1396,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
+msgid "Changes detected from your UltiMaker account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
@@ -1556,7 +1557,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
@@ -1682,7 +1683,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723
 #, python-brace-format
 msgctxt "@info:error Don't translate the XML tag <filename>!"
-msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of Ultimaker Cura."
+msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of UltiMaker Cura."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
@@ -2326,7 +2327,7 @@ msgstr "A távoli nyomtatásisor kezeléshez kérjük frissítse a firmware-t."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
-msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
+msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
@@ -2692,8 +2693,8 @@ msgstr "További információ a névtelen adatgyűjtésről"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
-msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
-msgstr "Az Ultimaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javítása érdekében. Az alábbiakban található egy példa az összes megosztott adatra:"
+msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
+msgstr "Az UltiMaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javítása érdekében. Az alábbiakban található egy példa az összes megosztott adatra:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2717,8 +2718,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Kérjük, válassza ki az Ultimaker Original eredeti frissítéseit"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Kérjük, válassza ki az UltiMaker Original eredeti frissítéseit"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2813,7 +2814,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
-msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users."
+msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
@@ -2872,7 +2873,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
-msgid "Select and install material profiles optimised for your Ultimaker 3D printers."
+msgid "Select and install material profiles optimised for your UltiMaker 3D printers."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
@@ -2994,17 +2995,17 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
+msgid "UltiMaker Verified Plug-in"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
+msgid "UltiMaker Certified Material"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
+msgid "UltiMaker Verified Package"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
@@ -3014,7 +3015,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
-msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
+msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
@@ -4283,8 +4284,8 @@ msgstr "Magán"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
-msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
-msgstr "Elküldjük a nyomtatott adatokat név nélkül az Ultimaker-nek?Semmilyen személyes infromáció, IP cím vagy azonosító nem kerül elküldésre."
+msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
+msgstr "Elküldjük a nyomtatott adatokat név nélkül az UltiMaker-nek?Semmilyen személyes infromáció, IP cím vagy azonosító nem kerül elküldésre."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4597,7 +4598,7 @@ msgstr "Hibaelhárítás"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
+msgid "Sign in to the UltiMaker platform"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
@@ -4612,7 +4613,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
@@ -4622,18 +4623,18 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
+msgid "Create a free UltiMaker Account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Segítsen nekünk az Ultimaker Cura fejlesztésében"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "Segítsen nekünk az UltiMaker Cura fejlesztésében"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
-msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:"
-msgstr "Az Ultimaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javításának érdekében, ideértve:"
+msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:"
+msgstr "Az UltiMaker Cura névtelen adatokat gyűjt a nyomtatási minőség és a felhasználói élmény javításának érdekében, ideértve:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4657,8 +4658,8 @@ msgstr "Nyomtatási beállítások"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
-msgid "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Az Ultimaker Cura által gyűjtött adatok nem tartalmaznak személyes információt."
+msgid "Data collected by UltiMaker Cura will not contain any personal information."
+msgstr "Az UltiMaker Cura által gyűjtött adatok nem tartalmaznak személyes információt."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4728,7 +4729,7 @@ msgstr "Nem sikerült csatlakozni az eszközhöz."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
+msgid "Can't connect to your UltiMaker printer?"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
@@ -4748,12 +4749,12 @@ msgstr "Csatlakozás"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Üdvözöljük az Ultimaker Cura-ban"
+msgid "Welcome to UltiMaker Cura"
+msgstr "Üdvözöljük az UltiMaker Cura-ban"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
-msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments."
+msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
@@ -5436,9 +5437,9 @@ msgstr "Teljes körű megoldás az olvadószálas 3D-s nyomtatáshoz."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
-msgstr "A Cura-t az Ultimaker B.V fejlesztette ki a közösséggel együttműködésben. A Cura büszkén használja a következő nyílt forráskódú projekteket:"
+msgstr "A Cura-t az UltiMaker B.V fejlesztette ki a közösséggel együttműködésben. A Cura büszkén használja a következő nyílt forráskódú projekteket:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138
 msgctxt "@label Description for application component"
@@ -5643,22 +5644,22 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
+msgid "UltiMaker support"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
@@ -5668,7 +5669,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
+msgid "Consult the UltiMaker Community."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
@@ -5683,7 +5684,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
+msgid "Visit the UltiMaker website."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
@@ -5977,7 +5978,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
+msgid "Create a free UltiMaker account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
@@ -5992,7 +5993,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
+msgid "UltiMaker Account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
@@ -6207,13 +6208,13 @@ msgstr "Utólagos feldolgozás"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Kezeli a hálózati csatlakozásokat az Ultimaker hálózati nyomtatókhoz."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "Kezeli a hálózati csatlakozásokat az UltiMaker hálózati nyomtatókhoz."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Ultimaker hálózati kapcsolat"
+msgid "UltiMaker Network Connection"
+msgstr "UltiMaker hálózati kapcsolat"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6247,8 +6248,8 @@ msgstr "Szeletelési infó"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Támogatást nyújt az Ultimaker formátumú csomagok írásához."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "Támogatást nyújt az UltiMaker formátumú csomagok írásához."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6297,13 +6298,13 @@ msgstr "Trimesh olvasó"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "description"
-msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
-msgstr "Gépi funkciók biztosítása az Ultimaker nyomtatók számára.(pl.: ágyszintezés varázsló, frissítések kiválasztása.)"
+msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
+msgstr "Gépi funkciók biztosítása az UltiMaker nyomtatók számára.(pl.: ágyszintezés varázsló, frissítések kiválasztása.)"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Ultimaker gépi funkciók"
+msgid "UltiMaker machine actions"
+msgstr "UltiMaker gépi funkciók"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6317,7 +6318,7 @@ msgstr "Tömörített G-kód olvasó"
 
 #: /Marketplace/plugin.json
 msgctxt "description"
-msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website."
+msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website."
 msgstr ""
 
 #: /Marketplace/plugin.json
@@ -6667,8 +6668,8 @@ msgstr "G-kódot író"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Támogatást nyújt az Ultimaker formátumú csomagok olvasásához."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "Támogatást nyújt az UltiMaker formátumú csomagok olvasásához."
 
 #: /UFPReader/plugin.json
 msgctxt "name"
@@ -7036,8 +7037,8 @@ msgstr "Előkészítés nézet"
 #~ msgstr "Szimulációs nézetet biztosít."
 
 #~ msgctxt "@info:status"
-#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account."
-#~ msgstr "Küldjön és felügyeljen nyomtatási feladatokat bárhonnan az Ultimaker fiókjával."
+#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account."
+#~ msgstr "Küldjön és felügyeljen nyomtatási feladatokat bárhonnan az UltiMaker fiókjával."
 
 #~ msgctxt "@info:title The %s gets replaced with the printer name."
 #~ msgid "New %s firmware available"
@@ -7082,8 +7083,8 @@ msgstr "Előkészítés nézet"
 #~ "az Ultimaker Cura beállításához. Pár pillanat az egész."
 
 #~ msgctxt "@label"
-#~ msgid "What's new in Ultimaker Cura"
-#~ msgstr "Újdonságok az Ultimaker Cura-ban"
+#~ msgid "What's new in UltiMaker Cura"
+#~ msgstr "Újdonságok az UltiMaker Cura-ban"
 
 #~ msgctxt "@info:status"
 #~ msgid "The selected model was too small to load."
@@ -7130,8 +7131,8 @@ msgstr "Előkészítés nézet"
 #~ msgstr "Csatlakozás felhőn keresztül"
 
 #~ msgctxt "@info:status Ultimaker Cloud should not be translated."
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Csatlakozás az Ultimaker felhőhöz"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Csatlakozás az UltiMaker felhőhöz"
 
 #~ msgctxt "@label"
 #~ msgid "You need to install the package before you can rate"
@@ -7158,8 +7159,8 @@ msgstr "Előkészítés nézet"
 #~ msgstr "Szia %1"
 
 #~ msgctxt "@button"
-#~ msgid "Ultimaker account"
-#~ msgstr "Ultimaker fiók"
+#~ msgid "UltiMaker account"
+#~ msgstr "UltiMaker fiók"
 
 #~ msgctxt "@button"
 #~ msgid "Sign out"
@@ -7343,8 +7344,8 @@ msgstr "Előkészítés nézet"
 #~ msgstr "Ellenőrző lista"
 
 #~ msgctxt "@label"
-#~ msgid "Please select any upgrades made to this Ultimaker 2."
-#~ msgstr "Kérjük, válassza ki az Ultimaker 2 frissítéseit."
+#~ msgid "Please select any upgrades made to this UltiMaker 2."
+#~ msgstr "Kérjük, válassza ki az UltiMaker 2 frissítéseit."
 
 #~ msgctxt "@label"
 #~ msgid "Olsson Block"
@@ -7421,8 +7422,8 @@ msgstr "Előkészítés nézet"
 #~ "- Exklúzív hozzáférés a vezető nyomtató márkák nyomtatási profiljaikhoz"
 
 #~ msgctxt "@title:window"
-#~ msgid "Ultimaker Cura"
-#~ msgstr "Ultimaker Cura"
+#~ msgid "UltiMaker Cura"
+#~ msgstr "UltiMaker Cura"
 
 #~ msgctxt "@title:window"
 #~ msgid "Closing Cura"
@@ -7441,20 +7442,20 @@ msgstr "Előkészítés nézet"
 #~ msgstr "Tárgyasztal"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker Cloud"
-#~ msgstr "Ultimaker felhő"
+#~ msgid "UltiMaker Cloud"
+#~ msgstr "UltiMaker felhő"
 
 #~ msgctxt "@text"
 #~ msgid "The next generation 3D printing workflow"
 #~ msgstr "Következő generációs 3D nyomtatási munkafolyamat"
 
 #~ msgctxt "@text"
-#~ msgid "- Send print jobs to Ultimaker printers outside your local network"
-#~ msgstr "- Küldjön nyomtatási feladatokat az Ultimaker nyomtatóknak a helyi hálózaton kívülről"
+#~ msgid "- Send print jobs to UltiMaker printers outside your local network"
+#~ msgstr "- Küldjön nyomtatási feladatokat az UltiMaker nyomtatóknak a helyi hálózaton kívülről"
 
 #~ msgctxt "@text"
-#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere"
-#~ msgstr "- Tárolja az Ultimaker Cura beállításait a felhőben így azok bárhol használhatóak"
+#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere"
+#~ msgstr "- Tárolja az UltiMaker Cura beállításait a felhőben így azok bárhol használhatóak"
 
 #~ msgctxt "@text"
 #~ msgid "- Get exclusive access to print profiles from leading brands"

resources/i18n/it_IT/cura.po

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

resources/i18n/ja_JP/cura.po

@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Cura
+# Copyright (C) 2022 UltiMaker.
+# This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 #, fuzzy
 msgid ""
@@ -442,8 +442,8 @@ msgstr "新しいサインインプロセスを開始できません。別のサ
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Ultimaker アカウントサーバーに到達できません。"
+msgid "Unable to reach the UltiMaker account server."
+msgstr "UltiMaker アカウントサーバーに到達できません。"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -718,7 +718,7 @@ msgstr "Curaを開始できません"
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113
 msgctxt "@label crash message"
 msgid ""
-"<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right."
+"<p><b>Oops, UltiMaker Cura has encountered something that doesn't seem right."
 "</p></b>\n"
 "                    <p>We encountered an unrecoverable error during start "
 "up. It was possibly caused by some incorrect configuration files. We suggest "
@@ -728,13 +728,13 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</"
 "p>\n"
 "                "
-msgstr "<p><b>申し訳ありません。Ultimaker Cura で何らかの不具合が生じています。</p></b>\n                    <p>開始時に回復不能のエラーが発生しました。不適切なファイル設定が原因の可能性があります。バックアップを実行してからリセットしてください。</p>\n"
+msgstr "<p><b>申し訳ありません。UltiMaker Cura で何らかの不具合が生じています。</p></b>\n                    <p>開始時に回復不能のエラーが発生しました。不適切なファイル設定が原因の可能性があります。バックアップを実行してからリセットしてください。</p>\n"
 "                    <p>バックアップは、設定フォルダに保存されます。</p>\n                    <p>問題解決のために、このクラッシュ報告をお送りください。</p>\n                "
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "クラッシュ報告をUltimakerに送信する"
+msgid "Send crash report to UltiMaker"
+msgstr "クラッシュ報告をUltiMakerに送信する"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -933,9 +933,9 @@ msgstr "ネットワークエラー"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
-msgid_plural "New printers detected from your Ultimaker account"
-msgstr[0] "Ultimakerアカウントから新しいプリンターが検出されました"
+msgid "New printer detected from your UltiMaker account"
+msgid_plural "New printers detected from your UltiMaker account"
+msgstr[0] "UltiMakerアカウントから新しいプリンターが検出されました"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29
 #, python-brace-format
@@ -1085,9 +1085,9 @@ msgstr "プリンターを取り除く"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
 msgid ""
-"You are attempting to connect to a printer that is not running Ultimaker "
+"You are attempting to connect to a printer that is not running UltiMaker "
 "Connect. Please update the printer to the latest firmware."
-msgstr "Ultimaker Connectを実行していないプリンターに接続しようとしています。プリンターを最新のファームウェアに更新してください。"
+msgstr "UltiMaker Connectを実行していないプリンターに接続しようとしています。プリンターを最新のファームウェアに更新してください。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1314,8 +1314,8 @@ msgstr "UFPファイルに書き込めません："
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Ultimakerフォーマットパッケージ"
+msgid "UltiMaker Format Package"
+msgstr "UltiMakerフォーマットパッケージ"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1438,8 +1438,8 @@ msgstr "材料パッケージとソフトウェアパッケージをアカウン
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Ultimakerアカウントから変更が検出されました"
+msgid "Changes detected from your UltiMaker account"
+msgstr "UltiMakerアカウントから変更が検出されました"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1601,8 +1601,8 @@ msgstr "バグを報告"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Ultimaker Curaの問題追跡ツールでバグを報告してください。"
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "UltiMaker Curaの問題追跡ツールでバグを報告してください。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1747,8 +1747,8 @@ msgstr "プロジェクトファイル<filename>{0}</filename>は破損してい
 msgctxt "@info:error Don't translate the XML tag <filename>!"
 msgid ""
 "Project file <filename>{0}</filename> is made using profiles that are "
-"unknown to this version of Ultimaker Cura."
-msgstr "プロジェクトファイル<filename>{0}</filename>はこのバージョンのUltimaker Curaでは認識できないプロファイルを使用して作成されています。"
+"unknown to this version of UltiMaker Cura."
+msgstr "プロジェクトファイル<filename>{0}</filename>はこのバージョンのUltiMaker Curaでは認識できないプロファイルを使用して作成されています。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -1776,7 +1776,7 @@ msgid ""
 "p>\n"
 "<p><a href=\"https://ultimaker.com/3D-model-assistant\">View print quality "
 "guide</a></p>"
-msgstr "<p>モデルのサイズまたは材料の設定によっては、適切に印刷しない3Dモデルがあります。:</p>\n<p>{model_names}</p>\n<p>可能な限り最高の品質および信頼性を得る方法をご覧ください。</p>\n<p><a href=\"https://ultimaker.com/3D-model-assistant\">印字品質ガイドを見る</a></p>"
+msgstr "<p>モデルのサイズまたは材料の設定によっては、適切に印刷しない3Dモデルがあります。:</p>\n<p>{model_names}</p>\n<p>可能な限り最高の品質および信頼性を得る方法をご覧ください。</p>\n<p><a href=\"https://UltiMaker.com/3D-model-assistant\">印字品質ガイドを見る</a></p>"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42
 msgctxt "@item:inmenu"
@@ -2413,9 +2413,9 @@ msgstr "キューをリモートで管理するには、プリンターのファ
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
 msgid ""
-"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click "
+"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click "
 "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "クラウドプリンターのウェブカムフィードをUltimaker Curaから見ることができません。「プリンター管理」をクリックして、Ultimaker Digital Factoryにアクセスし、このウェブカムを見ます。"
+msgstr "クラウドプリンターのウェブカムフィードをUltiMaker Curaから見ることができません。「プリンター管理」をクリックして、Ultimaker Digital Factoryにアクセスし、このウェブカムを見ます。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
 msgctxt "@label:status"
@@ -2794,9 +2794,9 @@ msgstr "匿名データの収集に関する詳細"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
 msgid ""
-"Ultimaker Cura collects anonymous data in order to improve the print quality "
+"UltiMaker Cura collects anonymous data in order to improve the print quality "
 "and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために匿名データを収集します。以下は、共有されるすべてのデータの例です："
+msgstr "UltiMaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために匿名データを収集します。以下は、共有されるすべてのデータの例です："
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2820,8 +2820,8 @@ msgstr "Curaプロジェクトを保存する"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "このUltimaker Originalに施されたアップグレートを選択する"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "このUltiMaker Originalに施されたアップグレートを選択する"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2923,9 +2923,9 @@ msgstr "プラグインのインストール"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
 msgid ""
-"Streamline your workflow and customize your Ultimaker Cura experience with "
+"Streamline your workflow and customize your UltiMaker Cura experience with "
 "plugins contributed by our amazing community of users."
-msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、Ultimaker Cura体験をカスタマイズすることができます。"
+msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、UltiMaker Cura体験をカスタマイズすることができます。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -2986,9 +2986,9 @@ msgstr "材料のインストール"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
 msgid ""
-"Select and install material profiles optimised for your Ultimaker 3D "
+"Select and install material profiles optimised for your UltiMaker 3D "
 "printers."
-msgstr "Ultimaker 3Dプリンターに最適な材料プロファイルを選択してインストールします。"
+msgstr "UltiMaker 3Dプリンターに最適な材料プロファイルを選択してインストールします。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -3109,18 +3109,18 @@ msgstr "さらに読み込む"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Ultimaker検証済みプラグイン"
+msgid "UltiMaker Verified Plug-in"
+msgstr "UltiMaker検証済みプラグイン"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Ultimaker認定材料"
+msgid "UltiMaker Certified Material"
+msgstr "UltiMaker認定材料"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Ultimaker検証済みパッケージ"
+msgid "UltiMaker Verified Package"
+msgstr "UltiMaker検証済みパッケージ"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -3130,9 +3130,9 @@ msgstr "パッケージの管理"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
 msgid ""
-"Manage your Ultimaker Cura plugins and material profiles here. Make sure to "
+"Manage your UltiMaker Cura plugins and material profiles here. Make sure to "
 "keep your plugins up to date and backup your setup regularly."
-msgstr "Ultimaker Curaのプラグインと材料プロファイルはここで管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。"
+msgstr "UltiMaker Curaのプラグインと材料プロファイルはここで管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
 msgctxt "@title"
@@ -4447,10 +4447,10 @@ msgstr "プライバシー"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
 msgid ""
-"Should anonymous data about your print be sent to Ultimaker? Note, no "
+"Should anonymous data about your print be sent to UltiMaker? Note, no "
 "models, IP addresses or other personally identifiable information is sent or "
 "stored."
-msgstr "プリンターの不明なデータをUltimakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。"
+msgstr "プリンターの不明なデータをUltiMakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4766,8 +4766,8 @@ msgstr "トラブルシューティング"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Ultimakerのプラットフォームにサインイン"
+msgid "Sign in to the UltiMaker platform"
+msgstr "UltiMakerのプラットフォームにサインイン"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4781,8 +4781,8 @@ msgstr "材料設定とプラグインのバックアップと同期"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Ultimakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "UltiMakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4791,20 +4791,20 @@ msgstr "スキップ"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "無料のUltimakerアカウントを作成"
+msgid "Create a free UltiMaker Account"
+msgstr "無料のUltiMakerアカウントを作成"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Ultimaker Cura の改善にご協力ください"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "UltiMaker Cura の改善にご協力ください"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
 msgid ""
-"Ultimaker Cura collects anonymous data to improve print quality and user "
+"UltiMaker Cura collects anonymous data to improve print quality and user "
 "experience, including:"
-msgstr "Ultimaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために以下の匿名データを収集します:"
+msgstr "UltiMaker Cura は、印刷品質とユーザーエクスペリエンスを向上させるために以下の匿名データを収集します:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4829,8 +4829,8 @@ msgstr "プリント設定"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
 msgid ""
-"Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Ultimaker Cura が収集したデータには個人データは含まれません。"
+"Data collected by UltiMaker Cura will not contain any personal information."
+msgstr "UltiMaker Cura が収集したデータには個人データは含まれません。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4900,8 +4900,8 @@ msgstr "デバイスに接続できません。"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "Ultimakerプリンターに接続できませんか？"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "UltiMakerプリンターに接続できませんか？"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4922,15 +4922,15 @@ msgstr "接続"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Ultimaker Cura にようこそ"
+msgid "Welcome to UltiMaker Cura"
+msgstr "UltiMaker Cura にようこそ"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
 msgid ""
-"Please follow these steps to set up Ultimaker Cura. This will only take a "
+"Please follow these steps to set up UltiMaker Cura. This will only take a "
 "few moments."
-msgstr "以下の手順で\nUltimaker Cura を設定してください。数秒で完了します。"
+msgstr "以下の手順で\nUltiMaker Cura を設定してください。数秒で完了します。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5024,7 +5024,7 @@ msgstr "フィラメントを管理する..."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:216
 msgctxt ""
-"@action:inmenu Marketplace is a brand name of Ultimaker's, so don't "
+"@action:inmenu Marketplace is a brand name of UltiMaker's, so don't "
 "translate."
 msgid "Add more materials from Marketplace"
 msgstr "マーケットプレイスから材料を追加"
@@ -5623,9 +5623,9 @@ msgstr "熱溶解積層型3Dプリンティングのエンドtoエンドソリ
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
-msgstr "CuraはUltimakerB.Vのコミュニティの協力によって開発され、Curaはオープンソースで使えることを誇りに思います:"
+msgstr "CuraはUltiMakerB.Vのコミュニティの協力によって開発され、Curaはオープンソースで使えることを誇りに思います:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138
 msgctxt "@label Description for application component"
@@ -5830,23 +5830,23 @@ msgstr "プリントジョブをモニタリングしてプリント履歴から
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "Ultimaker Curaをプラグインと材料プロファイルで拡張します。"
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "UltiMaker Curaをプラグインと材料プロファイルで拡張します。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Ultimaker eラーニングで3Dプリンティングのエキスパートになります。"
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "UltiMaker eラーニングで3Dプリンティングのエキスパートになります。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Ultimakerのサポート"
+msgid "UltiMaker support"
+msgstr "UltiMakerのサポート"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Ultimaker Curaの使用を開始する方法を確認します。"
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "UltiMaker Curaの使用を開始する方法を確認します。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5855,8 +5855,8 @@ msgstr "質問をする"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Ultimaker Communityをご参照ください。"
+msgid "Consult the UltiMaker Community."
+msgstr "UltiMaker Communityをご参照ください。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5870,8 +5870,8 @@ msgstr "問題が発生していることを開発者にお知らせください
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Ultimakerウェブサイトをご確認ください。"
+msgid "Visit the UltiMaker website."
+msgstr "UltiMakerウェブサイトをご確認ください。"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -6180,12 +6180,12 @@ msgid ""
 "- Add material profiles and plug-ins from the Marketplace\n"
 "- Back-up and sync your material profiles and plug-ins\n"
 "- Share ideas and get help from 48,000+ users in the Ultimaker community"
-msgstr "- マーケットプレースから材料プロファイルとプラグインを追加\n- 材料プロファイルとプラグインのバックアップと同期\n- Ultimakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう"
+msgstr "- マーケットプレースから材料プロファイルとプラグインを追加\n- 材料プロファイルとプラグインのバックアップと同期\n- UltiMakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "無料のUltimakerアカウントを作成"
+msgid "Create a free UltiMaker account"
+msgstr "無料のUltiMakerアカウントを作成"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -6199,8 +6199,8 @@ msgstr "最終更新：%1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Ultimakerアカウント"
+msgid "UltiMaker Account"
+msgstr "UltiMakerアカウント"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6424,13 +6424,13 @@ msgstr "後処理"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Ultimakerのネットワーク接属できるプリンターのネットワーク接続を管理します。"
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "UltiMakerのネットワーク接属できるプリンターのネットワーク接続を管理します。"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Ultimakerネットワーク接続"
+msgid "UltiMaker Network Connection"
+msgstr "UltiMakerネットワーク接続"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6464,8 +6464,8 @@ msgstr "スライスインフォメーション"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Ultimakerフォーマットパッケージへの書き込みをサポートします。"
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "UltiMakerフォーマットパッケージへの書き込みをサポートします。"
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6519,11 +6519,11 @@ msgctxt "description"
 msgid ""
 "Provides machine actions for Ultimaker machines (such as bed leveling "
 "wizard, selecting upgrades, etc.)."
-msgstr "Ultimakerのプリンターのアクションを供給する（ベッドレベリングウィザード、アップグレードの選択、他）"
+msgstr "UltiMakerのプリンターのアクションを供給する（ベッドレベリングウィザード、アップグレードの選択、他）"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
+msgid "UltiMaker machine actions"
 msgstr "Ultimkerプリンターのアクション"
 
 #: /GCodeGzReader/plugin.json
@@ -6541,7 +6541,7 @@ msgctxt "description"
 msgid ""
 "Manages extensions to the application and allows browsing extensions from "
 "the Ultimaker website."
-msgstr "アプリケーションの拡張機能を管理し、Ultimakerウェブサイトから拡張機能を参照できるようにします。"
+msgstr "アプリケーションの拡張機能を管理し、UltiMakerウェブサイトから拡張機能を参照できるようにします。"
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6893,8 +6893,8 @@ msgstr "G-codeライター"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Ultimakerフォーマットパッケージの読み込みをサポートします。"
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "UltiMakerフォーマットパッケージの読み込みをサポートします。"
 
 #: /UFPReader/plugin.json
 msgctxt "name"

resources/i18n/ko_KR/cura.po

@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Cura
+# Copyright (C) 2022 UltiMaker.
+# This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 #, fuzzy
 msgid ""
@@ -442,8 +442,8 @@ msgstr "새 로그인 작업을 시작할 수 없습니다. 다른 로그인 작
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Ultimaker 계정 서버에 도달할 수 없음."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "UltiMaker 계정 서버에 도달할 수 없음."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -718,7 +718,7 @@ msgstr "큐라를 시작할 수 없습니다"
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113
 msgctxt "@label crash message"
 msgid ""
-"<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right."
+"<p><b>Oops, UltiMaker Cura has encountered something that doesn't seem right."
 "</p></b>\n"
 "                    <p>We encountered an unrecoverable error during start "
 "up. It was possibly caused by some incorrect configuration files. We suggest "
@@ -728,14 +728,14 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</"
 "p>\n"
 "                "
-msgstr "<p> <b> 죄송합니다, Ultimaker Cura가 정상적이지 않습니다. &lt;/ p&gt; &lt;/ b&gt;\n                     <p> 시작할 때 복구 할 수없는 오류가 발생했습니다. 이 오류는 잘못된 구성 파일로 인해 발생할 수 있습니다."
+msgstr "<p> <b> 죄송합니다, UltiMaker Cura가 정상적이지 않습니다. &lt;/ p&gt; &lt;/ b&gt;\n                     <p> 시작할 때 복구 할 수없는 오류가 발생했습니다. 이 오류는 잘못된 구성 파일로 인해 발생할 수 있습니다."
 " 설정을 백업하고 재설정하는 것이 좋습니다. &lt;/ p&gt;\n                     <p> 백업은 설정 폴더에서 찾을 수 있습니다. &lt;/ p&gt;\n                     <p> 문제를 해결하기 위해이 오류 보고서를 보내주십시오."
 " &lt;/ p&gt;\n                "
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "충돌 보고서를 Ultimaker에 보내기"
+msgid "Send crash report to UltiMaker"
+msgstr "충돌 보고서를 UltiMaker에 보내기"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -934,9 +934,9 @@ msgstr "네트워크 오류"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
-msgid_plural "New printers detected from your Ultimaker account"
-msgstr[0] "Ultimaker 계정에서 새 프린터가 감지되었습니다"
+msgid "New printer detected from your UltiMaker account"
+msgid_plural "New printers detected from your UltiMaker account"
+msgstr[0] "UltiMaker 계정에서 새 프린터가 감지되었습니다"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29
 #, python-brace-format
@@ -1086,9 +1086,9 @@ msgstr "프린터 제거"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
 msgid ""
-"You are attempting to connect to a printer that is not running Ultimaker "
+"You are attempting to connect to a printer that is not running UltiMaker "
 "Connect. Please update the printer to the latest firmware."
-msgstr "Ultimaker Connect를 실행하지 않는 프린터에 연결하려 합니다. 프린터를 최신 펌웨어로 업데이트해 주십시오."
+msgstr "UltiMaker Connect를 실행하지 않는 프린터에 연결하려 합니다. 프린터를 최신 펌웨어로 업데이트해 주십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1315,8 +1315,8 @@ msgstr "UFP 파일에 쓸 수 없음:"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Ultimaker 포맷 패키지"
+msgid "UltiMaker Format Package"
+msgstr "UltiMaker 포맷 패키지"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1439,8 +1439,8 @@ msgstr "귀하의 계정으로 재료와 소프트웨어 패키지를 동기화
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Ultimaker 계정에서 변경 사항이 감지되었습니다"
+msgid "Changes detected from your UltiMaker account"
+msgstr "UltiMaker 계정에서 변경 사항이 감지되었습니다"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1602,8 +1602,8 @@ msgstr "버그 보고"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Report a bug on Ultimaker Cura's issue tracker."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "Report a bug on UltiMaker Cura's issue tracker."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1748,8 +1748,8 @@ msgstr "프로젝트 파일 <filename>{0}</filename>이 손상됨: <message>{1}<
 msgctxt "@info:error Don't translate the XML tag <filename>!"
 msgid ""
 "Project file <filename>{0}</filename> is made using profiles that are "
-"unknown to this version of Ultimaker Cura."
-msgstr "프로젝트 파일 <filename>{0}</filename>이(가) 이 버전의 Ultimaker Cura에서 확인할 수 없는 프로파일을 사용하였습니다."
+"unknown to this version of UltiMaker Cura."
+msgstr "프로젝트 파일 <filename>{0}</filename>이(가) 이 버전의 UltiMaker Cura에서 확인할 수 없는 프로파일을 사용하였습니다."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -1777,7 +1777,7 @@ msgid ""
 "p>\n"
 "<p><a href=\"https://ultimaker.com/3D-model-assistant\">View print quality "
 "guide</a></p>"
-msgstr "<p>하나 이상의 3D 모델이 모델 크기 및 재료 구성으로 인해 최적의 상태로 인쇄되지 않을 수 있습니다.</p>\n<p>{model_names}</p>\n<p>인쇄 품질 및 안정성을 최고로 높이는 방법을 알아보십시오.</p>\n<p><a href=\"https://ultimaker.com/3D-model-assistant\">인쇄"
+msgstr "<p>하나 이상의 3D 모델이 모델 크기 및 재료 구성으로 인해 최적의 상태로 인쇄되지 않을 수 있습니다.</p>\n<p>{model_names}</p>\n<p>인쇄 품질 및 안정성을 최고로 높이는 방법을 알아보십시오.</p>\n<p><a href=\"https://UltiMaker.com/3D-model-assistant\">인쇄"
 " 품질 가이드 보기</a></p>"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42
@@ -2415,9 +2415,9 @@ msgstr "대기열을 원격으로 관리하려면 프린터 펌웨어를 업데
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
 msgid ""
-"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click "
+"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click "
 "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "클라우드 프린터용 Webcam 피드는 Ultimaker Cura에서 볼 수 없습니다. '프린터 관리'를 클릭하여 Ultimaker Digital Factory를 방문하고 이 웹캠을 확인하십시오."
+msgstr "클라우드 프린터용 Webcam 피드는 UltiMaker Cura에서 볼 수 없습니다. '프린터 관리'를 클릭하여 Ultimaker Digital Factory를 방문하고 이 웹캠을 확인하십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
 msgctxt "@label:status"
@@ -2796,9 +2796,9 @@ msgstr "익명 데이터 수집에 대한 추가 정보"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
 msgid ""
-"Ultimaker Cura collects anonymous data in order to improve the print quality "
+"UltiMaker Cura collects anonymous data in order to improve the print quality "
 "and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 익명 데이터를 수집합니다. 공유되는 모든 데이터의 예는 다음과 같습니다:"
+msgstr "UltiMaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 익명 데이터를 수집합니다. 공유되는 모든 데이터의 예는 다음과 같습니다:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2822,8 +2822,8 @@ msgstr "Cura 프로젝트 저장하기"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "이 Ultimaker Original에 업그레이드 할 항목을 선택하십시오"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "이 UltiMaker Original에 업그레이드 할 항목을 선택하십시오"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2925,9 +2925,9 @@ msgstr "플러그인 설치"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
 msgid ""
-"Streamline your workflow and customize your Ultimaker Cura experience with "
+"Streamline your workflow and customize your UltiMaker Cura experience with "
 "plugins contributed by our amazing community of users."
-msgstr "당사의 놀라운 사용자 커뮤니티에서 기여한 플러그인으로 워크 플로를 간소화하고 Ultimaker Cura 경험을 맞춤화하세요."
+msgstr "당사의 놀라운 사용자 커뮤니티에서 기여한 플러그인으로 워크 플로를 간소화하고 UltiMaker Cura 경험을 맞춤화하세요."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -2988,9 +2988,9 @@ msgstr "재료 설치"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
 msgid ""
-"Select and install material profiles optimised for your Ultimaker 3D "
+"Select and install material profiles optimised for your UltiMaker 3D "
 "printers."
-msgstr "Ultimaker 3D 프린터에 최적화된 재료 프로파일을 선택하고 설치하십시오."
+msgstr "UltiMaker 3D 프린터에 최적화된 재료 프로파일을 선택하고 설치하십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -3111,18 +3111,18 @@ msgstr "더 많이 로드"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Ultimaker 검증된 플러그인"
+msgid "UltiMaker Verified Plug-in"
+msgstr "UltiMaker 검증된 플러그인"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Ultimaker 인증된 재료"
+msgid "UltiMaker Certified Material"
+msgstr "UltiMaker 인증된 재료"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Ultimaker 검증된 패키지"
+msgid "UltiMaker Verified Package"
+msgstr "UltiMaker 검증된 패키지"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -3132,9 +3132,9 @@ msgstr "패키지 관리"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
 msgid ""
-"Manage your Ultimaker Cura plugins and material profiles here. Make sure to "
+"Manage your UltiMaker Cura plugins and material profiles here. Make sure to "
 "keep your plugins up to date and backup your setup regularly."
-msgstr "여기서 Ultimaker Cura 플러그인 및 재료 프로파일을 관리하십시오. 플러그인을 최신 상태로 유지하고 설정을 정기적으로 백업하십시오."
+msgstr "여기서 UltiMaker Cura 플러그인 및 재료 프로파일을 관리하십시오. 플러그인을 최신 상태로 유지하고 설정을 정기적으로 백업하십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
 msgctxt "@title"
@@ -4449,10 +4449,10 @@ msgstr "보안"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
 msgid ""
-"Should anonymous data about your print be sent to Ultimaker? Note, no "
+"Should anonymous data about your print be sent to UltiMaker? Note, no "
 "models, IP addresses or other personally identifiable information is sent or "
 "stored."
-msgstr "프린터에 대한 익명의 데이터를 Ultimaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다."
+msgstr "프린터에 대한 익명의 데이터를 UltiMaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4768,8 +4768,8 @@ msgstr "문제 해결"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Ultimaker 플랫폼에 로그인"
+msgid "Sign in to the UltiMaker platform"
+msgstr "UltiMaker 플랫폼에 로그인"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4783,8 +4783,8 @@ msgstr "재료 설정과 플러그인 백업 및 동기화"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Ultimaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "UltiMaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4793,20 +4793,20 @@ msgstr "건너뛰기"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "Ultimaker 계정 무료 생성"
+msgid "Create a free UltiMaker Account"
+msgstr "UltiMaker 계정 무료 생성"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Ultimaker Cura를 개선하는 데 도움을 주십시오"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "UltiMaker Cura를 개선하는 데 도움을 주십시오"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
 msgid ""
-"Ultimaker Cura collects anonymous data to improve print quality and user "
+"UltiMaker Cura collects anonymous data to improve print quality and user "
 "experience, including:"
-msgstr "Ultimaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 다음과 같은 익명 데이터를 수집합니다:"
+msgstr "UltiMaker Cura는 인쇄 품질과 사용자 경험을 개선하기 위해 다음과 같은 익명 데이터를 수집합니다:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4831,8 +4831,8 @@ msgstr "인쇄 설정"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
 msgid ""
-"Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Ultimaker Cura가 수집하는 데이터에는 개인 정보가 포함되어 있지 않습니다."
+"Data collected by UltiMaker Cura will not contain any personal information."
+msgstr "UltiMaker Cura가 수집하는 데이터에는 개인 정보가 포함되어 있지 않습니다."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4902,8 +4902,8 @@ msgstr "장치에 연결할 수 없습니다."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "Ultimaker 프린터로 연결할 수 없습니까?"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "UltiMaker 프린터로 연결할 수 없습니까?"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4924,15 +4924,15 @@ msgstr "연결"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Ultimaker Cura에 오신 것을 환영합니다"
+msgid "Welcome to UltiMaker Cura"
+msgstr "UltiMaker Cura에 오신 것을 환영합니다"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
 msgid ""
-"Please follow these steps to set up Ultimaker Cura. This will only take a "
+"Please follow these steps to set up UltiMaker Cura. This will only take a "
 "few moments."
-msgstr "Ultimaker Cura를 설정하려면 다음 단계로 이동하세요. 오래 걸리지 않습니다."
+msgstr "UltiMaker Cura를 설정하려면 다음 단계로 이동하세요. 오래 걸리지 않습니다."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5026,7 +5026,7 @@ msgstr "재료 관리..."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Actions.qml:216
 msgctxt ""
-"@action:inmenu Marketplace is a brand name of Ultimaker's, so don't "
+"@action:inmenu Marketplace is a brand name of UltiMaker's, so don't "
 "translate."
 msgid "Add more materials from Marketplace"
 msgstr "마켓플레이스에서 더 많은 재료 추가"
@@ -5625,9 +5625,9 @@ msgstr "3D 프린팅을 위한 엔드 투 엔트 솔루션."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker B.V. in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
-msgstr "Cura는 커뮤니티와 공동으로 Ultimaker B.V.에 의해 개발되었습니다.\nCura는 다음의 오픈 소스 프로젝트를 사용합니다:"
+msgstr "Cura는 커뮤니티와 공동으로 UltiMaker B.V.에 의해 개발되었습니다.\nCura는 다음의 오픈 소스 프로젝트를 사용합니다:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138
 msgctxt "@label Description for application component"
@@ -5832,23 +5832,23 @@ msgstr "프린트 작업을 모니터링하고 프린트 기록에서 다시 프
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "플러그인 및 재료 프로파일을 사용하여 Ultimaker Cura를 확장하십시오."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "플러그인 및 재료 프로파일을 사용하여 UltiMaker Cura를 확장하십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Ultimaker e-러닝을 통해 3D 프린팅 전문가로 거듭나십시오."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "UltiMaker e-러닝을 통해 3D 프린팅 전문가로 거듭나십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Ultimaker support"
+msgid "UltiMaker support"
+msgstr "UltiMaker support"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Ultimaker Cura로 시작하는 방법을 알아보십시오."
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "UltiMaker Cura로 시작하는 방법을 알아보십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5857,8 +5857,8 @@ msgstr "질문하기"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Ultimaker 커뮤니티에 문의하십시오."
+msgid "Consult the UltiMaker Community."
+msgstr "UltiMaker 커뮤니티에 문의하십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5872,8 +5872,8 @@ msgstr "개발자에게 문제를 알려주십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Ultimaker 웹 사이트를 방문하십시오."
+msgid "Visit the UltiMaker website."
+msgstr "UltiMaker 웹 사이트를 방문하십시오."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -6181,13 +6181,13 @@ msgctxt "@text"
 msgid ""
 "- Add material profiles and plug-ins from the Marketplace\n"
 "- Back-up and sync your material profiles and plug-ins\n"
-"- Share ideas and get help from 48,000+ users in the Ultimaker community"
-msgstr "- 재료 설정 및 Marketplace 플러그인 추가\n- 재료 설정과 플러그인 백업 및 동기화\n- Ultimaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기"
+"- Share ideas and get help from 48,000+ users in the UltiMaker community"
+msgstr "- 재료 설정 및 Marketplace 플러그인 추가\n- 재료 설정과 플러그인 백업 및 동기화\n- UltiMaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "Ultimaker 계정 무료 생성"
+msgid "Create a free UltiMaker account"
+msgstr "UltiMaker 계정 무료 생성"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -6201,8 +6201,8 @@ msgstr "마지막 업데이트: %1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Ultimaker 계정"
+msgid "UltiMaker Account"
+msgstr "UltiMaker 계정"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6244,7 +6244,7 @@ msgstr "클라우드 프린터가 오프라인 상태입니다. 프린터가 켜
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrinterSelector/MachineSelector.qml:51
 msgctxt "@status"
 msgid ""
-"This printer is not linked to your account. Please visit the Ultimaker "
+"This printer is not linked to your account. Please visit the UltiMaker "
 "Digital Factory to establish a connection."
 msgstr "해당 프린터가 사용자의 계정에 연결되어 있지 않습니다. Ultimaker Digital Factory에 방문하여 연결을 설정하십시오."
 
@@ -6426,13 +6426,13 @@ msgstr "후처리"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Ultimaker 네트워크 연결 프린터에 대한 네트워크 연결을 관리합니다."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "UltiMaker 네트워크 연결 프린터에 대한 네트워크 연결을 관리합니다."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Ultimaker 네트워크 연결"
+msgid "UltiMaker Network Connection"
+msgstr "UltiMaker 네트워크 연결"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6466,8 +6466,8 @@ msgstr "슬라이스 정보"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Ultimaker 포맷 패키지 작성을 지원합니다."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "UltiMaker 포맷 패키지 작성을 지원합니다."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6484,7 +6484,7 @@ msgstr "디지털 라이브러리와 연결하여 Cura에서 디지털 라이브
 #: /DigitalLibrary/plugin.json
 msgctxt "name"
 msgid "Ultimaker Digital Library"
-msgstr "Ultimaker 디지털 라이브러리"
+msgstr "UltiMaker 디지털 라이브러리"
 
 #: /GCodeProfileReader/plugin.json
 msgctxt "description"
@@ -6519,14 +6519,14 @@ msgstr "Trimesh 리더"
 #: /UltimakerMachineActions/plugin.json
 msgctxt "description"
 msgid ""
-"Provides machine actions for Ultimaker machines (such as bed leveling "
+"Provides machine actions for UltiMaker machines (such as bed leveling "
 "wizard, selecting upgrades, etc.)."
-msgstr "Ultimaker 기계에 대한 기계 작동 제공(예 : 침대 수평 조정 마법사, 업그레이드 선택 등)"
+msgstr "UltiMaker 기계에 대한 기계 작동 제공(예 : 침대 수평 조정 마법사, 업그레이드 선택 등)"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Ultimaker 기기 동작"
+msgid "UltiMaker machine actions"
+msgstr "UltiMaker 기기 동작"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6542,8 +6542,8 @@ msgstr "압축 된 G 코드 리더기"
 msgctxt "description"
 msgid ""
 "Manages extensions to the application and allows browsing extensions from "
-"the Ultimaker website."
-msgstr "응용 프로그램의 확장을 관리하고 Ultimaker 웹 사이트에서 확장을 검색할 수 있습니다."
+"the UltiMaker website."
+msgstr "응용 프로그램의 확장을 관리하고 UltiMaker 웹 사이트에서 확장을 검색할 수 있습니다."
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6895,8 +6895,8 @@ msgstr "GCode 작성자"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Ultimaker 포맷 패키지 읽기를 지원합니다."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "UltiMaker 포맷 패키지 읽기를 지원합니다."
 
 #: /UFPReader/plugin.json
 msgctxt "name"

resources/i18n/nl_NL/cura.po

@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Cura
+# Copyright (C) 2022 UltiMaker.
+# This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 #, fuzzy
 msgid ""
@@ -443,8 +443,8 @@ msgstr "Er kan geen nieuw aanmeldingsproces worden gestart. Controleer of een an
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Kan de Ultimaker-accountserver niet bereiken."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "Kan de UltiMaker-accountserver niet bereiken."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -719,7 +719,7 @@ msgstr "Cura kan niet worden gestart"
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:113
 msgctxt "@label crash message"
 msgid ""
-"<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right."
+"<p><b>Oops, UltiMaker Cura has encountered something that doesn't seem right."
 "</p></b>\n"
 "                    <p>We encountered an unrecoverable error during start "
 "up. It was possibly caused by some incorrect configuration files. We suggest "
@@ -729,15 +729,15 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</"
 "p>\n"
 "                "
-msgstr "<p><b>Oeps, Ultimaker Cura heeft een probleem gedetecteerd.</p></b>\n                    <p>Tijdens het opstarten is een onherstelbare fout opgetreden."
+msgstr "<p><b>Oeps, UltiMaker Cura heeft een probleem gedetecteerd.</p></b>\n                    <p>Tijdens het opstarten is een onherstelbare fout opgetreden."
 " Deze fout is mogelijk veroorzaakt door enkele onjuiste configuratiebestanden. Het wordt aanbevolen een back-up te maken en de standaardinstelling van"
 " uw configuratie te herstellen.</p>\n                    <p>Back-ups bevinden zich in de configuratiemap.</p>\n                    <p>Stuur ons dit crashrapport"
 " om het probleem op te lossen.</p>\n                "
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Het crashrapport naar Ultimaker verzenden"
+msgid "Send crash report to UltiMaker"
+msgstr "Het crashrapport naar UltiMaker verzenden"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -937,10 +937,10 @@ msgstr "Netwerkfout"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
-msgid_plural "New printers detected from your Ultimaker account"
-msgstr[0] "Nieuwe printer gedetecteerd van uw Ultimaker-account"
-msgstr[1] "Nieuwe printers gedetecteerd van uw Ultimaker-account"
+msgid "New printer detected from your UltiMaker account"
+msgid_plural "New printers detected from your UltiMaker account"
+msgstr[0] "Nieuwe printer gedetecteerd van uw UltiMaker-account"
+msgstr[1] "Nieuwe printers gedetecteerd van uw UltiMaker-account"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:29
 #, python-brace-format
@@ -1093,9 +1093,9 @@ msgstr "Printers verwijderen"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
 msgid ""
-"You are attempting to connect to a printer that is not running Ultimaker "
+"You are attempting to connect to a printer that is not running UltiMaker "
 "Connect. Please update the printer to the latest firmware."
-msgstr "U probeert verbinding te maken met een printer waarop Ultimaker Connect niet wordt uitgevoerd. Werk de printer bij naar de nieuwste firmware."
+msgstr "U probeert verbinding te maken met een printer waarop UltiMaker Connect niet wordt uitgevoerd. Werk de printer bij naar de nieuwste firmware."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1323,8 +1323,8 @@ msgstr "Kan niet naar UFP-bestand schrijven:"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Ultimaker Format Package"
+msgid "UltiMaker Format Package"
+msgstr "UltiMaker Format Package"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1448,8 +1448,8 @@ msgstr "Wilt u materiaal- en softwarepackages synchroniseren met uw account?"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Wijzigingen gedetecteerd van uw Ultimaker-account"
+msgid "Changes detected from your UltiMaker account"
+msgstr "Wijzigingen gedetecteerd van uw UltiMaker-account"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1611,8 +1611,8 @@ msgstr "Een fout melden"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Meld een fout via de issue tracker van Ultimaker Cura."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "Meld een fout via de issue tracker van UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1760,8 +1760,8 @@ msgstr "Projectbestand <filename>{0}</filename> is corrupt: <message>{1}</messag
 msgctxt "@info:error Don't translate the XML tag <filename>!"
 msgid ""
 "Project file <filename>{0}</filename> is made using profiles that are "
-"unknown to this version of Ultimaker Cura."
-msgstr "Projectbestand <filename>{0}</filename> wordt gemaakt met behulp van profielen die onbekend zijn bij deze versie van Ultimaker Cura."
+"unknown to this version of UltiMaker Cura."
+msgstr "Projectbestand <filename>{0}</filename> wordt gemaakt met behulp van profielen die onbekend zijn bij deze versie van UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -2433,9 +2433,9 @@ msgstr "Werk de firmware van uw printer bij om de wachtrij op afstand te beheren
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
 msgid ""
-"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click "
+"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click "
 "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "Vanuit Ultimaker Cura kunt u de webcamfeeds voor cloudprinters niet bekijken. Klik op 'Printer beheren' om Ultimaker Digital Factory te bezoeken en deze"
+msgstr "Vanuit UltiMaker Cura kunt u de webcamfeeds voor cloudprinters niet bekijken. Klik op 'Printer beheren' om Ultimaker Digital Factory te bezoeken en deze"
 " webcam te bekijken."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
@@ -2817,9 +2817,9 @@ msgstr "Meer informatie over anonieme gegevensverzameling"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
 msgid ""
-"Ultimaker Cura collects anonymous data in order to improve the print quality "
+"UltiMaker Cura collects anonymous data in order to improve the print quality "
 "and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren. Hieronder ziet u een voorbeeld van alle gegevens die"
+msgstr "UltiMaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren. Hieronder ziet u een voorbeeld van alle gegevens die"
 " worden gedeeld:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
@@ -2844,8 +2844,8 @@ msgstr "Cura-project opslaan"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Selecteer eventuele upgrades die op deze Ultimaker Original zijn uitgevoerd"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Selecteer eventuele upgrades die op deze UltiMaker Original zijn uitgevoerd"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2949,9 +2949,9 @@ msgstr "Plugins installeren"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
 msgid ""
-"Streamline your workflow and customize your Ultimaker Cura experience with "
+"Streamline your workflow and customize your UltiMaker Cura experience with "
 "plugins contributed by our amazing community of users."
-msgstr "Stroomlijn uw workflow en pas uw Ultimaker Cura-ervaring aan de eisen aan met plugins die zijn geleverd door onze fantastische gebruikersgemeenschap."
+msgstr "Stroomlijn uw workflow en pas uw UltiMaker Cura-ervaring aan de eisen aan met plugins die zijn geleverd door onze fantastische gebruikersgemeenschap."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -3012,9 +3012,9 @@ msgstr "Materialen installeren"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
 msgid ""
-"Select and install material profiles optimised for your Ultimaker 3D "
+"Select and install material profiles optimised for your UltiMaker 3D "
 "printers."
-msgstr "Selecteer en installeer materiaalprofielen die zijn geoptimaliseerd voor uw Ultimaker 3D-printers."
+msgstr "Selecteer en installeer materiaalprofielen die zijn geoptimaliseerd voor uw UltiMaker 3D-printers."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -3135,18 +3135,18 @@ msgstr "Meer laden"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Geverifieerde Ultimaker-plug-in"
+msgid "UltiMaker Verified Plug-in"
+msgstr "Geverifieerde UltiMaker-plug-in"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Gecertificeerd Ultimaker-materiaal"
+msgid "UltiMaker Certified Material"
+msgstr "Gecertificeerd UltiMaker-materiaal"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Geverifieerd Ultimaker-pakket"
+msgid "UltiMaker Verified Package"
+msgstr "Geverifieerd UltiMaker-pakket"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -3156,9 +3156,9 @@ msgstr "Pakketten beheren"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
 msgid ""
-"Manage your Ultimaker Cura plugins and material profiles here. Make sure to "
+"Manage your UltiMaker Cura plugins and material profiles here. Make sure to "
 "keep your plugins up to date and backup your setup regularly."
-msgstr "Beheer hier uw Ultimaker Cura-plug-ins en materiaalprofielen. Zorg ervoor dat uw plug-ins up-to-date blijven en maak regelmatig een back-up van uw instellingen."
+msgstr "Beheer hier uw UltiMaker Cura-plug-ins en materiaalprofielen. Zorg ervoor dat uw plug-ins up-to-date blijven en maak regelmatig een back-up van uw instellingen."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
 msgctxt "@title"
@@ -4482,10 +4482,10 @@ msgstr "Privacy"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
 msgid ""
-"Should anonymous data about your print be sent to Ultimaker? Note, no "
+"Should anonymous data about your print be sent to UltiMaker? Note, no "
 "models, IP addresses or other personally identifiable information is sent or "
 "stored."
-msgstr "Mogen anonieme gegevens over uw print naar Ultimaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare"
+msgstr "Mogen anonieme gegevens over uw print naar UltiMaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare"
 " gegevens verzonden of opgeslagen."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
@@ -4804,8 +4804,8 @@ msgstr "Probleemoplossing"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Meld u aan op het Ultimaker-platform"
+msgid "Sign in to the UltiMaker platform"
+msgstr "Meld u aan op het UltiMaker-platform"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4819,8 +4819,8 @@ msgstr "Maak een back-up van uw materiaalinstellingen en plug-ins en synchronise
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Deel ideeën met 48,000+ gebruikers in de Ultimaker Community of vraag hen om ondersteuning"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "Deel ideeën met 48,000+ gebruikers in de UltiMaker Community of vraag hen om ondersteuning"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4829,20 +4829,20 @@ msgstr "Overslaan"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "Maak een gratis Ultimaker-account aan"
+msgid "Create a free UltiMaker Account"
+msgstr "Maak een gratis UltiMaker-account aan"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Help ons Ultimaker Cura te verbeteren"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "Help ons UltiMaker Cura te verbeteren"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
 msgid ""
 "Ultimaker Cura collects anonymous data to improve print quality and user "
 "experience, including:"
-msgstr "Ultimaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren, waaronder:"
+msgstr "UltiMaker Cura verzamelt anonieme gegevens om de printkwaliteit en gebruikerservaring te verbeteren, waaronder:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4868,7 +4868,7 @@ msgstr "Instellingen voor printen"
 msgctxt "@text"
 msgid ""
 "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "De gegevens die Ultimaker Cura verzamelt, bevatten geen persoonlijke informatie."
+msgstr "De gegevens die UltiMaker Cura verzamelt, bevatten geen persoonlijke informatie."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4938,8 +4938,8 @@ msgstr "Kan geen verbinding maken met het apparaat."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "Kunt u geen verbinding maken met uw Ultimaker-printer?"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "Kunt u geen verbinding maken met uw UltiMaker-printer?"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4960,15 +4960,15 @@ msgstr "Verbinding maken"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Welkom bij Ultimaker Cura"
+msgid "Welcome to UltiMaker Cura"
+msgstr "Welkom bij UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
 msgid ""
 "Please follow these steps to set up Ultimaker Cura. This will only take a "
 "few moments."
-msgstr "Volg deze stappen voor het instellen van\nUltimaker Cura. Dit duurt slechts even."
+msgstr "Volg deze stappen voor het instellen van\nUltiMaker Cura. Dit duurt slechts even."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5666,9 +5666,9 @@ msgstr "End-to-end-oplossing voor fused filament 3D-printen."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
-msgstr "Cura is ontwikkeld door Ultimaker B.V. in samenwerking met de community.\nCura maakt met trots gebruik van de volgende opensourceprojecten:"
+msgstr "Cura is ontwikkeld door UltiMaker B.V. in samenwerking met de community.\nCura maakt met trots gebruik van de volgende opensourceprojecten:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138
 msgctxt "@label Description for application component"
@@ -5873,23 +5873,23 @@ msgstr "Volg printtaken en print opnieuw vanuit uw printgeschiedenis."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "Breid Ultimaker Cura uit met plug-ins en materiaalprofielen."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "Breid UltiMaker Cura uit met plug-ins en materiaalprofielen."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Word een 3D-printexpert met Ultimaker e-learning."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "Word een 3D-printexpert met UltiMaker e-learning."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Ondersteuning van Ultimaker"
+msgid "UltiMaker support"
+msgstr "Ondersteuning van UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Leer hoe u aan de slag gaat met Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "Leer hoe u aan de slag gaat met UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5898,8 +5898,8 @@ msgstr "Stel een vraag"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Consulteer de Ultimaker Community."
+msgid "Consult the UltiMaker Community."
+msgstr "Consulteer de UltiMaker Community."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5913,8 +5913,8 @@ msgstr "Laat ontwikkelaars weten dat er iets misgaat."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Bezoek de Ultimaker-website."
+msgid "Visit the UltiMaker website."
+msgstr "Bezoek de UltiMaker-website."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -6234,8 +6234,8 @@ msgstr "- Voeg materiaalprofielen en plug-ins toe uit de Marktplaats\n- Maak bac
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "Maak een gratis Ultimaker-account aan"
+msgid "Create a free UltiMaker account"
+msgstr "Maak een gratis UltiMaker-account aan"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -6249,8 +6249,8 @@ msgstr "Laatste update: %1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Ultimaker-account"
+msgid "UltiMaker Account"
+msgstr "UltiMaker-account"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6474,13 +6474,13 @@ msgstr "Nabewerking"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Hiermee beheert u netwerkverbindingen naar Ultimaker-netwerkprinters."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "Hiermee beheert u netwerkverbindingen naar UltiMaker-netwerkprinters."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Ultimaker-netwerkverbinding"
+msgid "UltiMaker Network Connection"
+msgstr "UltiMaker-netwerkverbinding"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6514,8 +6514,8 @@ msgstr "Slice-informatie"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Deze optie biedt ondersteuning voor het schrijven van Ultimaker Format Packages."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "Deze optie biedt ondersteuning voor het schrijven van UltiMaker Format Packages."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6569,12 +6569,12 @@ msgctxt "description"
 msgid ""
 "Provides machine actions for Ultimaker machines (such as bed leveling "
 "wizard, selecting upgrades, etc.)."
-msgstr "Biedt machineacties voor Ultimaker-machines (zoals wizard voor bedkalibratie, selecteren van upgrades, enz.)"
+msgstr "Biedt machineacties voor UltiMaker-machines (zoals wizard voor bedkalibratie, selecteren van upgrades, enz.)"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Acties Ultimaker-machines"
+msgid "UltiMaker machine actions"
+msgstr "Acties UltiMaker-machines"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6591,7 +6591,7 @@ msgctxt "description"
 msgid ""
 "Manages extensions to the application and allows browsing extensions from "
 "the Ultimaker website."
-msgstr "Beheert extensies voor de toepassing en staat browsingextensies toe van de Ultimaker-website."
+msgstr "Beheert extensies voor de toepassing en staat browsingextensies toe van de UltiMaker-website."
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6943,8 +6943,8 @@ msgstr "G-code-schrijver"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Deze optie biedt ondersteuning voor het lezen van Ultimaker Format Packages."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "Deze optie biedt ondersteuning voor het lezen van UltiMaker Format Packages."
 
 #: /UFPReader/plugin.json
 msgctxt "name"

resources/i18n/pl_PL/cura.po

@@ -1,6 +1,7 @@
 # Cura
-# Copyright (C) 2022 Ultimaker B.V.
+# Copyright (C) 2022 UltiMaker.
 # This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 msgid ""
 msgstr ""
@@ -424,8 +425,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Nie można uzyskać dostępu do serwera kont Ultimaker."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "Nie można uzyskać dostępu do serwera kont UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -701,8 +702,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Wyślij raport błędu do Ultimaker"
+msgid "Send crash report to UltiMaker"
+msgstr "Wyślij raport błędu do UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -902,7 +903,7 @@ msgstr "Błąd sieci"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
+msgid "New printer detected from your UltiMaker account"
 msgid_plural "New printers detected from your Ultimaker account"
 msgstr[0] ""
 msgstr[1] ""
@@ -1050,8 +1051,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
-msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware."
-msgstr "Próbujesz połączyć się z drukarką, na której nie działa Ultimaker Connect. Zaktualizuj drukarkę do najnowszej wersji firmware."
+msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware."
+msgstr "Próbujesz połączyć się z drukarką, na której nie działa UltiMaker Connect. Zaktualizuj drukarkę do najnowszej wersji firmware."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1274,8 +1275,8 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Pakiet Formatu Ultimaker"
+msgid "UltiMaker Format Package"
+msgstr "Pakiet Formatu UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1396,7 +1397,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
+msgid "Changes detected from your UltiMaker account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
@@ -1557,7 +1558,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
@@ -1683,7 +1684,7 @@ msgstr ""
 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723
 #, python-brace-format
 msgctxt "@info:error Don't translate the XML tag <filename>!"
-msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of Ultimaker Cura."
+msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of UltiMaker Cura."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
@@ -2327,7 +2328,7 @@ msgstr "Zaktualizuj oprogramowanie drukarki, aby zdalnie zarządzać kolejką."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
-msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
+msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
@@ -2693,8 +2694,8 @@ msgstr "Wiećej informacji o zbieraniu anonimowych danych"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
-msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkowania. Poniżej znajduje się przykład wszystkich udostępnianych danych:"
+msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
+msgstr "UltiMaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkowania. Poniżej znajduje się przykład wszystkich udostępnianych danych:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2718,8 +2719,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Proszę wybrać ulepszenia wykonane w tym Ultimaker Original"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Proszę wybrać ulepszenia wykonane w tym UltiMaker Original"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2814,7 +2815,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
-msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users."
+msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
@@ -2873,7 +2874,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
-msgid "Select and install material profiles optimised for your Ultimaker 3D printers."
+msgid "Select and install material profiles optimised for your UltiMaker 3D printers."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
@@ -2995,17 +2996,17 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
+msgid "UltiMaker Verified Plug-in"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
+msgid "UltiMaker Certified Material"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
+msgid "UltiMaker Verified Package"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
@@ -3015,7 +3016,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
-msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
+msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
@@ -4284,8 +4285,8 @@ msgstr "Prywatność"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
-msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
-msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do Ultimaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane."
+msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
+msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do UltiMaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4598,7 +4599,7 @@ msgstr "Rozwiązywanie problemów"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
+msgid "Sign in to the UltiMaker platform"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
@@ -4613,7 +4614,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
@@ -4623,18 +4624,18 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
+msgid "Create a free UltiMaker Account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Pomóż nam ulepszyć Ultimaker Cura"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "Pomóż nam ulepszyć UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
-msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:"
-msgstr "Ultimaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkownika, w tym:"
+msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:"
+msgstr "UltiMaker Cura zbiera anonimowe dane w celu poprawy jakości druku i komfortu użytkownika, w tym:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4658,8 +4659,8 @@ msgstr "Ustawienia druku"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
-msgid "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Dane zebrane przez Ultimaker Cura nie będą zawierać żadnych prywatnych danych osobowych."
+msgid "Data collected by UltiMaker Cura will not contain any personal information."
+msgstr "Dane zebrane przez UltiMaker Cura nie będą zawierać żadnych prywatnych danych osobowych."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4729,7 +4730,7 @@ msgstr "Nie można połączyć się z urządzeniem."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
+msgid "Can't connect to your UltiMaker printer?"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
@@ -4749,12 +4750,12 @@ msgstr "Połącz"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Witaj w Ultimaker Cura"
+msgid "Welcome to UltiMaker Cura"
+msgstr "Witaj w UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
-msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments."
+msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
@@ -5437,7 +5438,7 @@ msgstr "Kompletne rozwiązanie do druku przestrzennego."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
 msgstr ""
 "Cura jest rozwijana przez firmę Ultimaker B.V. we współpracy ze społecznością.\n"
@@ -5646,22 +5647,22 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
+msgid "UltiMaker support"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
@@ -5671,7 +5672,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
+msgid "Consult the UltiMaker Community."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
@@ -5686,7 +5687,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
+msgid "Visit the UltiMaker website."
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
@@ -5980,7 +5981,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
+msgid "Create a free UltiMaker account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
@@ -5995,7 +5996,7 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
+msgid "UltiMaker Account"
 msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
@@ -6210,13 +6211,13 @@ msgstr "Post Processing"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Zarządza połączeniami z sieciowymi drukarkami Ultimaker."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "Zarządza połączeniami z sieciowymi drukarkami UltiMaker."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Połączenie sieciowe Ultimaker"
+msgid "UltiMaker Network Connection"
+msgstr "Połączenie sieciowe UltiMaker"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6250,8 +6251,8 @@ msgstr "Informacje o cięciu"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Zapewnia wsparcie dla zapisywania Pakietów Formatów Ultimaker."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "Zapewnia wsparcie dla zapisywania Pakietów Formatów UltiMaker."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6300,13 +6301,13 @@ msgstr "Czytnik siatki trójkątów"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "description"
-msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
-msgstr "Zapewnia czynności maszyny dla urządzeń Ultimaker (na przykład kreator poziomowania stołu, wybór ulepszeń itp.)."
+msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
+msgstr "Zapewnia czynności maszyny dla urządzeń UltiMaker (na przykład kreator poziomowania stołu, wybór ulepszeń itp.)."
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Czynności maszyny Ultimaker"
+msgid "UltiMaker machine actions"
+msgstr "Czynności maszyny UltiMaker"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6320,7 +6321,7 @@ msgstr "Czytnik Skompresowanego G-code"
 
 #: /Marketplace/plugin.json
 msgctxt "description"
-msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website."
+msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website."
 msgstr ""
 
 #: /Marketplace/plugin.json
@@ -6670,8 +6671,8 @@ msgstr "Zapisywacz G-code"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Zapewnia obsługę odczytu pakietów formatu Ultimaker."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "Zapewnia obsługę odczytu pakietów formatu UltiMaker."
 
 #: /UFPReader/plugin.json
 msgctxt "name"
@@ -7045,8 +7046,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Zapewnia widok Symulacji."
 
 #~ msgctxt "@info:status"
-#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account."
-#~ msgstr "Wyślij i nadzoruj zadania druku z każdego miejsca, używając konta Ultimaker."
+#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account."
+#~ msgstr "Wyślij i nadzoruj zadania druku z każdego miejsca, używając konta UltiMaker."
 
 #~ msgctxt "@info:title The %s gets replaced with the printer name."
 #~ msgid "New %s firmware available"
@@ -7091,8 +7092,8 @@ msgstr "Etap Przygotowania"
 #~ "Ultimaker Cura. To zajmie tylko kilka chwil."
 
 #~ msgctxt "@label"
-#~ msgid "What's new in Ultimaker Cura"
-#~ msgstr "Co nowego w Ultimaker Cura"
+#~ msgid "What's new in UltiMaker Cura"
+#~ msgstr "Co nowego w UltiMaker Cura"
 
 #~ msgctxt "@info:status"
 #~ msgid "The selected model was too small to load."
@@ -7139,8 +7140,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Połączony z Chmurą"
 
 #~ msgctxt "@info:status Ultimaker Cloud should not be translated."
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Połacz z Ultimaker Cloud"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Połacz z UltiMaker Cloud"
 
 #~ msgctxt "@label"
 #~ msgid "You need to login first before you can rate"
@@ -7171,8 +7172,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Cześć %1"
 
 #~ msgctxt "@button"
-#~ msgid "Ultimaker account"
-#~ msgstr "Konto Ultimaker"
+#~ msgid "UltiMaker account"
+#~ msgstr "Konto UltiMaker"
 
 #~ msgctxt "@button"
 #~ msgid "Sign out"
@@ -7251,20 +7252,20 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Język:"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker Cloud"
-#~ msgstr "Chmura Ultimaker"
+#~ msgid "UltiMaker Cloud"
+#~ msgstr "Chmura UltiMaker"
 
 #~ msgctxt "@text"
 #~ msgid "The next generation 3D printing workflow"
 #~ msgstr "Nowa generacja systemu drukowania 3D"
 
 #~ msgctxt "@text"
-#~ msgid "- Send print jobs to Ultimaker printers outside your local network"
-#~ msgstr "- Wysyłaj zadania druku do drukarek Ultimaker poza siecią lokalną"
+#~ msgid "- Send print jobs to UltiMaker printers outside your local network"
+#~ msgstr "- Wysyłaj zadania druku do drukarek UltiMaker poza siecią lokalną"
 
 #~ msgctxt "@text"
-#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere"
-#~ msgstr "- Przechowuj ustawienia Ultimaker Cura w chmurze, aby używać w każdym miejscu"
+#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere"
+#~ msgstr "- Przechowuj ustawienia UltiMaker Cura w chmurze, aby używać w każdym miejscu"
 
 #~ msgctxt "@text"
 #~ msgid "- Get exclusive access to print profiles from leading brands"
@@ -7347,8 +7348,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Pokaż Wszystkie Ustawienia"
 
 #~ msgctxt "@title:window"
-#~ msgid "Ultimaker Cura"
-#~ msgstr "Cura Ultimaker"
+#~ msgid "UltiMaker Cura"
+#~ msgstr "Cura UltiMaker"
 
 #~ msgctxt "@title:window"
 #~ msgid "About Cura"
@@ -7431,8 +7432,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Lista kontrolna"
 
 #~ msgctxt "@label"
-#~ msgid "Please select any upgrades made to this Ultimaker 2."
-#~ msgstr "Proszę wybrać ulepszenia w tym Ultimaker 2."
+#~ msgid "Please select any upgrades made to this UltiMaker 2."
+#~ msgstr "Proszę wybrać ulepszenia w tym UltiMaker 2."
 
 #~ msgctxt "@label"
 #~ msgid "Olsson Block"
@@ -7555,8 +7556,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Nie można uruchomić nowego zadania drukowania."
 
 #~ msgctxt "@label"
-#~ msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing."
-#~ msgstr "Wystąpił problem z konfiguracją twojego Ultimaker'a, przez który nie można rozpocząć wydruku. Proszę rozwiąż te problemy przed kontynuowaniem."
+#~ msgid "There is an issue with the configuration of your UltiMaker, which makes it impossible to start the print. Please resolve this issues before continuing."
+#~ msgstr "Wystąpił problem z konfiguracją twojego UltiMaker'a, przez który nie można rozpocząć wydruku. Proszę rozwiąż te problemy przed kontynuowaniem."
 
 #~ msgctxt "@window:title"
 #~ msgid "Mismatched configuration"
@@ -7647,20 +7648,20 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Wystąpił błąd połączenia z chmurą."
 
 #~ msgctxt "@info:status"
-#~ msgid "Uploading via Ultimaker Cloud"
-#~ msgstr "Przesyłanie z Ultimaker Cloud"
+#~ msgid "Uploading via UltiMaker Cloud"
+#~ msgstr "Przesyłanie z UltiMaker Cloud"
 
 #~ msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated."
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Połącz z Ultimaker Cloud"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Połącz z UltiMaker Cloud"
 
 #~ msgctxt "@action"
 #~ msgid "Don't ask me again for this printer."
 #~ msgstr "Nie pytaj więcej dla tej drukarki."
 
 #~ msgctxt "@info:status"
-#~ msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account."
-#~ msgstr "Możesz teraz wysłać i nadzorować zadania druku z każdego miejsca, używając konta Ultimaker."
+#~ msgid "You can now send and monitor print jobs from anywhere using your UltiMaker account."
+#~ msgstr "Możesz teraz wysłać i nadzorować zadania druku z każdego miejsca, używając konta UltiMaker."
 
 #~ msgctxt "@info:status"
 #~ msgid "Connected!"
@@ -7699,8 +7700,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Przewodnik po ustawieniach Cura"
 
 #~ msgctxt "description"
-#~ msgid "Manages network connections to Ultimaker 3 printers."
-#~ msgstr "Zarządza ustawieniami połączenia sieciowego z drukarkami Ultimaker 3."
+#~ msgid "Manages network connections to UltiMaker 3 printers."
+#~ msgstr "Zarządza ustawieniami połączenia sieciowego z drukarkami UltiMaker 3."
 
 #~ msgctxt "name"
 #~ msgid "UM3 Network Connection"
@@ -7803,8 +7804,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Wysyłanie danych do zdalnego klastra"
 
 #~ msgctxt "@info:status"
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Połącz z Ultimaker Cloud"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Połącz z UltiMaker Cloud"
 
 #~ msgctxt "@info"
 #~ msgid "Cura collects anonymized usage statistics."
@@ -7939,20 +7940,20 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Wybierz drukarkę połączoną z siecią, aby nadzorować."
 
 #~ msgctxt "@info"
-#~ msgid "Please connect your Ultimaker printer to your local network."
-#~ msgstr "Połącz drukarkę Ultimaker z twoją siecią lokalną."
+#~ msgid "Please connect your UltiMaker printer to your local network."
+#~ msgstr "Połącz drukarkę UltiMaker z twoją siecią lokalną."
 
 #~ msgctxt "@text:window"
-#~ msgid "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent."
-#~ msgstr "Cura wysyła anonimowe dane do Ultimaker w celu polepszenia jakości wydruków oraz interakcji z użytkownikiem. Poniżej podano przykład wszystkich danych, jakie mogą być przesyłane."
+#~ msgid "Cura sends anonymous data to UltiMaker in order to improve the print quality and user experience. Below is an example of all the data that is sent."
+#~ msgstr "Cura wysyła anonimowe dane do UltiMaker w celu polepszenia jakości wydruków oraz interakcji z użytkownikiem. Poniżej podano przykład wszystkich danych, jakie mogą być przesyłane."
 
 #~ msgctxt "@text:window"
 #~ msgid "I don't want to send this data"
 #~ msgstr "Nie chcę wysyłać danych"
 
 #~ msgctxt "@text:window"
-#~ msgid "Allow sending this data to Ultimaker and help us improve Cura"
-#~ msgstr "Pozwól wysłać te dane do Ultimakera i pomóż nam ulepszyć Curę"
+#~ msgid "Allow sending this data to UltiMaker and help us improve Cura"
+#~ msgstr "Pozwól wysłać te dane do UltiMakera i pomóż nam ulepszyć Curę"
 
 #~ msgctxt "@label"
 #~ msgid "No print selected"
@@ -8134,8 +8135,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Nie chcę przesyłać tych danych"
 
 #~ msgctxt "@text:window"
-#~ msgid "Allow sending these data to Ultimaker and help us improve Cura"
-#~ msgstr "Zezwól na przesyłanie tych danych do Ultimaker i pomóż nam ulepszać Cura"
+#~ msgid "Allow sending these data to UltiMaker and help us improve Cura"
+#~ msgstr "Zezwól na przesyłanie tych danych do UltiMaker i pomóż nam ulepszać Cura"
 
 #~ msgctxt "@label"
 #~ msgid "Printer type:"
@@ -8330,7 +8331,7 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Popraw przycz. modelu"
 
 #~ msgctxt "@label"
-#~ msgid "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>"
+#~ msgid "Need help improving your prints?<br>Read the <a href='%1'>UltiMaker Troubleshooting Guides</a>"
 #~ msgstr "Potrzebujesz pomocy w ulepszaniu wydruków?<br>Przeczytaj <a href='%1'>instrukcje dotyczące rozwiązywania problemów</a>"
 
 #~ msgctxt "@title:window"
@@ -8350,8 +8351,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Sprawdź kompatybilność"
 
 #~ msgctxt "@tooltip"
-#~ msgid "Click to check the material compatibility on Ultimaker.com."
-#~ msgstr "Kliknij, aby sprawdzić zgodność materiału na Ultimaker.com."
+#~ msgid "Click to check the material compatibility on UltiMaker.com."
+#~ msgstr "Kliknij, aby sprawdzić zgodność materiału na UltiMaker.com."
 
 #~ msgctxt "description"
 #~ msgid "Shows changes since latest checked version."
@@ -8466,16 +8467,16 @@ msgstr "Etap Przygotowania"
 #~ "Powrócono do \"{}\"."
 
 #~ msgctxt "@label"
-#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers."
-#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą drukarek Ultimaker 3."
+#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers."
+#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą drukarek UltiMaker 3."
 
 #~ msgctxt "@label"
-#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers."
-#~ msgstr "Ta drukarka jest gospodarzem grupy %1 drukarek Ultimaker 3."
+#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers."
+#~ msgstr "Ta drukarka jest gospodarzem grupy %1 drukarek UltiMaker 3."
 
 #~ msgctxt "@label: arg 1 is group name"
-#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers"
-#~ msgstr "%1 nie została ustawiona do hostowania grupy podłączonych drukarek Ultimaker 3"
+#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers"
+#~ msgstr "%1 nie została ustawiona do hostowania grupy podłączonych drukarek UltiMaker 3"
 
 #~ msgctxt "@label link to connect manager"
 #~ msgid "Add/Remove printers"
@@ -8736,12 +8737,12 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Przeglądarka wtyczek"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker 3"
-#~ msgstr "Ultimaker 3"
+#~ msgid "UltiMaker 3"
+#~ msgstr "UltiMaker 3"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker 3 Extended"
-#~ msgstr "Ultimaker 3 Extended"
+#~ msgid "UltiMaker 3 Extended"
+#~ msgstr "UltiMaker 3 Extended"
 
 #~ msgctxt "@title:window"
 #~ msgid "SolidWorks: Export wizard"
@@ -8892,8 +8893,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Zapewnia możliwość zmiany ustawień maszyny (tj. obszaru roboczego, rozmiaru dyszy itd.)"
 
 #~ msgctxt "description"
-#~ msgid "Manages network connections to Ultimaker 3 printers"
-#~ msgstr "Zarządza połączeniem sieciowym z drukarką Ultimaker 3"
+#~ msgid "Manages network connections to UltiMaker 3 printers"
+#~ msgstr "Zarządza połączeniem sieciowym z drukarką UltiMaker 3"
 
 #~ msgctxt "description"
 #~ msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations."
@@ -8932,8 +8933,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Pyta użytkownika czy zgadza się z naszą licencją"
 
 #~ msgctxt "description"
-#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)"
-#~ msgstr "Zapewnia czynności maszyny dla maszyn Ultimaker (tj. poziomowanie stołu, wybór ulepszeń, itd.)"
+#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)"
+#~ msgstr "Zapewnia czynności maszyny dla maszyn UltiMaker (tj. poziomowanie stołu, wybór ulepszeń, itd.)"
 
 #~ msgctxt "@item:inlistbox"
 #~ msgid "GCode File"
@@ -9039,12 +9040,12 @@ msgstr "Etap Przygotowania"
 #~ msgid "Resuming print..."
 #~ msgstr "Wznawianie drukowania ..."
 
-#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers."
-#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą podłączonych drukarek Ultimaker 3."
+#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers."
+#~ msgstr "Ta drukarka nie jest skonfigurowana do zarządzania grupą podłączonych drukarek UltiMaker 3."
 
 #~ msgctxt "Count is number of printers."
-#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers."
-#~ msgstr "Ta drukarka jest gospodarzem grupy {count} podłączonych drukarek Ultimaker 3."
+#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers."
+#~ msgstr "Ta drukarka jest gospodarzem grupy {count} podłączonych drukarek UltiMaker 3."
 
 #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate."
 #~ msgstr "{printer_name} skończyła drukowanie '{job_name}'. Proszę zabrać wydruk i potwierdzić oczyszczenie platformy roboczej."
@@ -9053,8 +9054,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "{printer_name} jest zarezerwowana do druku '{job_name}'. Proszę zmień konfigurację drukarki, żeby pasowała do zadania dla niej, aby rozpocząć drukowanie."
 
 #~ msgctxt "@info:status"
-#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers."
-#~ msgstr "Nie można wysłać nowego zadania: ta drukarka 3D nie jest (jeszcze) ustawiona jako gospodarz grupy podłączonych drukarek Ultimaker 3."
+#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers."
+#~ msgstr "Nie można wysłać nowego zadania: ta drukarka 3D nie jest (jeszcze) ustawiona jako gospodarz grupy podłączonych drukarek UltiMaker 3."
 
 #~ msgctxt "@info:status"
 #~ msgid "Unable to send print job to group {cluster_name}."
@@ -9179,12 +9180,12 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Nieznany kod błędu: %1"
 
 #~ msgctxt "@label Printer name"
-#~ msgid "Ultimaker 3"
-#~ msgstr "Ultimaker 3"
+#~ msgid "UltiMaker 3"
+#~ msgstr "UltiMaker 3"
 
 #~ msgctxt "@label Printer name"
-#~ msgid "Ultimaker 3 Extended"
-#~ msgstr "Ultimaker 3 Extended"
+#~ msgid "UltiMaker 3 Extended"
+#~ msgstr "UltiMaker 3 Extended"
 
 #~ msgctxt "@label Printer status"
 #~ msgid "Unknown"
@@ -9459,12 +9460,12 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Ok"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers"
-#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy podłączonych drukarek Ultimaker 3"
+#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers"
+#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy podłączonych drukarek UltiMaker 3"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers"
-#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy %1 podłączonych drukarek Ultimaker 3"
+#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers"
+#~ msgstr "Ta drukarka nie została ustawiona do hostowania grupy %1 podłączonych drukarek UltiMaker 3"
 
 #~ msgctxt "@label"
 #~ msgid "Completed on: "
@@ -9780,8 +9781,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Zapewnia podłączanie wymiennego dysku i zapisywania na bieżąco."
 
 #~ msgctxt "@info:whatsthis"
-#~ msgid "Manages network connections to Ultimaker 3 printers"
-#~ msgstr "Zarządza połączeniami sieciowymi z drukarkami Ultimaker 3"
+#~ msgid "Manages network connections to UltiMaker 3 printers"
+#~ msgstr "Zarządza połączeniami sieciowymi z drukarkami UltiMaker 3"
 
 #~ msgctxt "@label"
 #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}"
@@ -9944,12 +9945,12 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Zapewnia obsługę pisania plików 3MF."
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker machine actions"
-#~ msgstr "Działania maszyny Ultimaker"
+#~ msgid "UltiMaker machine actions"
+#~ msgstr "Działania maszyny UltiMaker"
 
 #~ msgctxt "@info:whatsthis"
-#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)"
-#~ msgstr "Zapewnia działania maszyny Ultimaker (takie jak kreator poziomowania stołu, wybierania ulepszeń itd.)"
+#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)"
+#~ msgstr "Zapewnia działania maszyny UltiMaker (takie jak kreator poziomowania stołu, wybierania ulepszeń itd.)"
 
 #~ msgctxt "@label"
 #~ msgid "Cura Profile Reader"
@@ -9988,8 +9989,8 @@ msgstr "Etap Przygotowania"
 #~ msgstr "Jeśli drukarka nie ma na liście, przeczytaj <a href='%1'>przewodnik o rozwiązywaniu problemów z drukowaniem sieciowym</a>"
 
 #~ msgctxt "@item:inlistbox"
-#~ msgid "Ultimaker"
-#~ msgstr "Ultimaker"
+#~ msgid "UltiMaker"
+#~ msgstr "UltiMaker"
 
 #~ msgctxt "@label"
 #~ msgid "Support library for scientific computing "

resources/i18n/pt_BR/cura.po

@@ -1,6 +1,7 @@
 # Cura
-# Copyright (C) 2022 Ultimaker B.V.
+# Copyright (C) 2022 UltiMaker.
 # This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 msgid ""
 msgstr ""
@@ -398,8 +399,8 @@ msgstr "Não foi possível iniciar processo de sign-in. Verifique se outra tenta
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Não foi possível contactar o servidor de contas da Ultimaker."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "Não foi possível contactar o servidor de contas da UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -651,8 +652,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Enviar relatório de falha à Ultimaker"
+msgid "Send crash report to UltiMaker"
+msgstr "Enviar relatório de falha à UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -850,7 +851,7 @@ msgstr "Erro de rede"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
+msgid "New printer detected from your UltiMaker account"
 msgid_plural "New printers detected from your Ultimaker account"
 msgstr[0] "Nova impressora detectada na sua conta Ultimaker"
 msgstr[1] "Novas impressoras detectadas na sua conta Ultimaker"
@@ -998,8 +999,8 @@ msgstr "Remover impressoras"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18
 msgctxt "@info:status"
-msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware."
-msgstr "Você está tentando conectar a uma impressora que não está rodando Ultimaker Connect. Por favor atualiza a impressora para o firmware mais recente."
+msgid "You are attempting to connect to a printer that is not running UltiMaker Connect. Please update the printer to the latest firmware."
+msgstr "Você está tentando conectar a uma impressora que não está rodando UltiMaker Connect. Por favor atualiza a impressora para o firmware mais recente."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1218,8 +1219,8 @@ msgstr "Não foi possível escrever no arquivo UFP:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28 /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Pacote de Formato da Ultimaker"
+msgid "UltiMaker Format Package"
+msgstr "Pacote de Formato da UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1333,8 +1334,8 @@ msgstr "Você quer sincronizar os pacotes de material e software com sua conta?"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145 /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Alterações detectadas de sua conta Ultimaker"
+msgid "Changes detected from your UltiMaker account"
+msgstr "Alterações detectadas de sua conta UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1492,8 +1493,8 @@ msgstr "Relatar um bug"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Relatar um bug no issue tracker do Ultimaker Cura."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "Relatar um bug no issue tracker do UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1613,8 +1614,8 @@ msgstr "Arquivo de projeto <filename>{0}</filename> está corrompido: <message>{
 #: /Users/c.lamboo/ultimaker/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:723
 #, python-brace-format
 msgctxt "@info:error Don't translate the XML tag <filename>!"
-msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of Ultimaker Cura."
-msgstr "O arquivo de projeto <filename>{0}</filename> foi feito usando perfis que são desconhecidos para esta versão do Ultimaker Cura."
+msgid "Project file <filename>{0}</filename> is made using profiles that are unknown to this version of UltiMaker Cura."
+msgstr "O arquivo de projeto <filename>{0}</filename> foi feito usando perfis que são desconhecidos para esta versão do UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -2237,8 +2238,8 @@ msgstr "Por favor atualize o firmware de sua impressora parar gerir a fila remot
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
-msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "Fontes de webcam para impressoras de nuvem não podem ser vistas pelo Ultimaker Cura. Clique em \"Gerenciar impressora\" para visitar a Ultimaker Digital Factory e visualizar esta webcam."
+msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
+msgstr "Fontes de webcam para impressoras de nuvem não podem ser vistas pelo UltiMaker Cura. Clique em \"Gerenciar impressora\" para visitar a Ultimaker Digital Factory e visualizar esta webcam."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
 msgctxt "@label:status"
@@ -2588,8 +2589,8 @@ msgstr "Mais informações em coleção anônima de dados"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:73
 msgctxt "@text:window"
-msgid "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
-msgstr "O Ultimaker Cura coleta dados anônimos para poder aprimorar a qualidade de impressão e experiência do usuário. Abaixo segue um exemplo de todos os dados que são compartilhados:"
+msgid "UltiMaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:"
+msgstr "O UltiMaker Cura coleta dados anônimos para poder aprimorar a qualidade de impressão e experiência do usuário. Abaixo segue um exemplo de todos os dados que são compartilhados:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2613,8 +2614,8 @@ msgstr "Salvar o projeto Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Por favor selecionar quaisquer atualizações feitas nesta Ultimaker Original"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Por favor selecionar quaisquer atualizações feitas nesta UltiMaker Original"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2708,8 +2709,8 @@ msgstr "Instalar Complementos"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Plugins.qml:12
 msgctxt "@text"
-msgid "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users."
-msgstr "Simplifique seu fluxo de trabalho e personalize sua experiência do Ultimaker Cura com complementos contribuídos por nossa fantástica comunidade de usuários."
+msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users."
+msgstr "Simplifique seu fluxo de trabalho e personalize sua experiência do UltiMaker Cura com complementos contribuídos por nossa fantástica comunidade de usuários."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -2764,8 +2765,8 @@ msgstr "Instalar Materiais"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/Materials.qml:12
 msgctxt "@text"
-msgid "Select and install material profiles optimised for your Ultimaker 3D printers."
-msgstr "Selecione e instale perfis de material otimizados para suas impressoras 3D Ultimaker."
+msgid "Select and install material profiles optimised for your UltiMaker 3D printers."
+msgstr "Selecione e instale perfis de material otimizados para suas impressoras 3D UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -2884,18 +2885,18 @@ msgstr "Carregar mais"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Complemento Verificado Ultimaker"
+msgid "UltiMaker Verified Plug-in"
+msgstr "Complemento Verificado UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Material Certificado Ultimaker"
+msgid "UltiMaker Certified Material"
+msgstr "Material Certificado UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Pacote Verificado Ultimaker"
+msgid "UltiMaker Verified Package"
+msgstr "Pacote Verificado UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -2904,7 +2905,7 @@ msgstr "Gerir pacotes"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:15
 msgctxt "@text"
-msgid "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
+msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly."
 msgstr "Gerencie seu complementos e perfis de materiais do Cura aqui. Se assegure de manter seus complementos atualizados e fazer backup de sua configuração regularmente."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
@@ -4135,8 +4136,8 @@ msgstr "Privacidade"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:862
 msgctxt "@info:tooltip"
-msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
-msgstr "Dados anônimos sobre sua impressão podem ser enviados para a Ultimaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados."
+msgid "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored."
+msgstr "Dados anônimos sobre sua impressão podem ser enviados para a UltiMaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4442,8 +4443,8 @@ msgstr "Resolução de problemas"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64 /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Entre na plataforma Ultimaker"
+msgid "Sign in to the UltiMaker platform"
+msgstr "Entre na plataforma UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4457,8 +4458,8 @@ msgstr "Fazer backup e sincronizar seus ajustes de materiais e plugins"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Compartilhe ideias e consiga ajuda de mais de 48.000 usuários da Comunidade Ultimaker"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "Compartilhe ideias e consiga ajuda de mais de 48.000 usuários da Comunidade UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4467,18 +4468,18 @@ msgstr "Pular"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "Criar uma conta Ultimaker gratuita"
+msgid "Create a free UltiMaker Account"
+msgstr "Criar uma conta UltiMaker gratuita"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Nos ajude a melhor o Ultimaker Cura"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "Nos ajude a melhor o UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
-msgid "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:"
-msgstr "O Ultimaker Cura coleta dados anônimos para melhor a qualidade de impressão e experiência do usuário, incluindo:"
+msgid "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:"
+msgstr "O UltiMaker Cura coleta dados anônimos para melhor a qualidade de impressão e experiência do usuário, incluindo:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4502,8 +4503,8 @@ msgstr "Ajustes de impressão"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:99
 msgctxt "@text"
-msgid "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Dados coletados pelo Ultimaker Cura não conterão nenhuma informação pessoal."
+msgid "Data collected by UltiMaker Cura will not contain any personal information."
+msgstr "Dados coletados pelo UltiMaker Cura não conterão nenhuma informação pessoal."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4572,8 +4573,8 @@ msgstr "Não foi possível conectar ao dispositivo."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196 /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "Não consegue conectar à sua impressora Ultimaker?"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "Não consegue conectar à sua impressora UltiMaker?"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4592,13 +4593,13 @@ msgstr "Conectar"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Bem-vindo ao Ultimaker Cura"
+msgid "Welcome to UltiMaker Cura"
+msgstr "Bem-vindo ao UltiMaker Cura"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
-msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments."
-msgstr "Por favor siga estes passos para configurar o Ultimaker Cura. Isto tomará apenas alguns momentos."
+msgid "Please follow these steps to set up UltiMaker Cura. This will only take a few moments."
+msgstr "Por favor siga estes passos para configurar o UltiMaker Cura. Isto tomará apenas alguns momentos."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5279,7 +5280,7 @@ msgstr "Solução completa para impressão 3D com filamento fundido."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
 msgstr ""
 "Cura é desenvolvido pela Ultimaker B.V. em cooperação com a comunidade.\n"
@@ -5487,23 +5488,23 @@ msgstr "Monitora trabalhos de impressão e reimprime a partir do histórico."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "Estende o Ultimaker Cura com complementos e perfis de material."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "Estende o UltiMaker Cura com complementos e perfis de material."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Torne-se um especialista em impressão 3D com Ultimaker e-learning."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "Torne-se um especialista em impressão 3D com UltiMaker e-learning."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Suporte Ultimaker"
+msgid "UltiMaker support"
+msgstr "Suporte UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Saiba como começar com o Ultimaker Cura."
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "Saiba como começar com o UltiMaker Cura."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5512,8 +5513,8 @@ msgstr "Fazer uma pergunta"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Consultar a Comunidade Ultimaker."
+msgid "Consult the UltiMaker Community."
+msgstr "Consultar a Comunidade UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5527,8 +5528,8 @@ msgstr "Deixe os desenvolvedores saberem que algo está errado."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Visita o website da Ultimaker."
+msgid "Visit the UltiMaker website."
+msgstr "Visita o website da UltiMaker."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -5819,8 +5820,8 @@ msgstr ""
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "Criar uma conta Ultimaker gratuita"
+msgid "Create a free UltiMaker account"
+msgstr "Criar uma conta UltiMaker gratuita"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -5834,8 +5835,8 @@ msgstr "Última atualização: %1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Conta na Ultimaker"
+msgid "UltiMaker Account"
+msgstr "Conta na UltiMaker"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6049,13 +6050,13 @@ msgstr "Pós-processamento"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Administra conexões de rede a impressora Ultimaker conectadas."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "Administra conexões de rede a impressora UltiMaker conectadas."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Conexão de Rede Ultimaker"
+msgid "UltiMaker Network Connection"
+msgstr "Conexão de Rede UltiMaker"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6089,8 +6090,8 @@ msgstr "Informação de fatiamento"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Provê suporte para a escrita de Ultimaker Format Packages (Pacotes de Formato da Ultimaker)."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "Provê suporte para a escrita de UltiMaker Format Packages (Pacotes de Formato da Ultimaker)."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6105,7 +6106,7 @@ msgstr "Conecta-se à Digital Library, permitindo ao Cura abrir arquivos dela e
 #: /DigitalLibrary/plugin.json
 msgctxt "name"
 msgid "Ultimaker Digital Library"
-msgstr "Digital Library da Ultimaker"
+msgstr "Digital Library da UltiMaker"
 
 #: /GCodeProfileReader/plugin.json
 msgctxt "description"
@@ -6139,13 +6140,13 @@ msgstr "Leitor Trimesh"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "description"
-msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
-msgstr "Provê ações de máquina para impressoras da Ultimaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)."
+msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc.)."
+msgstr "Provê ações de máquina para impressoras da UltiMaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)."
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Ações de máquina Ultimaker"
+msgid "UltiMaker machine actions"
+msgstr "Ações de máquina UltiMaker"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6159,8 +6160,8 @@ msgstr "Leitor de G-Code Comprimido"
 
 #: /Marketplace/plugin.json
 msgctxt "description"
-msgid "Manages extensions to the application and allows browsing extensions from the Ultimaker website."
-msgstr "Gerencia extensões à aplicação e permite navegar extensões do sítio web da Ultimaker."
+msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website."
+msgstr "Gerencia extensões à aplicação e permite navegar extensões do sítio web da UltiMaker."
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6509,8 +6510,8 @@ msgstr "Gerador de G-Code"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Provê suporte a leitura de Pacotes de Formato Ultimaker (UFP)."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "Provê suporte a leitura de Pacotes de Formato UltiMaker (UFP)."
 
 #: /UFPReader/plugin.json
 msgctxt "name"
@@ -6825,8 +6826,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Email"
 
 #~ msgctxt "@description"
-#~ msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
-#~ msgstr "Por favor se logue para adquirir complementos e materiais verificados para o Ultimaker Cura Enterprise"
+#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise"
+#~ msgstr "Por favor se logue para adquirir complementos e materiais verificados para o UltiMaker Cura Enterprise"
 
 #~ msgctxt "@label"
 #~ msgid "Version"
@@ -6983,16 +6984,16 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Provê a Visão Simulada."
 
 #~ msgctxt "@info:status"
-#~ msgid "Send and monitor print jobs from anywhere using your Ultimaker account."
-#~ msgstr "Envia e monitora trabalhos de impressão de qualquer lugar usando sua conta Ultimaker."
+#~ msgid "Send and monitor print jobs from anywhere using your UltiMaker account."
+#~ msgstr "Envia e monitora trabalhos de impressão de qualquer lugar usando sua conta UltiMaker."
 
 #~ msgctxt "@info:status Ultimaker Cloud should not be translated."
 #~ msgid "Connect to Ultimaker Digital Factory"
 #~ msgstr "Conectar à Ultimaker Digital Factory"
 
 #~ msgctxt "@info"
-#~ msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura."
-#~ msgstr "Feeds de webcam para impressoras de nuvem não podem ser vistos pelo Ultimaker Cura."
+#~ msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura."
+#~ msgstr "Feeds de webcam para impressoras de nuvem não podem ser vistos pelo UltiMaker Cura."
 
 #~ msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!"
 #~ msgid "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, it is recommended to update the firmware on your printer to version {latest_version}."
@@ -7059,8 +7060,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Finalizar"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker Account"
-#~ msgstr "Conta da Ultimaker"
+#~ msgid "UltiMaker Account"
+#~ msgstr "Conta da UltiMaker"
 
 #~ msgctxt "@text"
 #~ msgid "Your key to connected 3D printing"
@@ -7075,8 +7076,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "- Flexibilize-se ao sincronizar sua configuração e a acessar de qualquer lugar"
 
 #~ msgctxt "@text"
-#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers"
-#~ msgstr "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras Ultimaker"
+#~ msgid "- Increase efficiency with a remote workflow on UltiMaker printers"
+#~ msgstr "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras UltiMaker"
 
 #~ msgctxt "@text"
 #~ msgid ""
@@ -7087,8 +7088,8 @@ msgstr "Estágio de Preparação"
 #~ "o Ultimaker Cura. Isto tomará apenas alguns momentos."
 
 #~ msgctxt "@label"
-#~ msgid "What's new in Ultimaker Cura"
-#~ msgstr "O que há de novo no Ultimaker Cura"
+#~ msgid "What's new in UltiMaker Cura"
+#~ msgstr "O que há de novo no UltiMaker Cura"
 
 #~ msgctxt "@label ({} is object name)"
 #~ msgid "Are you sure you wish to remove {}? This cannot be undone!"
@@ -7120,11 +7121,11 @@ msgstr "Estágio de Preparação"
 
 #~ msgctxt "info:status"
 #~ msgid "<ul>{}</ul>To establish a connection, please visit the <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>."
-#~ msgstr "<ul>{}</ul>Para estabelecer uma conexão, por favor visite a <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>."
+#~ msgstr "<ul>{}</ul>Para estabelecer uma conexão, por favor visite a <a href='https://mycloud.UltiMaker.com/'>Ultimaker Digital Factory</a>."
 
 #~ msgctxt "@label ({} is printer name)"
 #~ msgid "{} will be removed until the next account sync. <br> To remove {} permanently, visit <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>. <br><br>Are you sure you want to remove {} temporarily?"
-#~ msgstr "{} será removida até a próxima sincronização de conta. <br> Para remover {} permanentemente, visite a <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>. <br><br>Tem certeza que deseja remover {} temporariamente?"
+#~ msgstr "{} será removida até a próxima sincronização de conta. <br> Para remover {} permanentemente, visite a <a href='https://mycloud.UltiMaker.com/'>Ultimaker Digital Factory</a>. <br><br>Tem certeza que deseja remover {} temporariamente?"
 
 #~ msgctxt "@label"
 #~ msgid ""
@@ -7199,8 +7200,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Conectado por Nuvem"
 
 #~ msgctxt "@info:status Ultimaker Cloud should not be translated."
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Conectar à Nuvem Ultimaker"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Conectar à Nuvem UltiMaker"
 
 #~ msgctxt "@label"
 #~ msgid "You need to login first before you can rate"
@@ -7227,16 +7228,16 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Autor"
 
 #~ msgctxt "@description"
-#~ msgid "Get plugins and materials verified by Ultimaker"
-#~ msgstr "Obter complementos e materiais verificados pela Ultimaker"
+#~ msgid "Get plugins and materials verified by UltiMaker"
+#~ msgstr "Obter complementos e materiais verificados pela UltiMaker"
 
 #~ msgctxt "@label The argument is a username."
 #~ msgid "Hi %1"
 #~ msgstr "Oi, %1"
 
 #~ msgctxt "@button"
-#~ msgid "Ultimaker account"
-#~ msgstr "Conta da Ultimaker"
+#~ msgid "UltiMaker account"
+#~ msgstr "Conta da UltiMaker"
 
 #~ msgctxt "@button"
 #~ msgid "Sign out"
@@ -7331,20 +7332,20 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Idioma:"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker Cloud"
-#~ msgstr "Ultimaker Cloud"
+#~ msgid "UltiMaker Cloud"
+#~ msgstr "UltiMaker Cloud"
 
 #~ msgctxt "@text"
 #~ msgid "The next generation 3D printing workflow"
 #~ msgstr "O fluxo de trabalho da nova geração de impressão 3D"
 
 #~ msgctxt "@text"
-#~ msgid "- Send print jobs to Ultimaker printers outside your local network"
-#~ msgstr "- Enviar trabalhos de impressão a impressoras Ultimaker fora da sua rede local"
+#~ msgid "- Send print jobs to UltiMaker printers outside your local network"
+#~ msgstr "- Enviar trabalhos de impressão a impressoras UltiMaker fora da sua rede local"
 
 #~ msgctxt "@text"
-#~ msgid "- Store your Ultimaker Cura settings in the cloud for use anywhere"
-#~ msgstr "- Armazenar seus ajustes do Ultimaker Cura na nuvem para uso em qualquer local"
+#~ msgid "- Store your UltiMaker Cura settings in the cloud for use anywhere"
+#~ msgstr "- Armazenar seus ajustes do UltiMaker Cura na nuvem para uso em qualquer local"
 
 #~ msgctxt "@text"
 #~ msgid "- Get exclusive access to print profiles from leading brands"
@@ -7431,8 +7432,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Mostrar Todos Os Ajustes"
 
 #~ msgctxt "@title:window"
-#~ msgid "Ultimaker Cura"
-#~ msgstr "Ultimaker Cura"
+#~ msgid "UltiMaker Cura"
+#~ msgstr "UltiMaker Cura"
 
 #~ msgctxt "@title:window"
 #~ msgid "About Cura"
@@ -7515,8 +7516,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Lista de verificação"
 
 #~ msgctxt "@label"
-#~ msgid "Please select any upgrades made to this Ultimaker 2."
-#~ msgstr "Por favor selecione quaisquer atualizações feitas nesta Ultimaker 2."
+#~ msgid "Please select any upgrades made to this UltiMaker 2."
+#~ msgstr "Por favor selecione quaisquer atualizações feitas nesta UltiMaker 2."
 
 #~ msgctxt "@label"
 #~ msgid "Olsson Block"
@@ -7639,8 +7640,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Não foi possível iniciar novo trabalho de impressão."
 
 #~ msgctxt "@label"
-#~ msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing."
-#~ msgstr "Há um problema com a configuração de sua Ultimaker, o que torna impossível iniciar a impressão. Por favor resolva este problema antes de continuar."
+#~ msgid "There is an issue with the configuration of your UltiMaker, which makes it impossible to start the print. Please resolve this issues before continuing."
+#~ msgstr "Há um problema com a configuração de sua UltiMaker, o que torna impossível iniciar a impressão. Por favor resolva este problema antes de continuar."
 
 #~ msgctxt "@window:title"
 #~ msgid "Mismatched configuration"
@@ -7731,20 +7732,20 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Houve um erro ao conectar à nuvem."
 
 #~ msgctxt "@info:status"
-#~ msgid "Uploading via Ultimaker Cloud"
-#~ msgstr "Transferindo via Ultimaker Cloud"
+#~ msgid "Uploading via UltiMaker Cloud"
+#~ msgstr "Transferindo via UltiMaker Cloud"
 
 #~ msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated."
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Conectar à Ultimaker Cloud"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Conectar à UltiMaker Cloud"
 
 #~ msgctxt "@action"
 #~ msgid "Don't ask me again for this printer."
 #~ msgstr "Não me pergunte novamente para esta impressora."
 
 #~ msgctxt "@info:status"
-#~ msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account."
-#~ msgstr "Você agora pode enviar e monitorar trabalhoas de impressão de qualquer lugar usando sua conta Ultimaker."
+#~ msgid "You can now send and monitor print jobs from anywhere using your UltiMaker account."
+#~ msgstr "Você agora pode enviar e monitorar trabalhoas de impressão de qualquer lugar usando sua conta UltiMaker."
 
 #~ msgctxt "@info:status"
 #~ msgid "Connected!"
@@ -7790,8 +7791,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Ortogonal"
 
 #~ msgctxt "description"
-#~ msgid "Manages network connections to Ultimaker 3 printers."
-#~ msgstr "Gerencia conexões de rede a impressoras Ultimaker 3."
+#~ msgid "Manages network connections to UltiMaker 3 printers."
+#~ msgstr "Gerencia conexões de rede a impressoras UltiMaker 3."
 
 #~ msgctxt "name"
 #~ msgid "UM3 Network Connection"
@@ -7895,8 +7896,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Enviando dados ao cluster remoto"
 
 #~ msgctxt "@info:status"
-#~ msgid "Connect to Ultimaker Cloud"
-#~ msgstr "Conectar à Ultimaker Cloud"
+#~ msgid "Connect to UltiMaker Cloud"
+#~ msgstr "Conectar à UltiMaker Cloud"
 
 #~ msgctxt "@info"
 #~ msgid "Cura collects anonymized usage statistics."
@@ -8031,20 +8032,20 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Por favor selecione uma impressora conectada à rede para monitorar."
 
 #~ msgctxt "@info"
-#~ msgid "Please connect your Ultimaker printer to your local network."
-#~ msgstr "Por favor conecte sua impressora Ultimaker à sua rede local."
+#~ msgid "Please connect your UltiMaker printer to your local network."
+#~ msgstr "Por favor conecte sua impressora UltiMaker à sua rede local."
 
 #~ msgctxt "@text:window"
-#~ msgid "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent."
-#~ msgstr "O Cura envia dados anonimamente para a Ultimaker de modo a aprimorar a qualidade de impressão e experiência de usuário. Abaixo há um exemplo de todos os dados que são enviados."
+#~ msgid "Cura sends anonymous data to UltiMaker in order to improve the print quality and user experience. Below is an example of all the data that is sent."
+#~ msgstr "O Cura envia dados anonimamente para a UltiMaker de modo a aprimorar a qualidade de impressão e experiência de usuário. Abaixo há um exemplo de todos os dados que são enviados."
 
 #~ msgctxt "@text:window"
 #~ msgid "I don't want to send this data"
 #~ msgstr "Não desejo enviar estes dados"
 
 #~ msgctxt "@text:window"
-#~ msgid "Allow sending this data to Ultimaker and help us improve Cura"
-#~ msgstr "Permitir enviar estes dados à Ultimaker para ajudar a melhorar o Cura"
+#~ msgid "Allow sending this data to UltiMaker and help us improve Cura"
+#~ msgstr "Permitir enviar estes dados à UltiMaker para ajudar a melhorar o Cura"
 
 #~ msgctxt "@label"
 #~ msgid "No print selected"
@@ -8246,8 +8247,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Eu não quero enviar estes dados"
 
 #~ msgctxt "@text:window"
-#~ msgid "Allow sending these data to Ultimaker and help us improve Cura"
-#~ msgstr "Permite o envio destes dados para a Ultimaker e nos auxilia a aprimorar o Cura"
+#~ msgid "Allow sending these data to UltiMaker and help us improve Cura"
+#~ msgstr "Permite o envio destes dados para a UltiMaker e nos auxilia a aprimorar o Cura"
 
 #~ msgctxt "@label"
 #~ msgid "Printer type:"
@@ -8442,8 +8443,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Aderência à Mesa de Impressão"
 
 #~ msgctxt "@label"
-#~ msgid "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>"
-#~ msgstr "Precisa de ajuda para melhorar sua impressões?<br>Leia os <a href='%1'>Guias de Resolução de Problema da Ultimaker</a>"
+#~ msgid "Need help improving your prints?<br>Read the <a href='%1'>UltiMaker Troubleshooting Guides</a>"
+#~ msgstr "Precisa de ajuda para melhorar sua impressões?<br>Leia os <a href='%1'>Guias de Resolução de Problema da UltiMaker</a>"
 
 #~ msgctxt "@title:window"
 #~ msgid "Engine Log"
@@ -8462,8 +8463,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Verificar compatibilidade"
 
 #~ msgctxt "@tooltip"
-#~ msgid "Click to check the material compatibility on Ultimaker.com."
-#~ msgstr "Clique para verificar a compatibilidade do material em Ultimaker.com."
+#~ msgid "Click to check the material compatibility on UltiMaker.com."
+#~ msgstr "Clique para verificar a compatibilidade do material em UltiMaker.com."
 
 #~ msgctxt "description"
 #~ msgid "Shows changes since latest checked version."
@@ -8582,16 +8583,16 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Contato"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is not set up to host a group of Ultimaker 3 printers."
-#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras Ultimaker 3."
+#~ msgid "This printer is not set up to host a group of UltiMaker 3 printers."
+#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras UltiMaker 3."
 
 #~ msgctxt "@label"
-#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers."
-#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras Ultimaker 3."
+#~ msgid "This printer is the host for a group of %1 UltiMaker 3 printers."
+#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras UltiMaker 3."
 
 #~ msgctxt "@label: arg 1 is group name"
-#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers"
-#~ msgstr "%1 não está configurada para hospedar um grupo de impressora Ultimaker 3 conectadas"
+#~ msgid "%1 is not set up to host a group of connected UltiMaker 3 printers"
+#~ msgstr "%1 não está configurada para hospedar um grupo de impressora UltiMaker 3 conectadas"
 
 #~ msgctxt "@label link to connect manager"
 #~ msgid "Add/Remove printers"
@@ -8857,12 +8858,12 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Navegador de complementos"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker 3"
-#~ msgstr "Ultimaker 3"
+#~ msgid "UltiMaker 3"
+#~ msgstr "UltiMaker 3"
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker 3 Extended"
-#~ msgstr "Ultimaker 3 Extended"
+#~ msgid "UltiMaker 3 Extended"
+#~ msgstr "UltiMaker 3 Extended"
 
 #~ msgctxt "@title:window"
 #~ msgid "SolidWorks: Export wizard"
@@ -9013,8 +9014,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Provê um modo de alterar as configurações da máquina (tais como volume de impressão, tamanho de bico, etc)"
 
 #~ msgctxt "description"
-#~ msgid "Manages network connections to Ultimaker 3 printers"
-#~ msgstr "Gerencia conexões de rede a impressoras Ultimaker 3"
+#~ msgid "Manages network connections to UltiMaker 3 printers"
+#~ msgstr "Gerencia conexões de rede a impressoras UltiMaker 3"
 
 #~ msgctxt "description"
 #~ msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations."
@@ -9053,8 +9054,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Pergunta ao usuário uma única vez sobre concordância com a licença"
 
 #~ msgctxt "description"
-#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)"
-#~ msgstr "Provê ações de máquina para Ultimaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc)"
+#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)"
+#~ msgstr "Provê ações de máquina para UltiMaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc)"
 
 #~ msgctxt "@item:inlistbox"
 #~ msgid "GCode File"
@@ -9160,12 +9161,12 @@ msgstr "Estágio de Preparação"
 #~ msgid "Resuming print..."
 #~ msgstr "Continuando impressão..."
 
-#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers."
-#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras Ultimaker 3 conectadas."
+#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers."
+#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras UltiMaker 3 conectadas."
 
 #~ msgctxt "Count is number of printers."
-#~ msgid "This printer is the host for a group of {count} connected Ultimaker 3 printers."
-#~ msgstr "Esta impressora hospeda um grupo de {count} impressoras Ultimaker 3 conectadas."
+#~ msgid "This printer is the host for a group of {count} connected UltiMaker 3 printers."
+#~ msgstr "Esta impressora hospeda um grupo de {count} impressoras UltiMaker 3 conectadas."
 
 #~ msgid "{printer_name} has finished printing '{job_name}'. Please collect the print and confirm clearing the build plate."
 #~ msgstr "{printer_name} acabou de imprimir '{job_name}'. Por favor colete a impressão e confirme esvaziamento da mesa."
@@ -9174,8 +9175,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "{printer_name} está reservada para imprimir '{job_name}'. Por favor altere a configuração da impressora para combinar com este trabalho para que ela comece a imprimir."
 
 #~ msgctxt "@info:status"
-#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected Ultimaker 3 printers."
-#~ msgstr "Incapaz de enviar novo trabalho de impressão: esta impressora 3D (ainda) não está configurada para hospedar um grupo de impressoras Ultimaker 3 conectadas."
+#~ msgid "Unable to send new print job: this 3D printer is not (yet) set up to host a group of connected UltiMaker 3 printers."
+#~ msgstr "Incapaz de enviar novo trabalho de impressão: esta impressora 3D (ainda) não está configurada para hospedar um grupo de impressoras UltiMaker 3 conectadas."
 
 #~ msgctxt "@info:status"
 #~ msgid "Unable to send print job to group {cluster_name}."
@@ -9300,12 +9301,12 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Código de erro desconhecido: %1"
 
 #~ msgctxt "@label Printer name"
-#~ msgid "Ultimaker 3"
-#~ msgstr "Ultimaker 3"
+#~ msgid "UltiMaker 3"
+#~ msgstr "UltiMaker 3"
 
 #~ msgctxt "@label Printer name"
-#~ msgid "Ultimaker 3 Extended"
-#~ msgstr "Ultimaker 3 Extended"
+#~ msgid "UltiMaker 3 Extended"
+#~ msgstr "UltiMaker 3 Extended"
 
 #~ msgctxt "@label Printer status"
 #~ msgid "Unknown"
@@ -9580,12 +9581,12 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Ok"
 
 #~ msgctxt "@label"
-#~ msgid "This printer is not set up to host a group of connected Ultimaker 3 printers"
-#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras Ultimaker 3 conectadas."
+#~ msgid "This printer is not set up to host a group of connected UltiMaker 3 printers"
+#~ msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras UltiMaker 3 conectadas."
 
 #~ msgctxt "@label"
-#~ msgid "This printer is the host for a group of %1 connected Ultimaker 3 printers"
-#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras Ultimaker 3 conectadas"
+#~ msgid "This printer is the host for a group of %1 connected UltiMaker 3 printers"
+#~ msgstr "Esta impressora hospeda um grupo de %1 impressoras UltiMaker 3 conectadas"
 
 #~ msgctxt "@label"
 #~ msgid "Completed on: "
@@ -9901,8 +9902,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Provê suporte a conexão a quente e gravação em unidade removível."
 
 #~ msgctxt "@info:whatsthis"
-#~ msgid "Manages network connections to Ultimaker 3 printers"
-#~ msgstr "Gerencia as conexões de rede em impressoras Ultimaker 3"
+#~ msgid "Manages network connections to UltiMaker 3 printers"
+#~ msgstr "Gerencia as conexões de rede em impressoras UltiMaker 3"
 
 #~ msgctxt "@label"
 #~ msgid "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}"
@@ -10065,12 +10066,12 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Provê suporte para escrever arquivos 3MF."
 
 #~ msgctxt "@label"
-#~ msgid "Ultimaker machine actions"
-#~ msgstr "Ações de máquina Ultimaker"
+#~ msgid "UltiMaker machine actions"
+#~ msgstr "Ações de máquina UltiMaker"
 
 #~ msgctxt "@info:whatsthis"
-#~ msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc)"
-#~ msgstr "Provê ações de máquina para impressoras Ultimaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)"
+#~ msgid "Provides machine actions for UltiMaker machines (such as bed leveling wizard, selecting upgrades, etc)"
+#~ msgstr "Provê ações de máquina para impressoras UltiMaker (tais como assistente de nivelamento de mesa, seleção de atualizações, etc.)"
 
 #~ msgctxt "@label"
 #~ msgid "Cura Profile Reader"
@@ -10109,8 +10110,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Se a sua impressora não está listada, leia o <a href='%1'>guia de resolução de problemas em impressão de rede</a>"
 
 #~ msgctxt "@item:inlistbox"
-#~ msgid "Ultimaker"
-#~ msgstr "Ultimaker"
+#~ msgid "UltiMaker"
+#~ msgstr "UltiMaker"
 
 #~ msgctxt "@label"
 #~ msgid "Support library for scientific computing "
@@ -10259,8 +10260,8 @@ msgstr "Estágio de Preparação"
 #~ msgstr "Habilitar estruturas de suporte. Estas estruturas apóiam partes do modelo que tenham seções pendentes."
 
 #~ msgctxt "@label"
-#~ msgid "Need help improving your prints? Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>"
-#~ msgstr "Precisa de ajuda para melhorar suas impressões? Leia o <a href='%1'>Guia de Solução de Problemas da Ultimaker</a>."
+#~ msgid "Need help improving your prints? Read the <a href='%1'>UltiMaker Troubleshooting Guides</a>"
+#~ msgstr "Precisa de ajuda para melhorar suas impressões? Leia o <a href='%1'>Guia de Solução de Problemas da UltiMaker</a>."
 
 #~ msgctxt "@info:status"
 #~ msgid "Connected over the network to {0}. Please approve the access request on the printer."

resources/i18n/pt_PT/cura.po

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

resources/i18n/ru_RU/cura.po

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

resources/i18n/tr_TR/cura.po

@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Cura
+# Copyright (C) 2022 UltiMaker.
+# This file is distributed under the same license as the Cura package.
+# Ultimaker <plugins@ultimaker.com>, 2022.
 #
 #, fuzzy
 msgid ""
@@ -443,8 +443,8 @@ msgstr "Yeni bir oturum açma işlemi başlatılamıyor. Başka bir aktif oturum
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:277
 msgctxt "@info"
-msgid "Unable to reach the Ultimaker account server."
-msgstr "Ultimaker hesabı sunucusuna ulaşılamadı."
+msgid "Unable to reach the UltiMaker account server."
+msgstr "UltiMaker hesabı sunucusuna ulaşılamadı."
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/OAuth2/AuthorizationService.py:278
 msgctxt "@info:title"
@@ -729,14 +729,14 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</"
 "p>\n"
 "                "
-msgstr "<p><b>Ultimaker Cura doğru görünmeyen bir şeyle karşılaştı.</p></b>\n                    <p>Başlatma esnasında kurtarılamaz bir hata ile karşılaştık. Muhtemelen"
+msgstr "<p><b>UltiMaker Cura doğru görünmeyen bir şeyle karşılaştı.</p></b>\n                    <p>Başlatma esnasında kurtarılamaz bir hata ile karşılaştık. Muhtemelen"
 " bazı hatalı yapılandırma dosyalarından kaynaklanıyordu. Yapılandırmanızı yedekleyip sıfırlamanızı öneriyoruz.</p>\n                    <p>Yedekler yapılandırma"
 " klasöründe bulunabilir.</p>\n                    <p>Sorunu düzeltmek için lütfen bu Çökme Raporunu bize gönderin.</p>\n                "
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:122
 msgctxt "@action:button"
-msgid "Send crash report to Ultimaker"
-msgstr "Çökme raporunu Ultimaker’a gönder"
+msgid "Send crash report to UltiMaker"
+msgstr "Çökme raporunu UltiMaker’a gönder"
 
 #: /Users/c.lamboo/ultimaker/Cura/cura/CrashHandler.py:125
 msgctxt "@action:button"
@@ -936,7 +936,7 @@ msgstr "Ağ hatası"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py:13
 msgctxt "info:status"
-msgid "New printer detected from your Ultimaker account"
+msgid "New printer detected from your UltiMaker account"
 msgid_plural "New printers detected from your Ultimaker account"
 msgstr[0] "Ultimaker hesabınızdan yeni yazıcı tespit edildi"
 msgstr[1] "Ultimaker hesabınızdan yeni yazıcılar tespit edildi"
@@ -1095,7 +1095,7 @@ msgctxt "@info:status"
 msgid ""
 "You are attempting to connect to a printer that is not running Ultimaker "
 "Connect. Please update the printer to the latest firmware."
-msgstr "Ultimaker Connect çalıştırmayan bir yazıcıya bağlanmaya çalışıyorsunuz. Lütfen yazıcının donanım yazılımını son sürüme güncelleyin."
+msgstr "UltiMaker Connect çalıştırmayan bir yazıcıya bağlanmaya çalışıyorsunuz. Lütfen yazıcının donanım yazılımını son sürüme güncelleyin."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21
 msgctxt "@info:title"
@@ -1323,8 +1323,8 @@ msgstr "UFP dosyasına yazamıyor:"
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPWriter/__init__.py:28
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UFPReader/__init__.py:22
 msgctxt "@item:inlistbox"
-msgid "Ultimaker Format Package"
-msgstr "Ultimaker Biçim Paketi"
+msgid "UltiMaker Format Package"
+msgstr "UltiMaker Biçim Paketi"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py:19
 msgctxt "@text Placeholder for the username if it has been deleted"
@@ -1447,8 +1447,8 @@ msgstr "Malzeme ve yazılım paketlerini hesabınızla senkronize etmek istiyor
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
 msgctxt "@info:title"
-msgid "Changes detected from your Ultimaker account"
-msgstr "Ultimaker hesabınızda değişiklik tespit edildi"
+msgid "Changes detected from your UltiMaker account"
+msgstr "UltiMaker hesabınızda değişiklik tespit edildi"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:147
 msgctxt "@action:button"
@@ -1610,8 +1610,8 @@ msgstr "Hata bildirin"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:169
 msgctxt "@message:description"
-msgid "Report a bug on Ultimaker Cura's issue tracker."
-msgstr "Ultimaker Cura'nın sorun izleyicisinde hata bildirin."
+msgid "Report a bug on UltiMaker Cura's issue tracker."
+msgstr "UltiMaker Cura'nın sorun izleyicisinde hata bildirin."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:401
 msgctxt "@info:status"
@@ -1759,7 +1759,7 @@ msgctxt "@info:error Don't translate the XML tag <filename>!"
 msgid ""
 "Project file <filename>{0}</filename> is made using profiles that are "
 "unknown to this version of Ultimaker Cura."
-msgstr "<filename>{0}</filename> proje dosyası, Ultimaker Cura'nın bu sürümünde bilinmeyen profiller kullanılarak yapılmış."
+msgstr "<filename>{0}</filename> proje dosyası, UltiMaker Cura'nın bu sürümünde bilinmeyen profiller kullanılarak yapılmış."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
@@ -2432,9 +2432,9 @@ msgstr "Kuyruğu uzaktan yönetmek için lütfen yazıcının donanım yazılım
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:287
 msgctxt "@info"
 msgid ""
-"Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura. Click "
+"Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click "
 "\"Manage printer\" to visit Ultimaker Digital Factory and view this webcam."
-msgstr "Bulut yazıcıları için web kamerası akışları Ultimaker Cura'dan görüntülenemez. Ultimaker Digital Factory'i ziyaret etmek ve bu web kamerasını görüntülemek"
+msgstr "Bulut yazıcıları için web kamerası akışları UltiMaker Cura'dan görüntülenemez. Ultimaker Digital Factory'i ziyaret etmek ve bu web kamerasını görüntülemek"
 " için \"Yazıcıyı Yönet\"i tıklayın."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:347
@@ -2817,7 +2817,7 @@ msgctxt "@text:window"
 msgid ""
 "Ultimaker Cura collects anonymous data in order to improve the print quality "
 "and user experience. Below is an example of all the data that is shared:"
-msgstr "Ultimaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Aşağıda, paylaşılan tüm verilerin bir örneği verilmiştir:"
+msgstr "UltiMaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Aşağıda, paylaşılan tüm verilerin bir örneği verilmiştir:"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:107
 msgctxt "@text:window"
@@ -2841,8 +2841,8 @@ msgstr "Cura projesini kaydet"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:30
 msgctxt "@label"
-msgid "Please select any upgrades made to this Ultimaker Original"
-msgstr "Lütfen Ultimaker Original’e yapılan herhangi bir yükseltmeyi seçin"
+msgid "Please select any upgrades made to this UltiMaker Original"
+msgstr "Lütfen UltiMaker Original’e yapılan herhangi bir yükseltmeyi seçin"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:39
 msgctxt "@label"
@@ -2948,7 +2948,7 @@ msgctxt "@text"
 msgid ""
 "Streamline your workflow and customize your Ultimaker Cura experience with "
 "plugins contributed by our amazing community of users."
-msgstr "Muhteşem kullanıcı topluluğumuzun katkıda bulunduğu eklentilerle iş akışınızı kolaylaştırın ve Ultimaker Cura deneyiminizi kendinize uygun hale getirin."
+msgstr "Muhteşem kullanıcı topluluğumuzun katkıda bulunduğu eklentilerle iş akışınızı kolaylaştırın ve UltiMaker Cura deneyiminizi kendinize uygun hale getirin."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
 msgctxt "@title"
@@ -3011,7 +3011,7 @@ msgctxt "@text"
 msgid ""
 "Select and install material profiles optimised for your Ultimaker 3D "
 "printers."
-msgstr "Ultimaker 3D yazıcılarınız için optimize edilmiş malzeme profillerini seçin ve yükleyin."
+msgstr "UltiMaker 3D yazıcılarınız için optimize edilmiş malzeme profillerini seçin ve yükleyin."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagePackagesButton.qml:32
 msgctxt "@info:tooltip"
@@ -3132,18 +3132,18 @@ msgstr "Daha fazla yükle"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:21
 msgctxt "@info"
-msgid "Ultimaker Verified Plug-in"
-msgstr "Ultimaker Tarafından Doğrulanmış Eklenti"
+msgid "UltiMaker Verified Plug-in"
+msgstr "UltiMaker Tarafından Doğrulanmış Eklenti"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:22
 msgctxt "@info"
-msgid "Ultimaker Certified Material"
-msgstr "Ultimaker Sertifikalı Malzeme"
+msgid "UltiMaker Certified Material"
+msgstr "UltiMaker Sertifikalı Malzeme"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/VerifiedIcon.qml:23
 msgctxt "@info"
-msgid "Ultimaker Verified Package"
-msgstr "Ultimaker Tarafından Doğrulanmış Paket"
+msgid "UltiMaker Verified Package"
+msgstr "UltiMaker Tarafından Doğrulanmış Paket"
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/ManagedPackages.qml:11
 msgctxt "@header"
@@ -3155,7 +3155,7 @@ msgctxt "@text"
 msgid ""
 "Manage your Ultimaker Cura plugins and material profiles here. Make sure to "
 "keep your plugins up to date and backup your setup regularly."
-msgstr "Ultimaker Cura eklentilerinizi ve malzeme profillerini burada yönetin. Eklentilerinizi güncel tuttuğunuzdan ve ayarınızı düzenli olarak yedeklediğinizden"
+msgstr "UltiMaker Cura eklentilerinizi ve malzeme profillerini burada yönetin. Eklentilerinizi güncel tuttuğunuzdan ve ayarınızı düzenli olarak yedeklediğinizden"
 " emin olun."
 
 #: /Users/c.lamboo/ultimaker/Cura/plugins/Marketplace/resources/qml/InstallMissingPackagesDialog.qml:15
@@ -4480,7 +4480,7 @@ msgid ""
 "Should anonymous data about your print be sent to Ultimaker? Note, no "
 "models, IP addresses or other personally identifiable information is sent or "
 "stored."
-msgstr "Yazdırmanızdaki anonim veriler Ultimaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz."
+msgstr "Yazdırmanızdaki anonim veriler UltiMaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Preferences/GeneralPage.qml:867
 msgctxt "@option:check"
@@ -4797,8 +4797,8 @@ msgstr "Sorun giderme"
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:64
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:19
 msgctxt "@label"
-msgid "Sign in to the Ultimaker platform"
-msgstr "Ultimaker platformuna giriş yapın"
+msgid "Sign in to the UltiMaker platform"
+msgstr "UltiMaker platformuna giriş yapın"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:123
 msgctxt "@text"
@@ -4812,8 +4812,8 @@ msgstr "Malzeme ayarlarınızı ve eklentilerinizi yedekleyin ve senkronize edin
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:175
 msgctxt "@text"
-msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community"
-msgstr "Ultimaker Topluluğunda fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın"
+msgid "Share ideas and get help from 48,000+ users in the UltiMaker Community"
+msgstr "UltiMaker Topluluğunda fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:189
 msgctxt "@button"
@@ -4822,20 +4822,20 @@ msgstr "Atla"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/CloudContent.qml:201
 msgctxt "@text"
-msgid "Create a free Ultimaker Account"
-msgstr "Ücretsiz Ultimaker Hesabı oluşturun"
+msgid "Create a free UltiMaker Account"
+msgstr "Ücretsiz UltiMaker Hesabı oluşturun"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:24
 msgctxt "@label"
-msgid "Help us to improve Ultimaker Cura"
-msgstr "Ultimaker Cura'yı geliştirmemiz yardım edin"
+msgid "Help us to improve UltiMaker Cura"
+msgstr "UltiMaker Cura'yı geliştirmemiz yardım edin"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:56
 msgctxt "@text"
 msgid ""
 "Ultimaker Cura collects anonymous data to improve print quality and user "
 "experience, including:"
-msgstr "Ultimaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Bu veriler aşağıdakileri içerir:"
+msgstr "UltiMaker Cura, yazdırma kalitesini ve kullanıcı deneyimini iyileştirmek için anonim veri toplar. Bu veriler aşağıdakileri içerir:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:68
 msgctxt "@text"
@@ -4861,7 +4861,7 @@ msgstr "Yazdırma ayarları"
 msgctxt "@text"
 msgid ""
 "Data collected by Ultimaker Cura will not contain any personal information."
-msgstr "Ultimaker Cura tarafından toplanan veriler herhangi bir kişisel bilgi içermeyecektir."
+msgstr "UltiMaker Cura tarafından toplanan veriler herhangi bir kişisel bilgi içermeyecektir."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:100
 msgctxt "@text"
@@ -4931,8 +4931,8 @@ msgstr "Cihaza bağlanılamadı."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:196
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:201
 msgctxt "@label"
-msgid "Can't connect to your Ultimaker printer?"
-msgstr "Ultimaker yazıcınıza bağlanamıyor musunuz?"
+msgid "Can't connect to your UltiMaker printer?"
+msgstr "UltiMaker yazıcınıza bağlanamıyor musunuz?"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:200
 msgctxt "@label"
@@ -4953,15 +4953,15 @@ msgstr "Bağlan"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56
 msgctxt "@label"
-msgid "Welcome to Ultimaker Cura"
-msgstr "Ultimaker Cura'ya hoş geldiniz"
+msgid "Welcome to UltiMaker Cura"
+msgstr "UltiMaker Cura'ya hoş geldiniz"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:67
 msgctxt "@text"
 msgid ""
 "Please follow these steps to set up Ultimaker Cura. This will only take a "
 "few moments."
-msgstr "Ultimaker Cura'yı kurmak\n için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir."
+msgstr "UltiMaker Cura'yı kurmak\n için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/WelcomePages/WelcomeContent.qml:82
 msgctxt "@button"
@@ -5659,9 +5659,9 @@ msgstr "Kaynaşık filaman 3B yazdırma için kalıcı çözüm."
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:87
 msgctxt "@info:credit"
 msgid ""
-"Cura is developed by Ultimaker B.V. in cooperation with the community.\n"
+"Cura is developed by UltiMaker in cooperation with the community.\n"
 "Cura proudly uses the following open source projects:"
-msgstr "Cura, topluluk iş birliği ile Ultimaker B.V. tarafından geliştirilmiştir.\nCura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:"
+msgstr "Cura, topluluk iş birliği ile UltiMaker B.V. tarafından geliştirilmiştir.\nCura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Dialogs/AboutDialog.qml:138
 msgctxt "@label Description for application component"
@@ -5866,23 +5866,23 @@ msgstr "Baskı işlerini takip edin ve baskı geçmişinizden yeniden baskı iş
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:55
 msgctxt "@tooltip:button"
-msgid "Extend Ultimaker Cura with plugins and material profiles."
-msgstr "Ultimaker Cura'yı eklentilerle ve malzeme profilleriyle genişletin."
+msgid "Extend UltiMaker Cura with plugins and material profiles."
+msgstr "UltiMaker Cura'yı eklentilerle ve malzeme profilleriyle genişletin."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:62
 msgctxt "@tooltip:button"
-msgid "Become a 3D printing expert with Ultimaker e-learning."
-msgstr "Ultimaker e-öğrenme ile 3D baskı uzmanı olun."
+msgid "Become a 3D printing expert with UltiMaker e-learning."
+msgstr "UltiMaker e-öğrenme ile 3D baskı uzmanı olun."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:67
 msgctxt "@label:button"
-msgid "Ultimaker support"
-msgstr "Ultimaker desteği"
+msgid "UltiMaker support"
+msgstr "UltiMaker desteği"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:69
 msgctxt "@tooltip:button"
-msgid "Learn how to get started with Ultimaker Cura."
-msgstr "Ultimaker Cura ile işe nasıl başlayacağınızı öğrenin."
+msgid "Learn how to get started with UltiMaker Cura."
+msgstr "UltiMaker Cura ile işe nasıl başlayacağınızı öğrenin."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:74
 msgctxt "@label:button"
@@ -5891,8 +5891,8 @@ msgstr "Soru gönder"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:76
 msgctxt "@tooltip:button"
-msgid "Consult the Ultimaker Community."
-msgstr "Ultimaker Topluluğundan yardım alın."
+msgid "Consult the UltiMaker Community."
+msgstr "UltiMaker Topluluğundan yardım alın."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:81
 msgctxt "@label:button"
@@ -5906,8 +5906,8 @@ msgstr "Geliştiricileri sorunlarla ilgili bilgilendirin."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml:90
 msgctxt "@tooltip:button"
-msgid "Visit the Ultimaker website."
-msgstr "Ultimaker web sitesini ziyaret edin."
+msgid "Visit the UltiMaker website."
+msgstr "UltiMaker web sitesini ziyaret edin."
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40
 msgctxt "@label"
@@ -6219,13 +6219,13 @@ msgid ""
 "- Add material profiles and plug-ins from the Marketplace\n"
 "- Back-up and sync your material profiles and plug-ins\n"
 "- Share ideas and get help from 48,000+ users in the Ultimaker community"
-msgstr "- Marketplace'den malzeme profilleri ve eklentiler ekleyin\n- Malzeme profillerinizi ve eklentilerinizi yedekleyin ve senkronize edin\n- Ultimaker topluluğunda"
+msgstr "- Marketplace'den malzeme profilleri ve eklentiler ekleyin\n- Malzeme profillerinizi ve eklentilerinizi yedekleyin ve senkronize edin\n- UltiMaker topluluğunda"
 " fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/GeneralOperations.qml:58
 msgctxt "@button"
-msgid "Create a free Ultimaker account"
-msgstr "Ücretsiz Ultimaker hesabı oluşturun"
+msgid "Create a free UltiMaker account"
+msgstr "Ücretsiz UltiMaker hesabı oluşturun"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/AccountWidget.qml:24
 msgctxt "@action:button"
@@ -6239,8 +6239,8 @@ msgstr "Son güncelleme: %1"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:107
 msgctxt "@button"
-msgid "Ultimaker Account"
-msgstr "Ultimaker hesabı"
+msgid "UltiMaker Account"
+msgstr "UltiMaker hesabı"
 
 #: /Users/c.lamboo/ultimaker/Cura/resources/qml/Account/UserOperations.qml:126
 msgctxt "@button"
@@ -6464,13 +6464,13 @@ msgstr "Son İşleme"
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "description"
-msgid "Manages network connections to Ultimaker networked printers."
-msgstr "Ultimaker ağındaki yazıcılar için ağ bağlantılarını yönetir."
+msgid "Manages network connections to UltiMaker networked printers."
+msgstr "UltiMaker ağındaki yazıcılar için ağ bağlantılarını yönetir."
 
 #: /UM3NetworkPrinting/plugin.json
 msgctxt "name"
-msgid "Ultimaker Network Connection"
-msgstr "Ultimaker Ağ Bağlantısı"
+msgid "UltiMaker Network Connection"
+msgstr "UltiMaker Ağ Bağlantısı"
 
 #: /3MFWriter/plugin.json
 msgctxt "description"
@@ -6504,8 +6504,8 @@ msgstr "Dilim bilgisi"
 
 #: /UFPWriter/plugin.json
 msgctxt "description"
-msgid "Provides support for writing Ultimaker Format Packages."
-msgstr "Ultimaker Biçim Paketleri yazmak için destek sağlar."
+msgid "Provides support for writing UltiMaker Format Packages."
+msgstr "UltiMaker Biçim Paketleri yazmak için destek sağlar."
 
 #: /UFPWriter/plugin.json
 msgctxt "name"
@@ -6559,12 +6559,12 @@ msgctxt "description"
 msgid ""
 "Provides machine actions for Ultimaker machines (such as bed leveling "
 "wizard, selecting upgrades, etc.)."
-msgstr "Ultimaker makineleri için makine eylemleri sunar (yatak dengeleme sihirbazı, yükseltme seçme vb.)"
+msgstr "UltiMaker makineleri için makine eylemleri sunar (yatak dengeleme sihirbazı, yükseltme seçme vb.)"
 
 #: /UltimakerMachineActions/plugin.json
 msgctxt "name"
-msgid "Ultimaker machine actions"
-msgstr "Ultimaker makine eylemleri"
+msgid "UltiMaker machine actions"
+msgstr "UltiMaker makine eylemleri"
 
 #: /GCodeGzReader/plugin.json
 msgctxt "description"
@@ -6581,7 +6581,7 @@ msgctxt "description"
 msgid ""
 "Manages extensions to the application and allows browsing extensions from "
 "the Ultimaker website."
-msgstr "Uygulamanın uzantılarını yönetir ve Ultimaker web sitesinden uzantıların incelenmesini sağlar."
+msgstr "Uygulamanın uzantılarını yönetir ve UltiMaker web sitesinden uzantıların incelenmesini sağlar."
 
 #: /Marketplace/plugin.json
 msgctxt "name"
@@ -6933,8 +6933,8 @@ msgstr "G-code Yazıcı"
 
 #: /UFPReader/plugin.json
 msgctxt "description"
-msgid "Provides support for reading Ultimaker Format Packages."
-msgstr "Ultimaker Biçim Paketlerinin okunması için destek sağlar."
+msgid "Provides support for reading UltiMaker Format Packages."
+msgstr "UltiMaker Biçim Paketlerinin okunması için destek sağlar."
 
 #: /UFPReader/plugin.json
 msgctxt "name"