Merge pull request #3 from Ghostkeeper/kaleidoscopeit-master

Implement version upgrade for Deltacomb printers

cura/Backups/BackupsManager.py

@@ -10,18 +10,23 @@ if TYPE_CHECKING:
     from cura.CuraApplication import CuraApplication
 
 
-##  The BackupsManager is responsible for managing the creating and restoring of
-#   back-ups.
-#
-#   Back-ups themselves are represented in a different class.
 class BackupsManager:
+    """
+    The BackupsManager is responsible for managing the creating and restoring of
+    back-ups.
+
+    Back-ups themselves are represented in a different class.
+    """
+
     def __init__(self, application: "CuraApplication") -> None:
         self._application = application
 
-    ##  Get a back-up of the current configuration.
-    #   \return A tuple containing a ZipFile (the actual back-up) and a dict
-    #   containing some metadata (like version).
     def createBackup(self) -> Tuple[Optional[bytes], Optional[Dict[str, str]]]:
+        """
+        Get a back-up of the current configuration.
+        :return: A tuple containing a ZipFile (the actual back-up) and a dict containing some metadata (like version).
+        """
+
         self._disableAutoSave()
         backup = Backup(self._application)
         backup.makeFromCurrent()
@@ -29,11 +34,13 @@ class BackupsManager:
         # We don't return a Backup here because we want plugins only to interact with our API and not full objects.
         return backup.zip_file, backup.meta_data
 
-    ##  Restore a back-up from a given ZipFile.
-    #   \param zip_file A bytes object containing the actual back-up.
-    #   \param meta_data A dict containing some metadata that is needed to
-    #   restore the back-up correctly.
     def restoreBackup(self, zip_file: bytes, meta_data: Dict[str, str]) -> None:
+        """
+        Restore a back-up from a given ZipFile.
+        :param zip_file: A bytes object containing the actual back-up.
+        :param meta_data: A dict containing some metadata that is needed to restore the back-up correctly.
+        """
+
         if not meta_data.get("cura_release", None):
             # If there is no "cura_release" specified in the meta data, we don't execute a backup restore.
             Logger.log("w", "Tried to restore a backup without specifying a Cura version number.")
@@ -48,9 +55,10 @@ class BackupsManager:
             # We don't want to store the data at this point as that would override the just-restored backup.
             self._application.windowClosed(save_data = False)
 
-    ##  Here we try to disable the auto-save plug-in as it might interfere with
-    #   restoring a back-up.
     def _disableAutoSave(self) -> None:
+        """Here we (try to) disable the saving as it might interfere with restoring a back-up."""
+
+        self._application.enableSave(False)
         auto_save = self._application.getAutoSave()
         # The auto save is only not created if the application has not yet started.
         if auto_save:
@@ -58,8 +66,10 @@ class BackupsManager:
         else:
             Logger.log("e", "Unable to disable the autosave as application init has not been completed")
 
-    ##  Re-enable auto-save after we're done.
     def _enableAutoSave(self) -> None:
+        """Re-enable auto-save and other saving after we're done."""
+
+        self._application.enableSave(True)
         auto_save = self._application.getAutoSave()
         # The auto save is only not created if the application has not yet started.
         if auto_save:

cura/BuildVolume.py

@@ -1128,7 +1128,7 @@ class BuildVolume(SceneNode):
     _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "initial_layer_line_width_factor"]
     _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap", "layer_0_z_overlap"]
     _extra_z_settings = ["retraction_hop_enabled", "retraction_hop"]
-    _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "extruder_prime_pos_z", "prime_blob_enable"]
+    _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "prime_blob_enable"]
     _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable"]
     _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"]
     _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts", "travel_avoid_supports"]

cura/CuraApplication.py

@@ -124,7 +124,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
-    SettingVersion = 11
+    SettingVersion = 13
 
     Created = False
 
@@ -242,6 +242,7 @@ class CuraApplication(QtApplication):
 
         # Backups
         self._auto_save = None  # type: Optional[AutoSave]
+        self._enable_save = True
 
         self._container_registry_class = CuraContainerRegistry
         # Redefined here in order to please the typing.
@@ -685,15 +686,20 @@ class CuraApplication(QtApplication):
             self._message_box_callback = None
             self._message_box_callback_arguments = []
 
+    def enableSave(self, enable: bool):
+        self._enable_save = enable
+
     # Cura has multiple locations where instance containers need to be saved, so we need to handle this differently.
     def saveSettings(self) -> None:
-        if not self.started:
+        if not self.started or not self._enable_save:
             # Do not do saving during application start or when data should not be saved on quit.
             return
         ContainerRegistry.getInstance().saveDirtyContainers()
         self.savePreferences()
 
     def saveStack(self, stack):
+        if not self._enable_save:
+            return
         ContainerRegistry.getInstance().saveContainer(stack)
 
     @pyqtSlot(str, result = QUrl)

cura/PlatformPhysics.py

@@ -1,9 +1,11 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from PyQt5.QtCore import QTimer
+from shapely.errors import TopologicalError  # To capture errors if Shapely messes up.
 
 from UM.Application import Application
+from UM.Logger import Logger
 from UM.Scene.SceneNode import SceneNode
 from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
 from UM.Math.Vector import Vector
@@ -136,7 +138,11 @@ class PlatformPhysics:
                             own_convex_hull = node.callDecoration("getConvexHull")
                             other_convex_hull = other_node.callDecoration("getConvexHull")
                             if own_convex_hull and other_convex_hull:
-                                overlap = own_convex_hull.translate(move_vector.x, move_vector.z).intersectsPolygon(other_convex_hull)
+                                try:
+                                    overlap = own_convex_hull.translate(move_vector.x, move_vector.z).intersectsPolygon(other_convex_hull)
+                                except TopologicalError as e:  # Can happen if the convex hull is degenerate?
+                                    Logger.warning("Got a topological error when calculating convex hull intersection: {err}".format(err = str(e)))
+                                    overlap = False
                                 if overlap:  # Moving ensured that overlap was still there. Try anew!
                                     temp_move_vector = move_vector.set(x = move_vector.x + overlap[0] * self._move_factor,
                                                                        z = move_vector.z + overlap[1] * self._move_factor)

cura/PrinterOutput/FirmwareUpdater.py

@@ -33,6 +33,10 @@ class FirmwareUpdater(QObject):
         else:
             self._firmware_file = firmware_file
 
+        if self._firmware_file == "":
+            self._setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error)
+            return
+        
         self._setFirmwareUpdateState(FirmwareUpdateState.updating)
 
         self._update_firmware_thread.start()

cura/Settings/MachineManager.py

@@ -684,7 +684,10 @@ class MachineManager(QObject):
             if other_machine_stacks:
                 self.setActiveMachine(other_machine_stacks[0]["id"])
 
-        metadata = CuraContainerRegistry.getInstance().findContainerStacksMetadata(id = machine_id)[0]
+        metadatas = CuraContainerRegistry.getInstance().findContainerStacksMetadata(id = machine_id)
+        if not metadatas:
+            return  # machine_id doesn't exist. Nothing to remove.
+        metadata = metadatas[0]
         ExtruderManager.getInstance().removeMachineExtruders(machine_id)
         containers = CuraContainerRegistry.getInstance().findInstanceContainersMetadata(type = "user", machine = machine_id)
         for container in containers:

plugins/3MFReader/ThreeMFReader.py

@@ -88,7 +88,10 @@ class ThreeMFReader(MeshReader):
     #   \returns Scene node.
     def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]:
         self._object_count += 1
-        node_name = "Object %s" % self._object_count
+
+        node_name = savitar_node.getName()
+        if node_name == "":
+            node_name = "Object %s" % self._object_count
 
         active_build_plate = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate
 

plugins/3MFWriter/ThreeMFWorkspaceWriter.py

@@ -10,6 +10,8 @@ from UM.Logger import Logger
 from UM.Preferences import Preferences
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Workspace.WorkspaceWriter import WorkspaceWriter
+from UM.i18n import i18nCatalog
+catalog = i18nCatalog("cura")
 
 from cura.Utils.Threading import call_on_qt_thread
 
@@ -26,6 +28,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
         mesh_writer = application.getMeshFileHandler().getWriter("3MFWriter")
 
         if not mesh_writer:  # We need to have the 3mf mesh writer, otherwise we can't save the entire workspace
+            self.setInformation(catalog.i18nc("@error:zip", "3MF Writer plug-in is corrupt."))
             Logger.error("3MF Writer class is unavailable. Can't write workspace.")
             return False
 
@@ -39,19 +42,24 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
 
         global_stack = machine_manager.activeMachine
 
-        # Add global container stack data to the archive.
-        self._writeContainerToArchive(global_stack, archive)
+        try:
+            # Add global container stack data to the archive.
+            self._writeContainerToArchive(global_stack, archive)
 
-        # Also write all containers in the stack to the file
-        for container in global_stack.getContainers():
-            self._writeContainerToArchive(container, archive)
-
-        # Check if the machine has extruders and save all that data as well.
-        for extruder_stack in global_stack.extruders.values():
-            self._writeContainerToArchive(extruder_stack, archive)
-            for container in extruder_stack.getContainers():
+            # Also write all containers in the stack to the file
+            for container in global_stack.getContainers():
                 self._writeContainerToArchive(container, archive)
 
+            # Check if the machine has extruders and save all that data as well.
+            for extruder_stack in global_stack.extruders.values():
+                self._writeContainerToArchive(extruder_stack, archive)
+                for container in extruder_stack.getContainers():
+                    self._writeContainerToArchive(container, archive)
+        except PermissionError:
+            self.setInformation(catalog.i18nc("@error:zip", "No permission to write the workspace here."))
+            Logger.error("No permission to write workspace to this stream.")
+            return False
+
         # Write preferences to archive
         original_preferences = Application.getInstance().getPreferences() #Copy only the preferences that we use to the workspace.
         temp_preferences = Preferences()
@@ -81,6 +89,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
             # Close the archive & reset states.
             archive.close()
         except PermissionError:
+            self.setInformation(catalog.i18nc("@error:zip", "No permission to write the workspace here."))
             Logger.error("No permission to write workspace to this stream.")
             return False
         mesh_writer.setStoreArchive(False)

plugins/3MFWriter/ThreeMFWriter.py

@@ -77,6 +77,7 @@ class ThreeMFWriter(MeshWriter):
             return
 
         savitar_node = Savitar.SceneNode()
+        savitar_node.setName(um_node.getName())
 
         node_matrix = um_node.getLocalTransformation()
 

plugins/CuraDrive/src/CreateBackupJob.py

@@ -5,7 +5,8 @@ import threading
 from datetime import datetime
 from typing import Any, Dict, Optional
 
-from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
+import sentry_sdk
+from PyQt5.QtNetwork import QNetworkReply
 
 from UM.Job import Job
 from UM.Logger import Logger
@@ -90,13 +91,27 @@ class CreateBackupJob(Job):
             scope = self._json_cloud_scope)
 
     def _onUploadSlotCompleted(self, reply: QNetworkReply, error: Optional["QNetworkReply.NetworkError"] = None) -> None:
-        if error is not None:
-            Logger.warning(str(error))
+        if HttpRequestManager.safeHttpStatus(reply) >= 300:
+            replyText = HttpRequestManager.readText(reply)
+            Logger.warning("Could not request backup upload: %s", replyText)
             self.backup_upload_error_message = self.DEFAULT_UPLOAD_ERROR_MESSAGE
+
+            if HttpRequestManager.safeHttpStatus(reply) == 400:
+                errors = json.loads(replyText)["errors"]
+                if "moreThanMaximum" in [error["code"] for error in errors if error["meta"] and error["meta"]["field_name"] == "backup_size"]:
+                    if self._backup_zip is None:  # will never happen; keep mypy happy
+                        zip_error = "backup is None."
+                    else:
+                        zip_error = "{} exceeds max size.".format(str(len(self._backup_zip)))
+                    sentry_sdk.capture_message("backup failed: {}".format(zip_error), level ="warning")
+                    self.backup_upload_error_message = catalog.i18nc("@error:file_size", "The backup exceeds the maximum file size.")
+                    from sentry_sdk import capture_message
+
             self._job_done.set()
             return
-        if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) >= 300:
-            Logger.warning("Could not request backup upload: %s", HttpRequestManager.readText(reply))
+
+        if error is not None:
+            Logger.warning("Could not request backup upload: %s", HttpRequestManager.qt_network_error_name(error))
             self.backup_upload_error_message = self.DEFAULT_UPLOAD_ERROR_MESSAGE
             self._job_done.set()
             return

plugins/ImageReader/ImageReaderUI.py

@@ -92,19 +92,30 @@ class ImageReaderUI(QObject):
     def onOkButtonClicked(self):
         self._cancelled = False
         self._ui_view.close()
-        self._ui_lock.release()
+        try:
+            self._ui_lock.release()
+        except RuntimeError:
+            # We don't really care if it was held or not. Just make sure it's not held now
+            pass
 
     @pyqtSlot()
     def onCancelButtonClicked(self):
         self._cancelled = True
         self._ui_view.close()
-        self._ui_lock.release()
+        try:
+            self._ui_lock.release()
+        except RuntimeError:
+            # We don't really care if it was held or not. Just make sure it's not held now
+            pass
 
     @pyqtSlot(str)
     def onWidthChanged(self, value):
         if self._ui_view and not self._disable_size_callbacks:
             if len(value) > 0:
-                self._width = float(value.replace(",", "."))
+                try:
+                    self._width = float(value.replace(",", "."))
+                except ValueError:  # Can happen with incomplete numbers, such as "-".
+                    self._width = 0
             else:
                 self._width = 0
 
@@ -117,7 +128,10 @@ class ImageReaderUI(QObject):
     def onDepthChanged(self, value):
         if self._ui_view and not self._disable_size_callbacks:
             if len(value) > 0:
-                self._depth = float(value.replace(",", "."))
+                try:
+                    self._depth = float(value.replace(",", "."))
+                except ValueError:  # Can happen with incomplete numbers, such as "-".
+                    self._depth = 0
             else:
                 self._depth = 0
 
@@ -128,15 +142,21 @@ class ImageReaderUI(QObject):
 
     @pyqtSlot(str)
     def onBaseHeightChanged(self, value):
-        if (len(value) > 0):
-            self.base_height = float(value.replace(",", "."))
+        if len(value) > 0:
+            try:
+                self.base_height = float(value.replace(",", "."))
+            except ValueError:  # Can happen with incomplete numbers, such as "-".
+                self.base_height = 0
         else:
             self.base_height = 0
 
     @pyqtSlot(str)
     def onPeakHeightChanged(self, value):
-        if (len(value) > 0):
-            self.peak_height = float(value.replace(",", "."))
+        if len(value) > 0:
+            try:
+                self.peak_height = float(value.replace(",", "."))
+            except ValueError:  # Can happen with incomplete numbers, such as "-".
+                self._width = 0
         else:
             self.peak_height = 0
 

plugins/PostProcessingPlugin/PostProcessingPlugin.py

@@ -1,23 +1,24 @@
 # Copyright (c) 2018 Jaime van Kessel, Ultimaker B.V.
 # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
-from typing import Dict, Type, TYPE_CHECKING, List, Optional, cast
-
-from UM.PluginRegistry import PluginRegistry
-from UM.Resources import Resources
-from UM.Application import Application
-from UM.Extension import Extension
-from UM.Logger import Logger
-
 import configparser  # The script lists are stored in metadata as serialised config files.
+import importlib.util
 import io  # To allow configparser to write to a string.
 import os.path
 import pkgutil
 import sys
-import importlib.util
+from typing import Dict, Type, TYPE_CHECKING, List, Optional, cast
 
+from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
+
+from UM.Application import Application
+from UM.Extension import Extension
+from UM.Logger import Logger
+from UM.PluginRegistry import PluginRegistry
+from UM.Resources import Resources
+from UM.Trust import Trust
 from UM.i18n import i18nCatalog
+from cura import ApplicationMetadata
 from cura.CuraApplication import CuraApplication
 
 i18n_catalog = i18nCatalog("cura")
@@ -161,7 +162,13 @@ class PostProcessingPlugin(QObject, Extension):
             # Iterate over all scripts.
             if script_name not in sys.modules:
                 try:
-                    spec = importlib.util.spec_from_file_location(__name__ + "." + script_name, os.path.join(path, script_name + ".py"))
+                    file_path = os.path.join(path, script_name + ".py")
+                    if not self._isScriptAllowed(file_path):
+                        Logger.warning("Skipped loading post-processing script {}: not trusted".format(file_path))
+                        continue
+
+                    spec = importlib.util.spec_from_file_location(__name__ + "." + script_name,
+                                                                  file_path)
                     loaded_script = importlib.util.module_from_spec(spec)
                     if spec.loader is None:
                         continue
@@ -334,4 +341,26 @@ class PostProcessingPlugin(QObject, Extension):
         if global_container_stack is not None:
             global_container_stack.propertyChanged.emit("post_processing_plugin", "value")
 
+    @staticmethod
+    def _isScriptAllowed(file_path: str) -> bool:
+        """Checks whether the given file is allowed to be loaded"""
+        if not ApplicationMetadata.IsEnterpriseVersion:
+            # No signature needed
+            return True
+
+        dir_path = os.path.split(file_path)[0]  # type: str
+        plugin_path = PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin")
+        assert plugin_path is not None  # appease mypy
+        bundled_path = os.path.join(plugin_path, "scripts")
+        if dir_path == bundled_path:
+            # Bundled scripts are trusted.
+            return True
+
+        trust_instance = Trust.getInstanceOrNone()
+        if trust_instance is not None and Trust.signatureFileExistsFor(file_path):
+            if trust_instance.signedFileCheck(file_path):
+                return True
+
+        return False  # Default verdict should be False, being the most secure fallback
+
 

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -49,6 +49,17 @@ class PauseAtHeight(Script):
                     "minimum_value_warning": "1",
                     "enabled": "pause_at == 'layer_no'"
                 },
+                "disarm_timeout":
+                {
+                    "label": "Disarm timeout",
+                    "description": "After this time steppers are going to disarm (meaning that they can easily lose their positions). Set this to 0 if you don't want to set any duration.",
+                    "type": "int",
+                    "value": "0",
+                    "minimum_value": "0",
+                    "minimum_value_warning": "0",
+                    "maximum_value_warning": "1800",
+                    "unit": "s"
+                },
                 "head_park_x":
                 {
                     "label": "Park Print Head X",
@@ -141,6 +152,7 @@ class PauseAtHeight(Script):
         pause_at = self.getSettingValueByKey("pause_at")
         pause_height = self.getSettingValueByKey("pause_height")
         pause_layer = self.getSettingValueByKey("pause_layer")
+        disarm_timeout = self.getSettingValueByKey("disarm_timeout")
         retraction_amount = self.getSettingValueByKey("retraction_amount")
         retraction_speed = self.getSettingValueByKey("retraction_speed")
         extrude_amount = self.getSettingValueByKey("extrude_amount")
@@ -307,6 +319,10 @@ class PauseAtHeight(Script):
                 if display_text:
                     prepend_gcode += "M117 " + display_text + "\n"
 
+                # Set the disarm timeout
+                if disarm_timeout > 0:
+                    prepend_gcode += self.putValue(M = 18, S = disarm_timeout) + " ; Set the disarm timeout\n"
+
                 # Wait till the user continues printing
                 prepend_gcode += self.putValue(M = 0) + " ; Do the actual pause\n"
 

plugins/PostProcessingPlugin/tests/TestPostProcessingPlugin.py

@@ -0,0 +1,61 @@
+
+import os
+import sys
+from unittest.mock import patch, MagicMock
+
+from UM.PluginRegistry import PluginRegistry
+from UM.Resources import Resources
+from UM.Trust import Trust
+from ..PostProcessingPlugin import PostProcessingPlugin
+
+# not sure if needed
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
+
+""" In this file, commnunity refers to regular Cura for makers."""
+
+mock_plugin_registry = MagicMock()
+mock_plugin_registry.getPluginPath = MagicMock(return_value = "mocked_plugin_path")
+
+
+# noinspection PyProtectedMember
+@patch("cura.ApplicationMetadata.IsEnterpriseVersion", False)
+def test_community_user_script_allowed():
+    assert PostProcessingPlugin._isScriptAllowed("blaat.py")
+
+
+# noinspection PyProtectedMember
+@patch("cura.ApplicationMetadata.IsEnterpriseVersion", False)
+def test_community_bundled_script_allowed():
+    assert PostProcessingPlugin._isScriptAllowed(_bundled_file_path())
+
+
+# noinspection PyProtectedMember
+@patch("cura.ApplicationMetadata.IsEnterpriseVersion", True)
+@patch.object(PluginRegistry, "getInstance", return_value=mock_plugin_registry)
+def test_enterprise_unsigned_user_script_not_allowed(plugin_registry):
+    assert not PostProcessingPlugin._isScriptAllowed("blaat.py")
+
+# noinspection PyProtectedMember
+@patch("cura.ApplicationMetadata.IsEnterpriseVersion", True)
+@patch.object(PluginRegistry, "getInstance", return_value=mock_plugin_registry)
+def test_enterprise_signed_user_script_allowed(plugin_registry):
+    mocked_trust = MagicMock()
+    mocked_trust.signedFileCheck = MagicMock(return_value=True)
+
+    plugin_registry.getPluginPath = MagicMock(return_value="mocked_plugin_path")
+
+    with patch.object(Trust, "signatureFileExistsFor", return_value = True):
+        with patch("UM.Trust.Trust.getInstanceOrNone", return_value=mocked_trust):
+            assert PostProcessingPlugin._isScriptAllowed("mocked_plugin_path/scripts/blaat.py")
+
+
+# noinspection PyProtectedMember
+@patch("cura.ApplicationMetadata.IsEnterpriseVersion", False)
+def test_enterprise_bundled_script_allowed():
+    assert PostProcessingPlugin._isScriptAllowed(_bundled_file_path())
+
+
+def _bundled_file_path():
+    return os.path.join(
+        Resources.getStoragePath(Resources.Resources) + "scripts/blaat.py"
+    )

plugins/Toolbox/resources/images/placeholder.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
+  <path d="M24,44,7,33.4V14.6L24,4,41,14.6V33.4ZM9,32.3l15,9.3,15-9.3V15.7L24,6.4,9,15.7Z"/>
+</svg>

plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 Item
 {
@@ -203,7 +203,7 @@ Item
         font: UM.Theme.getFont("default")
         color: UM.Theme.getColor("text")
         linkColor: UM.Theme.getColor("text_link")
-        onLinkActivated: Qt.openUrlExternally(link)
+        onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
         renderType: Text.NativeRendering
     }
 }

plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import UM 1.1 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 Column
@@ -85,7 +85,7 @@ Column
         MouseArea
         {
             anchors.fill: parent
-            onClicked: Qt.openUrlExternally(parent.whereToBuyUrl)
+            onClicked: UM.UrlUtil.openUrl(parent.whereToBuyUrl, ["https", "http"])
         }
     }
 

plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml

@@ -66,8 +66,10 @@ Item
             anchors.centerIn: parent
             width: UM.Theme.getSize("toolbox_thumbnail_small").width - UM.Theme.getSize("wide_margin").width
             height: UM.Theme.getSize("toolbox_thumbnail_small").height - UM.Theme.getSize("wide_margin").width
+            sourceSize.width: width
+            sourceSize.height: height
             fillMode: Image.PreserveAspectFit
-            source: model.icon_url || "../../images/logobot.svg"
+            source: model.icon_url || "../../images/placeholder.svg"
             mipmap: true
         }
         UM.RecolorImage

plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml

@@ -22,8 +22,10 @@ Rectangle
         id: thumbnail
         height: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height
         width: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height
+        sourceSize.height: height
+        sourceSize.width: width
         fillMode: Image.PreserveAspectFit
-        source: model.icon_url || "../../images/logobot.svg"
+        source: model.icon_url || "../../images/placeholder.svg"
         mipmap: true
         anchors
         {

plugins/Toolbox/resources/qml/components/ToolboxFooter.qml

@@ -20,12 +20,13 @@ Item
         color: UM.Theme.getColor("text")
         height: UM.Theme.getSize("toolbox_footer_button").height
         verticalAlignment: Text.AlignVCenter
+        wrapMode: Text.WordWrap
         anchors
         {
             top: restartButton.top
             left: parent.left
             leftMargin: UM.Theme.getSize("wide_margin").width
-            right: restartButton.right
+            right: restartButton.left
             rightMargin: UM.Theme.getSize("default_margin").width
         }
         renderType: Text.NativeRendering

plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml

@@ -17,7 +17,8 @@ Item
         color: UM.Theme.getColor("lining")
         width: parent.width
         height: Math.floor(UM.Theme.getSize("default_lining").height)
-        anchors.bottom: parent.bottom
+        anchors.bottom: parent.top
+        visible: index != 0
     }
     Row
     {
@@ -48,6 +49,8 @@ Item
             {
                 text: model.name
                 width: parent.width
+                maximumLineCount: 1
+                elide: Text.ElideRight
                 wrapMode: Text.WordWrap
                 font: UM.Theme.getFont("large_bold")
                 color: pluginInfo.color

plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml

@@ -68,9 +68,11 @@ UM.Dialog{
                             Image
                             {
                                 id: packageIcon
-                                source: model.icon_url || "../../images/logobot.svg"
+                                source: model.icon_url || "../../images/placeholder.svg"
                                 height: lineHeight
                                 width: height
+                                sourceSize.height: height
+                                sourceSize.width: width
                                 mipmap: true
                                 fillMode: Image.PreserveAspectFit
                             }
@@ -111,9 +113,11 @@ UM.Dialog{
                             Image
                             {
                                 id: packageIcon
-                                source: model.icon_url || "../../images/logobot.svg"
+                                source: model.icon_url || "../../images/placeholder.svg"
                                 height: lineHeight
                                 width: height
+                                sourceSize.height: height
+                                sourceSize.width: width
                                 mipmap: true
                                 fillMode: Image.PreserveAspectFit
                             }

plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml

@@ -53,8 +53,10 @@ UM.Dialog
                 id: icon
                 width: 30 * screenScaleFactor
                 height: width
+                sourceSize.width: width
+                sourceSize.height: height
                 fillMode: Image.PreserveAspectFit
-                source: licenseModel.iconUrl || "../../images/logobot.svg"
+                source: licenseModel.iconUrl || "../../images/placeholder.svg"
                 mipmap: true
             }
 

plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 import "../components"
 
@@ -33,7 +33,7 @@ Item
             width: UM.Theme.getSize("toolbox_thumbnail_medium").width
             height: UM.Theme.getSize("toolbox_thumbnail_medium").height
             fillMode: Image.PreserveAspectFit
-            source: details.icon_url || "../../images/logobot.svg"
+            source: details.icon_url || "../../images/placeholder.svg"
             mipmap: true
             anchors
             {
@@ -132,7 +132,7 @@ Item
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text")
                 linkColor: UM.Theme.getColor("text_link")
-                onLinkActivated: Qt.openUrlExternally(link)
+                onLinkActivated: UM.UrlUtil.openUrl(link, ["https", "http"])
                 renderType: Text.NativeRendering
             }
 

plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 import Cura 1.1 as Cura
 
@@ -46,8 +46,12 @@ Item
             {
                 anchors.fill: parent
                 fillMode: Image.PreserveAspectFit
-                source: details === null ? "" : (details.icon_url || "../../images/logobot.svg")
+                source: details === null ? "" : (details.icon_url || "../../images/placeholder.svg")
                 mipmap: true
+                height: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height
+                width: UM.Theme.getSize("toolbox_thumbnail_large").height - 4 * UM.Theme.getSize("default_margin").height
+                sourceSize.height: height
+                sourceSize.width: width
             }
         }
 
@@ -217,7 +221,7 @@ Item
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text")
                 linkColor: UM.Theme.getColor("text_link")
-                onLinkActivated: Qt.openUrlExternally(link)
+                onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
                 renderType: Text.NativeRendering
             }
             Label

plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml

@@ -20,7 +20,6 @@ ScrollView
         width: page.width
         spacing: UM.Theme.getSize("default_margin").height
         padding: UM.Theme.getSize("wide_margin").width
-        visible: toolbox.pluginsInstalledModel.items.length > 0
         height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height
 
         Label
@@ -31,9 +30,9 @@ ScrollView
                 right: parent.right
                 margins: parent.padding
             }
-            text: catalog.i18nc("@title:tab", "Plugins")
+            text: catalog.i18nc("@title:tab", "Installed plugins")
             color: UM.Theme.getColor("text_medium")
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("medium")
             renderType: Text.NativeRendering
         }
 
@@ -61,11 +60,19 @@ ScrollView
                 }
                 Repeater
                 {
-                    id: materialList
+                    id: pluginList
                     model: toolbox.pluginsInstalledModel
-                    delegate: ToolboxInstalledTile {}
+                    delegate: ToolboxInstalledTile { }
                 }
             }
+            Label
+            {
+                visible: toolbox.pluginsInstalledModel.count < 1
+                padding: UM.Theme.getSize("default_margin").width
+                text: catalog.i18nc("@info", "No plugin has been installed.")
+                font: UM.Theme.getFont("medium")
+                renderType: Text.NativeRendering
+            }
         }
 
         Label
@@ -76,7 +83,7 @@ ScrollView
                 right: parent.right
                 margins: parent.padding
             }
-            text: catalog.i18nc("@title:tab", "Materials")
+            text: catalog.i18nc("@title:tab", "Installed materials")
             color: UM.Theme.getColor("text_medium")
             font: UM.Theme.getFont("medium")
             renderType: Text.NativeRendering
@@ -106,8 +113,106 @@ ScrollView
                 }
                 Repeater
                 {
-                    id: pluginList
+                    id: installedMaterialsList
                     model: toolbox.materialsInstalledModel
+                    delegate: ToolboxInstalledTile { }
+                }
+            }
+            Label
+            {
+                visible: toolbox.materialsInstalledModel.count < 1
+                padding: UM.Theme.getSize("default_margin").width
+                text: catalog.i18nc("@info", "No material has been installed.")
+                font: UM.Theme.getFont("medium")
+                renderType: Text.NativeRendering
+            }
+        }
+
+        Label
+        {
+            anchors
+            {
+                left: parent.left
+                right: parent.right
+                margins: parent.padding
+            }
+            text: catalog.i18nc("@title:tab", "Bundled plugins")
+            color: UM.Theme.getColor("text_medium")
+            font: UM.Theme.getFont("medium")
+            renderType: Text.NativeRendering
+        }
+
+        Rectangle
+        {
+            anchors
+            {
+                left: parent.left
+                right: parent.right
+                margins: parent.padding
+            }
+            id: bundledPlugins
+            color: "transparent"
+            height: childrenRect.height + UM.Theme.getSize("default_margin").width
+            border.color: UM.Theme.getColor("lining")
+            border.width: UM.Theme.getSize("default_lining").width
+            Column
+            {
+                anchors
+                {
+                    top: parent.top
+                    right: parent.right
+                    left: parent.left
+                    margins: UM.Theme.getSize("default_margin").width
+                }
+                Repeater
+                {
+                    id: bundledPluginsList
+                    model: toolbox.pluginsBundledModel
+                    delegate: ToolboxInstalledTile { }
+                }
+            }
+        }
+
+        Label
+        {
+            anchors
+            {
+                left: parent.left
+                right: parent.right
+                margins: parent.padding
+            }
+            text: catalog.i18nc("@title:tab", "Bundled materials")
+            color: UM.Theme.getColor("text_medium")
+            font: UM.Theme.getFont("medium")
+            renderType: Text.NativeRendering
+        }
+
+        Rectangle
+        {
+            anchors
+            {
+                left: parent.left
+                right: parent.right
+                margins: parent.padding
+            }
+            id: bundledMaterials
+            color: "transparent"
+            height: childrenRect.height + UM.Theme.getSize("default_margin").width
+            border.color: UM.Theme.getColor("lining")
+            border.width: UM.Theme.getSize("default_lining").width
+            Column
+            {
+                anchors
+                {
+                    top: parent.top
+                    right: parent.right
+                    left: parent.left
+                    margins: UM.Theme.getSize("default_margin").width
+                }
+                Repeater
+                {
+                    id: bundledMaterialsList
+                    model: toolbox.materialsBundledModel
                     delegate: ToolboxInstalledTile {}
                 }
             }

plugins/Toolbox/src/Toolbox.py

@@ -77,10 +77,15 @@ class Toolbox(QObject, Extension):
         self._plugins_showcase_model = PackagesModel(self)
         self._plugins_available_model = PackagesModel(self)
         self._plugins_installed_model = PackagesModel(self)
-
+        self._plugins_installed_model.setFilter({"is_bundled": "False"})
+        self._plugins_bundled_model = PackagesModel(self)
+        self._plugins_bundled_model.setFilter({"is_bundled": "True"})
         self._materials_showcase_model = AuthorsModel(self)
         self._materials_available_model = AuthorsModel(self)
         self._materials_installed_model = PackagesModel(self)
+        self._materials_installed_model.setFilter({"is_bundled": "False"})
+        self._materials_bundled_model = PackagesModel(self)
+        self._materials_bundled_model.setFilter({"is_bundled": "True"})
         self._materials_generic_model = PackagesModel(self)
 
         self._license_model = LicenseModel()
@@ -289,9 +294,11 @@ class Toolbox(QObject, Extension):
             self._old_plugin_metadata = {k: v for k, v in self._old_plugin_metadata.items() if k in self._old_plugin_ids}
 
             self._plugins_installed_model.setMetadata(all_packages["plugin"] + list(self._old_plugin_metadata.values()))
+            self._plugins_bundled_model.setMetadata(all_packages["plugin"] + list(self._old_plugin_metadata.values()))
             self.metadataChanged.emit()
         if "material" in all_packages:
             self._materials_installed_model.setMetadata(all_packages["material"])
+            self._materials_bundled_model.setMetadata(all_packages["material"])
             self.metadataChanged.emit()
 
     @pyqtSlot(str)
@@ -757,6 +764,10 @@ class Toolbox(QObject, Extension):
     def pluginsInstalledModel(self) -> PackagesModel:
         return self._plugins_installed_model
 
+    @pyqtProperty(QObject, constant = True)
+    def pluginsBundledModel(self) -> PackagesModel:
+        return self._plugins_bundled_model
+
     @pyqtProperty(QObject, constant = True)
     def materialsShowcaseModel(self) -> AuthorsModel:
         return self._materials_showcase_model
@@ -769,6 +780,10 @@ class Toolbox(QObject, Extension):
     def materialsInstalledModel(self) -> PackagesModel:
         return self._materials_installed_model
 
+    @pyqtProperty(QObject, constant = True)
+    def materialsBundledModel(self) -> PackagesModel:
+        return self._materials_bundled_model
+
     @pyqtProperty(QObject, constant = True)
     def materialsGenericModel(self) -> PackagesModel:
         return self._materials_generic_model

plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py

@@ -0,0 +1,91 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser
+from typing import Tuple, List
+import io
+from UM.VersionUpgrade import VersionUpgrade
+
+_removed_settings = {
+    "machine_filament_park_distance",
+}
+
+class VersionUpgrade45to46(VersionUpgrade):
+    def getCfgVersion(self, serialised: str) -> int:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+        format_version = int(parser.get("general", "version"))  # Explicitly give an exception when this fails. That means that the file format is not recognised.
+        setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
+        return format_version * 1000000 + setting_version
+
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades preferences to have the new version number.
+
+        This removes any settings that were removed in the new Cura version.
+        :param serialized: The original contents of the preferences file.
+        :param filename: The file name of the preferences file.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "12"
+
+        # Remove deleted settings from the visible settings list.
+        visible_settings = set(parser["general"]["visible_settings"].split(";"))
+        for removed in _removed_settings:
+            if removed in visible_settings:
+                visible_settings.remove(removed)
+        parser["general"]["visible_settings"] = ";".join(visible_settings)
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades instance containers to have the new version number.
+
+        This removes any settings that were removed in the new Cura version.
+        :param serialized: The original contents of the instance container.
+        :param filename: The original file name of the instance container.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "12"
+
+        if "values" in parser:
+            for removed in _removed_settings:
+                if removed in parser["values"]:
+                    del parser["values"][removed]
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades stacks to have the new version number.
+        :param serialized: The original contents of the stack.
+        :param filename: The original file name of the stack.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "12"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade45to46
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade45to46.VersionUpgrade45to46()
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000011):        ("preferences", 6000012,        upgrade.upgradePreferences),
+            ("machine_stack", 4000011):      ("machine_stack", 4000012,      upgrade.upgradeStack),
+            ("extruder_train", 4000011):     ("extruder_train", 4000012,     upgrade.upgradeStack),
+            ("definition_changes", 4000011): ("definition_changes", 4000012, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000011):    ("quality_changes", 4000012,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000011):            ("quality", 4000012,            upgrade.upgradeInstanceContainer),
+            ("user", 4000011):               ("user", 4000012,               upgrade.upgradeInstanceContainer),
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+            "machine_stack": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            },
+            "extruder_train": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./extruders"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality_changes"}
+            },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
+            }
+        }
+    }
+
+
+def register(app: "Application") -> Dict[str, Any]:
+    return {"version_upgrade": upgrade}

plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json

@@ -0,0 +1,8 @@
+{
+    "name": "Version Upgrade 4.5 to 4.6",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.",
+    "api": "7.1",
+    "i18n-catalog": "cura"
+}

plugins/VersionUpgrade/VersionUpgrade46to47/VersionUpgrade46to47.py

@@ -0,0 +1,209 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser
+import copy  # To split up files.
+from typing import Tuple, List
+import io
+from UM.VersionUpgrade import VersionUpgrade
+
+renamed_nozzles = {
+    "deltacomb_025_e3d": "deltacomb_dc20_fbe025",
+    "deltacomb_040_e3d": "deltacomb_dc20_fbe040",
+    "deltacomb_080_e3d": "deltacomb_dc20_vfbe080"
+}
+default_qualities_per_nozzle_and_material = {  # Can't define defaults for user-defined materials, since we only have the material ID. Those will get reset to empty quality :(
+    "deltacomb_dc20_fbe025": {
+        "generic_pla_175": "deltacomb_FBE0.25_PLA_C",
+        "generic_abs_175": "deltacomb_FBE0.25_ABS_C"
+    },
+    "deltacomb_dc20_fbe040": {
+        "generic_pla_175": "deltacomb_FBE0.40_PLA_C",
+        "generic_abs_175": "deltacomb_FBE0.40_ABS_C",
+        "generic_petg_175": "deltacomb_FBE0.40_PETG_C",
+        "generic_tpu_175": "deltacomb_FBE0.40_TPU_C"
+    },
+    "deltacomb_dc20_vfbe080": {
+        "generic_pla_175": "deltacomb_VFBE0.80_PLA_D",
+        "generic_abs_175": "deltacomb_VFBE0.80_ABS_D"
+    }
+}
+
+class VersionUpgrade46to47(VersionUpgrade):
+    def getCfgVersion(self, serialised: str) -> int:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+        format_version = int(parser.get("general", "version"))  # Explicitly give an exception when this fails. That means that the file format is not recognised.
+        setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
+        return format_version * 1000000 + setting_version
+
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades preferences to have the new version number.
+        :param serialized: The original contents of the preferences file.
+        :param filename: The file name of the preferences file.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "13"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeExtruderInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades per-extruder instance containers to the new version number.
+
+        This applies all of the changes that are applied in other instance
+        containers as well.
+
+        In the case of Deltacomb printers, it splits the 2 extruders into 4 and
+        changes the definition.
+        :param serialized: The original contents of the instance container.
+        :param filename: The original file name of the instance container.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
+        parser.read_string(serialized)
+        results = [(parser, filename)]
+
+        if "general" in parser and "definition" in parser["general"]:
+            if parser["general"]["definition"] == "deltacomb_extruder_0":
+                parser["general"]["definition"] = "deltacomb_base_extruder_0"
+            elif parser["general"]["definition"] == "deltacomb_extruder_1":  # Split up the second Deltacomb extruder into 3, creating an extra two extruders.
+                parser_e2 = copy.deepcopy(parser)
+                parser_e3 = copy.deepcopy(parser)
+
+                parser["general"]["definition"] = "deltacomb_base_extruder_1"
+                parser_e2["general"]["definition"] = "deltacomb_base_extruder_2"
+                parser_e3["general"]["definition"] = "deltacomb_base_extruder_3"
+                results.append((parser_e2, filename + "_e2_upgrade"))  # Hopefully not already taken.
+                results.append((parser_e3, filename + "_e3_upgrade"))
+            elif parser["general"]["definition"] == "deltacomb":  # On the global stack OR the per-extruder user container.
+                parser["general"]["definition"] = "deltacomb_dc20"
+
+                if "metadata" in parser and "extruder" in parser["metadata"]:  # Per-extruder user container.
+                    parser_e2 = copy.deepcopy(parser)
+                    parser_e3 = copy.deepcopy(parser)
+                    parser_e2["metadata"]["extruder"] += "_e2_upgrade"
+                    parser_e3["metadata"]["extruder"] += "_e3_upgrade"
+                    results.append((parser_e2, filename + "_e2_upgrade"))
+                    results.append((parser_e3, filename + "_e3_upgrade"))
+
+        # Now go upgrade with the generic instance container method.
+        final_serialized = []  # type: List[str]
+        final_filenames = []  # type: List[str]
+        for result_parser, result_filename in results:
+            result_ss = io.StringIO()
+            result_parser.write(result_ss)
+            result_serialized = result_ss.getvalue()
+            # The upgrade function itself might also return multiple files, so we need to append all of those into the final list.
+            this_filenames_upgraded, this_serialized_upgraded = self.upgradeInstanceContainer(result_serialized, result_filename)
+            final_serialized += this_serialized_upgraded
+            final_filenames += this_filenames_upgraded
+
+        return final_filenames, final_serialized
+
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades instance containers to have the new version number.
+
+        This changes the maximum deviation setting if that setting was present
+        in the profile.
+        :param serialized: The original contents of the instance container.
+        :param filename: The original file name of the instance container.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "13"
+
+        if "values" in parser:
+            # Maximum Deviation's effect was corrected. Previously the deviation
+            # ended up being only half of what the user had entered. This was
+            # fixed in Cura 4.7 so there we need to halve the deviation that the
+            # user had entered.
+            if "meshfix_maximum_deviation" in parser["values"]:
+                maximum_deviation = parser["values"]["meshfix_maximum_deviation"]
+                if maximum_deviation.startswith("="):
+                    maximum_deviation = maximum_deviation[1:]
+                maximum_deviation = "=(" + maximum_deviation + ") / 2"
+                parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades stacks to have the new version number.
+
+        This upgrades Deltacomb printers to their new profile structure, and
+        gives them 4 extruders.
+        :param serialized: The original contents of the stack.
+        :param filename: The original file name of the stack.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+        results = [(parser, filename)]
+
+        # Update version number.
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "13"
+
+        if "containers" in parser and "7" in parser["containers"]:
+            if parser["containers"]["7"] == "deltacomb_extruder_0" or parser["containers"]["7"] == "deltacomb_extruder_1":  # Extruder stack.
+                if "5" in parser["containers"]:
+                    parser["containers"]["5"] = renamed_nozzles.get(parser["containers"]["5"], parser["containers"]["5"])
+                    if "3" in parser["containers"] and "4" in parser["containers"] and parser["containers"]["3"] == "empty_quality":
+                        parser["containers"]["3"] = default_qualities_per_nozzle_and_material[parser["containers"]["5"]].get(parser["containers"]["4"], "empty_quality")
+                if parser["containers"]["7"] == "deltacomb_extruder_0":
+                    parser["containers"]["7"] = "deltacomb_base_extruder_0"
+                else:
+                    parser["containers"]["7"] = "deltacomb_base_extruder_1"
+                    # Copy this extruder to extruder 3 and 4.
+                    extruder3 = copy.deepcopy(parser)
+                    extruder4 = copy.deepcopy(parser)
+
+                    extruder3["general"]["id"] += "_e2_upgrade"
+                    extruder3["metadata"]["position"] = "2"
+                    extruder3["containers"]["0"] += "_e2_upgrade"
+                    if extruder3["containers"]["1"] != "empty_quality_changes":
+                        extruder3["containers"]["1"] += "_e2_upgrade"
+                    extruder3["containers"]["6"] += "_e2_upgrade"
+                    extruder3["containers"]["7"] = "deltacomb_base_extruder_2"
+                    results.append((extruder3, filename + "_e2_upgrade"))
+
+                    extruder4["general"]["id"] += "_e3_upgrade"
+                    extruder4["metadata"]["position"] = "3"
+                    extruder4["containers"]["0"] += "_e3_upgrade"
+                    if extruder4["containers"]["1"] != "empty_quality_changes":
+                        extruder4["containers"]["1"] += "_e3_upgrade"
+                    extruder4["containers"]["6"] += "_e3_upgrade"
+                    extruder4["containers"]["7"] = "deltacomb_base_extruder_3"
+                    results.append((extruder4, filename + "_e3_upgrade"))
+            elif parser["containers"]["7"] == "deltacomb":  # Global stack.
+                parser["containers"]["7"] = "deltacomb_dc20"
+                parser["containers"]["3"] = "deltacomb_global_C"
+
+        result_serialized = []
+        result_filenames = []
+        for result_parser, result_filename in results:
+            result_ss = io.StringIO()
+            result_parser.write(result_ss)
+            result_serialized.append(result_ss.getvalue())
+            result_filenames.append(result_filename)
+
+        return result_filenames, result_serialized

plugins/VersionUpgrade/VersionUpgrade46to47/__init__.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade46to47
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade46to47.VersionUpgrade46to47()
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000012):        ("preferences", 6000013,        upgrade.upgradePreferences),
+            ("machine_stack", 4000012):      ("machine_stack", 4000013,      upgrade.upgradeStack),
+            ("extruder_train", 4000012):     ("extruder_train", 4000013,     upgrade.upgradeStack),
+            ("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeExtruderInstanceContainer),
+            ("quality_changes", 4000012):    ("quality_changes", 4000013,    upgrade.upgradeExtruderInstanceContainer),
+            ("quality", 4000012):            ("quality", 4000013,            upgrade.upgradeExtruderInstanceContainer),
+            ("user", 4000012):               ("user", 4000013,               upgrade.upgradeExtruderInstanceContainer),
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+            "machine_stack": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            },
+            "extruder_train": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./extruders"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality_changes"}
+            },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
+            }
+        }
+    }
+
+
+def register(app: "Application") -> Dict[str, Any]:
+    return {"version_upgrade": upgrade}

plugins/VersionUpgrade/VersionUpgrade46to47/plugin.json

@@ -0,0 +1,8 @@
+{
+    "name": "Version Upgrade 4.6 to 4.7",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 4.6 to Cura 4.7.",
+    "api": "7.1",
+    "i18n-catalog": "cura"
+}

resources/bundled_packages/cura.json

@@ -849,7 +849,7 @@
             }
         }
     },
-        "VersionUpgrade44to45": {
+    "VersionUpgrade44to45": {
         "package_info": {
             "package_id": "VersionUpgrade44to45",
             "package_type": "plugin",
@@ -866,6 +866,40 @@
             }
         }
     },
+    "VersionUpgrade45to46": {
+        "package_info": {
+            "package_id": "VersionUpgrade45to46",
+            "package_type": "plugin",
+            "display_name": "Version Upgrade 4.5 to 4.6",
+            "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.",
+            "package_version": "1.0.0",
+            "sdk_version": "7.1.0",
+            "website": "https://ultimaker.com",
+            "author": {
+                "author_id": "UltimakerPackages",
+                "display_name": "Ultimaker B.V.",
+                "email": "plugins@ultimaker.com",
+                "website": "https://ultimaker.com"
+            }
+        }
+    },
+    "VersionUpgrade46to47": {
+        "package_info": {
+            "package_id": "VersionUpgrade46to47",
+            "package_type": "plugin",
+            "display_name": "Version Upgrade 4.6 to 4.7",
+            "description": "Upgrades configurations from Cura 4.6 to Cura 4.7.",
+            "package_version": "1.0.0",
+            "sdk_version": "7.1.0",
+            "website": "https://ultimaker.com",
+            "author": {
+                "author_id": "UltimakerPackages",
+                "display_name": "Ultimaker B.V.",
+                "email": "plugins@ultimaker.com",
+                "website": "https://ultimaker.com"
+            }
+        }
+    },
     "X3DReader": {
         "package_info": {
             "package_id": "X3DReader",

resources/definitions/anet3d.def.json

@@ -85,7 +85,7 @@
         "infill_before_walls": { "value": true },
         "infill_overlap": { "value": 30.0 },
         "skin_overlap": { "value": 10.0 },
-        "infill_wipe_dist": { "value": 1.0 },
+        "infill_wipe_dist": { "value": 0 },
         "wall_0_wipe_dist": { "value": 0.2 },
 
         "fill_perimeter_gaps": { "value": "'everywhere'" },

resources/definitions/anet3d_a2.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
         }
     }
 }

resources/definitions/anet3d_a2_plus.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
         }
     }
 }

resources/definitions/anet3d_a6.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
         }
     }
 }

resources/definitions/anet3d_a8.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
         }
     }
 }

resources/definitions/anet3d_a8_plus.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
         }
     }
 }

resources/definitions/anet3d_e10.def.json

@@ -21,11 +21,11 @@
         "machine_height": {
             "default_value": 300
         },
-				"machine_start_gcode": {
+        "machine_start_gcode": {
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_e12.def.json

@@ -21,11 +21,11 @@
         "machine_height": {
             "default_value": 400
         },
-				"machine_start_gcode": {
+        "machine_start_gcode": {
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_e16.def.json

@@ -21,11 +21,11 @@
         "machine_height": {
             "default_value": 400
         },
-				"machine_start_gcode": {
+        "machine_start_gcode": {
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_et4.def.json

@@ -21,11 +21,11 @@
         "machine_height": {
             "default_value": 250
         },
-				"machine_start_gcode": {
+        "machine_start_gcode": {
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_et4_pro.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_et4_x.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_et5.def.json

@@ -21,11 +21,11 @@
         "machine_height": {
             "default_value": 400
         },
-				"machine_start_gcode": {
+        "machine_start_gcode": {
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/anet3d_et5_x.def.json

@@ -25,7 +25,7 @@
             "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
-        }        
+            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
+        }
     }
 }

resources/definitions/deltacomb_base.def.json

@@ -12,9 +12,9 @@
         "has_machine_quality":             true,
         "has_materials":                   true,
         "has_variants":                    true,
-        "variants_name":                   "Head",        
+        "variants_name":                   "Head",
         
-        "preferred_quality_type":          "fast",
+        "preferred_quality_type":          "d",
         "preferred_material":              "generic_pla",
         
         "machine_extruder_trains": {
@@ -22,7 +22,7 @@
             "1": "deltacomb_base_extruder_1",
             "2": "deltacomb_base_extruder_2",
             "3": "deltacomb_base_extruder_3"
-	    }
+        }
     },
 
     "overrides": {

resources/definitions/deltacomb_dc20flux.def.json

@@ -13,7 +13,7 @@
             "1": "deltacomb_dc20flux_extruder_1",
             "2": "deltacomb_dc20flux_extruder_2",
             "3": "deltacomb_dc20flux_extruder_3"
-	      }
+          }
     },
 
     "overrides": {

resources/definitions/deltacomb_dc21flux.def.json

@@ -13,7 +13,7 @@
             "1": "deltacomb_dc20flux_extruder_1",
             "2": "deltacomb_dc20flux_extruder_2",
             "3": "deltacomb_dc20flux_extruder_3"
-	      }
+          }
     },
 
     "overrides": {

resources/definitions/deltacomb_dc30flux.def.json

@@ -13,7 +13,7 @@
             "1": "deltacomb_dc30flux_extruder_1",
             "2": "deltacomb_dc30flux_extruder_2",
             "3": "deltacomb_dc30flux_extruder_3"
-	      }
+          }
     },
 
     "overrides": {

resources/definitions/fdmextruder.def.json

@@ -6,7 +6,7 @@
         "type": "extruder",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 11,
+        "setting_version": 13,
         "visible": false,
         "position": "0"
     },

resources/definitions/fdmprinter.def.json

@@ -7,7 +7,7 @@
         "author": "Ultimaker",
         "category": "Other",
         "manufacturer": "Unknown",
-        "setting_version": 11,
+        "setting_version": 13,
         "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,
@@ -302,18 +302,6 @@
                     "settable_per_extruder": true,
                     "settable_per_meshgroup": false
                 },
-                "machine_filament_park_distance":
-                {
-                    "label": "Filament Park Distance",
-                    "description": "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used.",
-                    "unit": "mm",
-                    "default_value": 16,
-                    "value": "machine_heat_zone_length",
-                    "type": "float",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "settable_per_meshgroup": false
-                },
                 "machine_nozzle_temp_enabled":
                 {
                     "label": "Enable Nozzle Temperature Control",
@@ -5996,7 +5984,7 @@
                     "description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true.",
                     "type": "float",
                     "unit": "mm",
-                    "default_value": 0.05,
+                    "default_value": 0.025,
                     "minimum_value": "0.001",
                     "minimum_value_warning": "0.01",
                     "maximum_value_warning": "0.3",

resources/definitions/geeetech_A10M.def.json

@@ -45,7 +45,7 @@
         "machine_max_jerk_e": { "default_value": 2.5 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_start_gcode": {
-            "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM190 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script"
+            "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script"
         },
         "machine_end_gcode": {
             "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"

resources/definitions/geeetech_A20M.def.json

@@ -45,7 +45,7 @@
         "machine_max_jerk_e": { "default_value": 2.5 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_start_gcode": {
-            "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM190 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script"
+            "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script"
         },
         "machine_end_gcode": {
             "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"

resources/definitions/hms434.def.json

@@ -69,7 +69,7 @@
         "material_bed_temp_wait":     {"default_value": false },
         "machine_max_feedrate_z":     {"default_value": 10 },
         "machine_acceleration":       {"default_value": 180 },
-        "machine_start_gcode":        {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature_layer_0}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature_layer_0}\nM117 HMS434 Printing ...\n\n" },
+        "machine_start_gcode":        {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature_layer_0}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature_layer_0}\nM117 HMS434 Printing ...\n\nM42 P10 S255 ; chamberfans on" },
         "machine_end_gcode":          {"default_value": "" },
 
         "retraction_extra_prime_amount":      {"minimum_value_warning": "-2.0" },
@@ -100,7 +100,6 @@
         "z_seam_y":                  {"value": "325"},
         "z_seam_corner":             {"value": "'z_seam_corner_inner'"},
         "skin_outline_count":        {"value": "0"},
-        "ironing_enabled":           {"value": true },
         "ironing_line_spacing":      {"value": "line_width / 4 * 3"},
         "ironing_flow":              {"value": "0"},
         "ironing_inset":             {"value": "ironing_line_spacing"},
@@ -108,9 +107,6 @@
  
         "infill_sparse_density": {"value": 30},
         "infill_pattern":        {"value": "'lines'"},
-        "infill_overlap":        {"value": 5},
-        "skin_overlap":          {"value": 5},
-        "infill_wipe_dist":      {"value": 0.0},
         "infill_before_walls":   {"value": false},
 
         "material_print_temperature_layer_0": {"value": "material_print_temperature"},
@@ -118,15 +114,10 @@
                                                "maximum_value_warning": "material_print_temperature + 15"},
         "material_final_print_temperature":   {"value": "material_print_temperature"},
         "material_bed_temperature_layer_0":   {"value": "material_bed_temperature"},
-        "material_flow":                      {"value": "100"},
         "material_flow_layer_0":              {"value": "material_flow"},
         "retraction_enable":                  {"value": true },
         "retract_at_layer_change":            {"value": true },
-        "retraction_amount":                  {"value": "1"},
-        "retraction_speed":                   {"value": "20"},
-        "retraction_prime_speed":             {"value": "8"},
         "retraction_min_travel":              {"value": "(round(line_width * 10))"},
-        "switch_extruder_retraction_amount":  {"value": 2},
         "switch_extruder_retraction_speeds":  {"value": "(retraction_speed)"},
         "switch_extruder_prime_speed":        {"value": "(retraction_prime_speed)"},
 
@@ -180,7 +171,7 @@
 
         "meshfix_maximum_resolution":       {"value": 0.01 },
         "meshfix_maximum_travel_resolution":{"value": 0.1 },
-        "meshfix_maximum_deviation":        {"value": 0.01 },
+        "meshfix_maximum_deviation":        {"value": 0.005 },
 
         "minimum_polygon_circumference":    {"value": 0.05 },
         "coasting_enable":                  {"value": false},

resources/definitions/mp_mini_delta.def.json

@@ -1,22 +1,22 @@
 {
-	"version": 2,
+    "version": 2,
     "name": "MP Mini Delta",
-	"inherits": "fdmprinter",
+    "inherits": "fdmprinter",
     "metadata": {
         "author": "MPMD Facebook Group",
         "manufacturer": "Monoprice",
-		"category": "Other",
+        "category": "Other",
         "file_formats": "text/x-gcode",
-        "platform": "mp_mini_delta_platform.stl",	
+        "platform": "mp_mini_delta_platform.stl",    
         "supports_usb_connection": true,
         "has_machine_quality": false,
         "visible": true,
-		"platform_offset": [0, 0, 0],
-		"has_materials": true,
-		"has_variants": false,
-		"has_machine_materials": false,
-		"has_variant_materials": false,
-		"preferred_quality_type": "normal",
+        "platform_offset": [0, 0, 0],
+        "has_materials": true,
+        "has_variants": false,
+        "has_machine_materials": false,
+        "has_variant_materials": false,
+        "preferred_quality_type": "normal",
         "machine_extruder_trains":
         {
             "0": "mp_mini_delta_extruder_0"
@@ -24,14 +24,14 @@
     },
 
     "overrides": {
- 		"machine_start_gcode":
-		{
-			"default_value": ";MPMD Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug.  \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed "
-		},
-		"machine_end_gcode":
-		{		
-			"default_value": "M107; \nM104 S0; turn off hotend heater \nM140 S0; turn off bed heater \nG91; Switch to use Relative Coordinates \nG1 E-2 F300; retract the filament a bit before lifting the nozzle to release some of the pressure \nG1 Z5 E-5 F4800; move nozzle up a bit and retract filament even more \nG28 X0; return to home positions so the nozzle is out of the way \nM84; turn off stepper motors \nG90; switch to absolute positioning \nM82; absolute extrusion mode"
-		},
+        "machine_start_gcode":
+        {
+            "default_value": ";MPMD Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug.  \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed "
+        },
+        "machine_end_gcode":
+        {        
+            "default_value": "M107; \nM104 S0; turn off hotend heater \nM140 S0; turn off bed heater \nG91; Switch to use Relative Coordinates \nG1 E-2 F300; retract the filament a bit before lifting the nozzle to release some of the pressure \nG1 Z5 E-5 F4800; move nozzle up a bit and retract filament even more \nG28 X0; return to home positions so the nozzle is out of the way \nM84; turn off stepper motors \nG90; switch to absolute positioning \nM82; absolute extrusion mode"
+        },
         "machine_width": { "default_value": 110 },
         "machine_depth": { "default_value": 110 },
         "machine_height": { "default_value": 120 },
@@ -39,17 +39,13 @@
         "machine_shape": { "default_value": "elliptic" },
         "machine_center_is_zero": { "default_value": true },
         "machine_nozzle_size": {
-            "default_value": 0.4,
-            "minimum_value": 0.10,
-            "maximum_value": 0.80
+            "default_value": 0.4
         },
         "layer_height": {
-            "default_value": 0.14, 
-            "minimum_value": 0.04
+            "default_value": 0.14
         },
-		"layer_height_0": {
-            "default_value": 0.21,
-            "minimum_value": 0.07
+        "layer_height_0": {
+            "default_value": 0.21
         },
         "material_bed_temperature": { "value": 40 },
         "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },

resources/definitions/peopoly_moai.def.json

@@ -171,7 +171,7 @@
             "value": "0.1"
         },
         "meshfix_maximum_deviation": {
-            "value": "0.003"
+            "value": "0.0015"
         },
         "skin_outline_count": {
             "value": 0

resources/definitions/skriware_2.def.json

@@ -298,7 +298,7 @@
             "default_value": 15
         },
         "meshfix_maximum_deviation": {
-            "default_value": 0.005
+            "default_value": 0.0025
         },
         "wall_0_material_flow": {
             "value": "99"

resources/definitions/ultimaker3.def.json

@@ -47,7 +47,6 @@
         "machine_depth": { "default_value": 215 },
         "machine_height": { "default_value": 200 },
         "machine_heated_bed": { "default_value": true },
-        "machine_filament_park_distance": { "value": "machine_heat_zone_length + 26.5" },
         "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
         "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
         "machine_head_with_fans_polygon":

resources/definitions/ultimaker_s3.def.json

@@ -156,7 +156,7 @@
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
-        "meshfix_maximum_deviation": { "value": "layer_height / 2" },
+        "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
         "retraction_combing": { "default_value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },

resources/definitions/ultimaker_s5.def.json

@@ -158,7 +158,7 @@
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
-        "meshfix_maximum_deviation": { "value": "layer_height / 2" },
+        "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
         "retraction_combing": { "default_value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },

resources/definitions/winbo_dragonl4.def.json

@@ -22,7 +22,6 @@
         "machine_height": { "default_value": 615 },
         "machine_heated_bed": { "default_value": true },
         "material_bed_temp_wait": { "default_value": false },
-        "machine_filament_park_distance": { "value": "machine_heat_zone_length" },
         "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
         "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
         "machine_head_with_fans_polygon":

resources/definitions/winbo_mini2.def.json

@@ -22,7 +22,6 @@
         "machine_height": { "default_value": 205 },
         "machine_heated_bed": { "default_value": false },
         "material_bed_temp_wait": { "default_value": false },
-        "machine_filament_park_distance": { "value": "machine_heat_zone_length" },
         "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
         "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
         "machine_head_with_fans_polygon":

resources/definitions/winbo_superhelper105.def.json

@@ -22,7 +22,6 @@
         "machine_height": { "default_value": 158 },
         "machine_heated_bed": { "default_value": false },
         "material_bed_temp_wait": { "default_value": false },
-        "machine_filament_park_distance": { "value": "machine_heat_zone_length" },
         "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
         "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
         "machine_head_with_fans_polygon":

resources/extruders/hms434_tool_1.def.json

@@ -16,7 +16,7 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n"
+          "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y120 F3000\nG1 X10 F12000\n\n"
         },
         "machine_extruder_end_code": {
            "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool1\n\n"

resources/extruders/hms434_tool_2.def.json

@@ -16,7 +16,7 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "material_diameter": { "default_value": 1.75 },
         "machine_extruder_start_code": {
-          "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n"
+          "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_retraction_prime_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y120 F3000\nG1 X10 F12000\n\n"
         },
         "machine_extruder_end_code": {
            "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool2\n\n"

resources/i18n/cs_CZ/fdmextruder.def.json.po

@@ -5,16 +5,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2020-02-20 17:30+0100\n"
+"Last-Translator: DenyCZ <www.github.com/DenyCZ>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
+"Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: DenyCZ <www.github.com/DenyCZ>\n"
-"Language: cs_CZ\n"
 "X-Generator: Poedit 2.3\n"
 
 #: fdmextruder.def.json
@@ -35,9 +35,7 @@ msgstr "Extruder"
 #: fdmextruder.def.json
 msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr ""
-"Vytlačovací stroj byl použit pro tisknutí. Toto je používáno při vícenásobné "
-"extruzi."
+msgstr "Vytlačovací stroj byl použit pro tisknutí. Toto je používáno při vícenásobné extruzi."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_id label"
@@ -56,12 +54,8 @@ msgstr "Průměr trysky"
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size description"
-msgid ""
-"The inner diameter of the nozzle. Change this setting when using a non-"
-"standard nozzle size."
-msgstr ""
-"Vnitřní průměr trysky. Změňte toto nastavení pokud používáte nestandardní "
-"velikost trysky."
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Vnitřní průměr trysky. Změňte toto nastavení pokud používáte nestandardní velikost trysky."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x label"
@@ -100,12 +94,8 @@ msgstr "Absolutní počáteční pozice extruderu"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
-msgstr ""
-"Udělejte počáteční pozici extrudéru absolutně, nikoli relativně k poslednímu "
-"známému umístění hlavy."
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
+msgstr "Udělejte počáteční pozici extrudéru absolutně, nikoli relativně k poslednímu známému umístění hlavy."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_x label"
@@ -144,12 +134,8 @@ msgstr "Absolutní finální pozice extruderu"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
-msgstr ""
-"Koncovou polohu extruderu udělejte absolutně, nikoliv relativně k poslednímu "
-"známému umístění hlavy."
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Koncovou polohu extruderu udělejte absolutně, nikoliv relativně k poslednímu známému umístění hlavy."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_x label"
@@ -178,9 +164,7 @@ msgstr "První Z pozice extruderu"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Souřadnice Z pozice, ve které tryska naplní tlak na začátku tisku."
 
 #: fdmextruder.def.json
@@ -190,14 +174,8 @@ msgstr "Chladič extruderu"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_cooling_fan_number description"
-msgid ""
-"The number of the print cooling fan associated with this extruder. Only "
-"change this from the default value of 0 when you have a different print "
-"cooling fan for each extruder."
-msgstr ""
-"Číslo ventilátoru chlazení tisku přidruženého k tomuto extrudéru. Tuto změnu "
-"změňte pouze z výchozí hodnoty 0, pokud máte pro každý extrudér jiný "
-"ventilátor chlazení tisku."
+msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder."
+msgstr "Číslo ventilátoru chlazení tisku přidruženého k tomuto extrudéru. Tuto změnu změňte pouze z výchozí hodnoty 0, pokud máte pro každý extrudér jiný ventilátor chlazení tisku."
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion label"
@@ -216,9 +194,7 @@ msgstr "Primární pozice extruderu X"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Souřadnice X polohy, ve které tryska naplní tlak na začátku tisku."
 
 #: fdmextruder.def.json
@@ -228,9 +204,7 @@ msgstr "Primární pozice extruderu Y"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Souřadnice Y polohy, ve které tryska naplní tlak na začátku tisku."
 
 #: fdmextruder.def.json
@@ -250,9 +224,5 @@ msgstr "Průměr"
 
 #: fdmextruder.def.json
 msgctxt "material_diameter description"
-msgid ""
-"Adjusts the diameter of the filament used. Match this value with the "
-"diameter of the used filament."
-msgstr ""
-"Nastavuje průměr použitého vlákna filamentu. Srovnejte tuto hodnotu s "
-"průměrem použitého vlákna."
+msgid "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament."
+msgstr "Nastavuje průměr použitého vlákna filamentu. Srovnejte tuto hodnotu s průměrem použitého vlákna."

resources/i18n/de_DE/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-03-13 14:00+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: German\n"

resources/i18n/de_DE/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: German <info@lionbridge.com>, German <info@bothof.nl>\n"
@@ -81,8 +81,8 @@ msgstr "Material-GUID"
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "GUID des Materials. Dies wird automatisch eingestellt. "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -294,16 +294,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "Die Distanz von der Düsenspitze, in der Wärme von der Düse zum Filament geleitet wird."
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "Parkdistanz Filament"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "Die Distanz von der Düsenspitze, wo das Filament geparkt wird, wenn ein Extruder nicht mehr verwendet wird."
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1259,6 +1249,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "Der Abstand, der auf die Polygone in der ersten Schicht angewendet wird. Ein negativer Wert kann ein Zerquetschen der ersten Schicht, auch als „Elefantenfuß“ bezeichnet, ausgleichen."
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2190,8 +2190,8 @@ msgstr "Ausspülgeschwindigkeit"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Interner Wert für Material Station"
+msgid "How fast to prime the material after switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length label"
@@ -2200,28 +2200,28 @@ msgstr "Ausspüldauer"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
-msgstr "Interner Wert für Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
-msgstr "Ausspülgeschwindigkeit am Ende des Filaments"
+msgid "End of Filament Purge Speed"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Interner Wert für Material Station"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
-msgstr "Ausspüldauer am Ende des Filaments"
+msgid "End of Filament Purge Length"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
-msgstr "Interner Wert für Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2230,8 +2230,8 @@ msgstr "Maximale Parkdauer"
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
-msgstr "Interner Wert für Material Station"
+msgid "How long the material can be kept out of dry storage safely."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor label"
@@ -2240,8 +2240,8 @@ msgstr "Faktor für Bewegung ohne Ladung"
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
-msgstr "Interner Wert für Material Station"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3020,8 +3020,8 @@ msgstr "Einzug aktivieren"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "Das Filament wird eingezogen, wenn sich die Düse über einen nicht zu bedruckenden Bereich bewegt. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3715,8 +3715,8 @@ msgstr "X/Y-Mindestabstand der Stützstruktur"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "Der Abstand der Stützstruktur zum Überhang in der X- und Y-Richtung. "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4325,8 +4325,7 @@ msgstr "Abstand zum Brim-Element"
 #: fdmprinter.def.json
 msgctxt "brim_gap description"
 msgid "The horizontal distance between the first brim line and the outline of the first layer of the print. A small gap can make the brim easier to remove while still providing the thermal benefits."
-msgstr "Der horizontale Abstand zwischen der ersten Brim-Linie und der Kontur der ersten Schicht des Drucks. Eine kleine Spalte kann das Entfernen des Brims vereinfachen,"
-" wobei trotzdem alle thermischen Vorteile genutzt werden können."
+msgstr "Der horizontale Abstand zwischen der ersten Brim-Linie und der Kontur der ersten Schicht des Drucks. Eine kleine Spalte kann das Entfernen des Brims vereinfachen, wobei trotzdem alle thermischen Vorteile genutzt werden können."
 
 #: fdmprinter.def.json
 msgctxt "brim_replaces_support label"
@@ -4815,8 +4814,8 @@ msgstr "Netzreparaturen"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "category_fixes"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -4935,8 +4934,8 @@ msgstr "Sonderfunktionen"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "category_blackmagic"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -4946,10 +4945,7 @@ msgstr "Druckreihenfolge"
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
 msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
-msgstr "Es wird festgelegt, ob eine Schicht für alle Modelle gleichzeitig gedruckt werden soll oder ob zuerst ein Modell fertig gedruckt wird, bevor der Druck"
-" eines weiteren begonnen wird. Der „Nacheinandermodus“ ist möglich, wenn a) nur ein Extruder aktiviert ist und b) alle Modelle voneinander getrennt sind,"
-" sodass sich der gesamte Druckkopf zwischen allen Modellen bewegen kann und alle Modelle niedriger sind als der Abstand zwischen der Düse und den X/Y-Achsen."
-" "
+msgstr "Es wird festgelegt, ob eine Schicht für alle Modelle gleichzeitig gedruckt werden soll oder ob zuerst ein Modell fertig gedruckt wird, bevor der Druck eines weiteren begonnen wird. Der „Nacheinandermodus“ ist möglich, wenn a) nur ein Extruder aktiviert ist und b) alle Modelle voneinander getrennt sind, sodass sich der gesamte Druckkopf zwischen allen Modellen bewegen kann und alle Modelle niedriger sind als der Abstand zwischen der Düse und den X/Y-Achsen. "
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -5113,8 +5109,8 @@ msgstr "Experimentell"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "experimentell!"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -5983,8 +5979,7 @@ msgstr "Maximale Dichte der Materialsparfüllung der Brücke"
 #: fdmprinter.def.json
 msgctxt "bridge_sparse_infill_max_density description"
 msgid "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin."
-msgstr "Maximale Dichte der Füllung, die im Sparmodus eingefüllt werden soll. Haut über spärlicher Füllung wird als nicht unterstützt betrachtet und kann daher"
-" als Brückenhaut behandelt werden."
+msgstr "Maximale Dichte der Füllung, die im Sparmodus eingefüllt werden soll. Haut über spärlicher Füllung wird als nicht unterstützt betrachtet und kann daher als Brückenhaut behandelt werden."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
@@ -6154,9 +6149,7 @@ msgstr "Düse zwischen den Schichten abwischen"
 #: fdmprinter.def.json
 msgctxt "clean_between_layers description"
 msgid "Whether to include nozzle wipe G-Code between layers (maximum 1 per layer). Enabling this setting could influence behavior of retract at layer change. Please use Wipe Retraction settings to control retraction at layers where the wipe script will be working."
-msgstr "Option für das Einfügen eines G-Codes für das Abwischen der Düse zwischen den Schichten (max. einer pro Schicht). Die Aktivierung dieser Einstellung könnte"
-" das Einzugsverhalten beim Schichtenwechsel beeinflussen. Verwenden Sie bitte die Einstellungen für Abwischen bei Einzug, um das Einziehen bei Schichten"
-" zu steuern, bei denen das Skript für das Abwischen aktiv wird."
+msgstr "Option für das Einfügen eines G-Codes für das Abwischen der Düse zwischen den Schichten (max. einer pro Schicht). Die Aktivierung dieser Einstellung könnte das Einzugsverhalten beim Schichtenwechsel beeinflussen. Verwenden Sie bitte die Einstellungen für Abwischen bei Einzug, um das Einziehen bei Schichten zu steuern, bei denen das Skript für das Abwischen aktiv wird."
 
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe label"
@@ -6166,8 +6159,7 @@ msgstr "Materialmenge zwischen den Wischvorgängen"
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe description"
 msgid "Maximum material that can be extruded before another nozzle wipe is initiated. If this value is less than the volume of material required in a layer, the setting has no effect in this layer, i.e. it is limited to one wipe per layer."
-msgstr "Die maximale Materialmenge, die extrudiert werden kann, bevor die Düse ein weiteres Mal abgewischt wird. Ist dieser Wert kleiner als das in einer Schicht"
-" benötigte Materialvolumen, so hat die Einstellung in dieser Schicht keine Auswirkung, d.h. sie ist auf ein Wischen pro Schicht begrenzt."
+msgstr "Die maximale Materialmenge, die extrudiert werden kann, bevor die Düse ein weiteres Mal abgewischt wird. Ist dieser Wert kleiner als das in einer Schicht benötigte Materialvolumen, so hat die Einstellung in dieser Schicht keine Auswirkung, d.h. sie ist auf ein Wischen pro Schicht begrenzt."
 
 #: fdmprinter.def.json
 msgctxt "wipe_retraction_enable label"
@@ -6247,8 +6239,7 @@ msgstr "Z-Sprung beim Abwischen"
 #: fdmprinter.def.json
 msgctxt "wipe_hop_enable description"
 msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate."
-msgstr "Beim Abwischen wird das Druckbett gesenkt, um einen Abstand zwischen Düse und Druck herzustellen. Das verhindert, dass die Düse während der Bewegungen"
-" den Druckkörper trifft und verringert die Möglichkeit, dass der Druck vom Druckbett heruntergestoßen wird."
+msgstr "Beim Abwischen wird das Druckbett gesenkt, um einen Abstand zwischen Düse und Druck herzustellen. Das verhindert, dass die Düse während der Bewegungen den Druckkörper trifft und verringert die Möglichkeit, dass der Druck vom Druckbett heruntergestoßen wird."
 
 #: fdmprinter.def.json
 msgctxt "wipe_hop_amount label"
@@ -6400,6 +6391,70 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angewandt wird."
 
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "GUID des Materials. Dies wird automatisch eingestellt. "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "Parkdistanz Filament"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "Die Distanz von der Düsenspitze, wo das Filament geparkt wird, wenn ein Extruder nicht mehr verwendet wird."
+
+#~ msgctxt "material_flush_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Interner Wert für Material Station"
+
+#~ msgctxt "material_flush_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Interner Wert für Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_speed label"
+#~ msgid "End Of Filament Purge Speed"
+#~ msgstr "Ausspülgeschwindigkeit am Ende des Filaments"
+
+#~ msgctxt "material_end_of_filament_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Interner Wert für Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_length label"
+#~ msgid "End Of Filament Purge Length"
+#~ msgstr "Ausspüldauer am Ende des Filaments"
+
+#~ msgctxt "material_end_of_filament_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Interner Wert für Material Station"
+
+#~ msgctxt "material_maximum_park_duration description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Interner Wert für Material Station"
+
+#~ msgctxt "material_no_load_move_factor description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Interner Wert für Material Station"
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "Das Filament wird eingezogen, wenn sich die Düse über einen nicht zu bedruckenden Bereich bewegt. "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "Der Abstand der Stützstruktur zum Überhang in der X- und Y-Richtung. "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "category_fixes"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "category_blackmagic"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "experimentell!"
+
 #~ msgctxt "machine_head_polygon label"
 #~ msgid "Machine Head Polygon"
 #~ msgstr "Gerätekopf Polygon"

resources/i18n/es_ES/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-03-13 14:00+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Spanish\n"

resources/i18n/es_ES/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Spanish <info@lionbridge.com>, Spanish <info@bothof.nl>\n"
@@ -81,8 +81,8 @@ msgstr "GUID del material"
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "GUID del material. Este valor se define de forma automática. "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -294,16 +294,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "Distancia desde la punta de la tobera que transfiere calor al filamento."
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "Distancia a la cual se estaciona el filamento"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "Distancia desde la punta de la tobera a la cual se estaciona el filamento cuando un extrusor ya no se utiliza."
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1259,6 +1249,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "Cantidad de desplazamiento aplicado a todos los polígonos de la primera capa. Un valor negativo puede compensar el aplastamiento de la primera capa, lo que se conoce como «pie de elefante»."
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2190,8 +2190,8 @@ msgstr "Velocidad de purga de descarga"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Valor interno de Material Station"
+msgid "How fast to prime the material after switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length label"
@@ -2200,28 +2200,28 @@ msgstr "Longitud de purga de descarga"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
-msgstr "Valor interno de Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
-msgstr "Velocidad de purga del extremo del filamento"
+msgid "End of Filament Purge Speed"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Valor interno de Material Station"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
-msgstr "Longitud de purga del extremo del filamento"
+msgid "End of Filament Purge Length"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
-msgstr "Valor interno de Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2230,8 +2230,8 @@ msgstr "Duración máxima de estacionamiento"
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
-msgstr "Valor interno de Material Station"
+msgid "How long the material can be kept out of dry storage safely."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor label"
@@ -2240,8 +2240,8 @@ msgstr "Factor de desplazamiento sin carga"
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
-msgstr "Valor interno de Material Station"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3020,8 +3020,8 @@ msgstr "Habilitar la retracción"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "Retrae el filamento cuando la tobera se mueve sobre un área no impresa. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3715,8 +3715,8 @@ msgstr "Distancia X/Y mínima del soporte"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "Distancia de la estructura de soporte desde el voladizo en las direcciones X/Y. "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4325,8 +4325,7 @@ msgstr "Distancia del borde"
 #: fdmprinter.def.json
 msgctxt "brim_gap description"
 msgid "The horizontal distance between the first brim line and the outline of the first layer of the print. A small gap can make the brim easier to remove while still providing the thermal benefits."
-msgstr "La distancia horizontal entre la primera línea de borde y el contorno de la primera capa de la impresión. Un pequeño orificio puede facilitar la eliminación"
-" del borde al tiempo que proporciona ventajas térmicas."
+msgstr "La distancia horizontal entre la primera línea de borde y el contorno de la primera capa de la impresión. Un pequeño orificio puede facilitar la eliminación del borde al tiempo que proporciona ventajas térmicas."
 
 #: fdmprinter.def.json
 msgctxt "brim_replaces_support label"
@@ -4815,8 +4814,8 @@ msgstr "Correcciones de malla"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "category_fixes"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -4935,8 +4934,8 @@ msgstr "Modos especiales"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "category_blackmagic"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -4946,9 +4945,7 @@ msgstr "Secuencia de impresión"
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
 msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
-msgstr "Con esta opción se decide si imprimir todos los modelos al mismo tiempo capa por capa o esperar a terminar un modelo antes de pasar al siguiente. El modo"
-" de uno en uno solo es posible si todos los modelos están lo suficientemente separados para que el cabezal de impresión pase entre ellos y todos estén"
-" a menos de la distancia entre la boquilla y los ejes X/Y. "
+msgstr "Con esta opción se decide si imprimir todos los modelos al mismo tiempo capa por capa o esperar a terminar un modelo antes de pasar al siguiente. El modo de uno en uno solo es posible si todos los modelos están lo suficientemente separados para que el cabezal de impresión pase entre ellos y todos estén a menos de la distancia entre la boquilla y los ejes X/Y. "
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -5112,8 +5109,8 @@ msgstr "Experimental"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "¡Experimental!"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -5982,8 +5979,7 @@ msgstr "Densidad máxima de relleno de puente escaso"
 #: fdmprinter.def.json
 msgctxt "bridge_sparse_infill_max_density description"
 msgid "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin."
-msgstr "La máxima densidad de relleno que se considera escasa. El forro sobre el relleno escaso se considera sin soporte y, por lo tanto, se puede tratar como"
-" un forro de puente."
+msgstr "La máxima densidad de relleno que se considera escasa. El forro sobre el relleno escaso se considera sin soporte y, por lo tanto, se puede tratar como un forro de puente."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
@@ -6153,9 +6149,7 @@ msgstr "Limpiar tobera entre capas"
 #: fdmprinter.def.json
 msgctxt "clean_between_layers description"
 msgid "Whether to include nozzle wipe G-Code between layers (maximum 1 per layer). Enabling this setting could influence behavior of retract at layer change. Please use Wipe Retraction settings to control retraction at layers where the wipe script will be working."
-msgstr "Posibilidad de incluir GCode de limpieza de tobera entre capas (máximo 1 por capa). Habilitar este ajuste puede influir en el comportamiento de retracción"
-" en el cambio de capa. Utilice los ajustes de retracción de limpieza para controlar la retracción en las capas donde la secuencia de limpieza estará en"
-" curso."
+msgstr "Posibilidad de incluir GCode de limpieza de tobera entre capas (máximo 1 por capa). Habilitar este ajuste puede influir en el comportamiento de retracción en el cambio de capa. Utilice los ajustes de retracción de limpieza para controlar la retracción en las capas donde la secuencia de limpieza estará en curso."
 
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe label"
@@ -6165,8 +6159,7 @@ msgstr "Volumen de material entre limpiezas"
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe description"
 msgid "Maximum material that can be extruded before another nozzle wipe is initiated. If this value is less than the volume of material required in a layer, the setting has no effect in this layer, i.e. it is limited to one wipe per layer."
-msgstr "Material máximo que puede extruirse antes de que se inicie otra limpieza de la tobera. Si este valor es inferior al volumen de material necesario en una"
-" capa, el ajuste no tiene efecto en esa capa, es decir, se limita a una limpieza por capa."
+msgstr "Material máximo que puede extruirse antes de que se inicie otra limpieza de la tobera. Si este valor es inferior al volumen de material necesario en una capa, el ajuste no tiene efecto en esa capa, es decir, se limita a una limpieza por capa."
 
 #: fdmprinter.def.json
 msgctxt "wipe_retraction_enable label"
@@ -6246,8 +6239,7 @@ msgstr "Limpiar salto en Z"
 #: fdmprinter.def.json
 msgctxt "wipe_hop_enable description"
 msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate."
-msgstr "Siempre que se limpia, la placa de impresión se baja para crear holgura entre la tobera y la impresión. Impide que la tobera golpee la impresión durante"
-" los movimientos de desplazamiento, reduciendo las posibilidades de golpear la impresión desde la placa de impresión."
+msgstr "Siempre que se limpia, la placa de impresión se baja para crear holgura entre la tobera y la impresión. Impide que la tobera golpee la impresión durante los movimientos de desplazamiento, reduciendo las posibilidades de golpear la impresión desde la placa de impresión."
 
 #: fdmprinter.def.json
 msgctxt "wipe_hop_amount label"
@@ -6399,6 +6391,70 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matriz de transformación que se aplicará al modelo cuando se cargue desde el archivo."
 
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "GUID del material. Este valor se define de forma automática. "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "Distancia a la cual se estaciona el filamento"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "Distancia desde la punta de la tobera a la cual se estaciona el filamento cuando un extrusor ya no se utiliza."
+
+#~ msgctxt "material_flush_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valor interno de Material Station"
+
+#~ msgctxt "material_flush_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valor interno de Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_speed label"
+#~ msgid "End Of Filament Purge Speed"
+#~ msgstr "Velocidad de purga del extremo del filamento"
+
+#~ msgctxt "material_end_of_filament_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valor interno de Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_length label"
+#~ msgid "End Of Filament Purge Length"
+#~ msgstr "Longitud de purga del extremo del filamento"
+
+#~ msgctxt "material_end_of_filament_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valor interno de Material Station"
+
+#~ msgctxt "material_maximum_park_duration description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valor interno de Material Station"
+
+#~ msgctxt "material_no_load_move_factor description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valor interno de Material Station"
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "Retrae el filamento cuando la tobera se mueve sobre un área no impresa. "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "Distancia de la estructura de soporte desde el voladizo en las direcciones X/Y. "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "category_fixes"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "category_blackmagic"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "¡Experimental!"
+
 #~ msgctxt "machine_head_polygon label"
 #~ msgid "Machine Head Polygon"
 #~ msgstr "Polígono del cabezal de la máquina"

resources/i18n/fdmextruder.def.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/fdmprinter.def.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -74,7 +74,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
+msgid "GUID of the material. This is set automatically."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -309,18 +309,6 @@ msgid ""
 "transferred to the filament."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid ""
-"The distance from the tip of the nozzle where to park the filament when an "
-"extruder is no longer used."
-msgstr ""
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1401,6 +1389,18 @@ msgid ""
 "foot\"."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid ""
+"Amount of offset applied to all holes in each layer. Positive values "
+"increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2502,7 +2502,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
+msgid "How fast to prime the material after switching to a different material."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2512,27 +2512,34 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
+msgid ""
+"How much material to use to purge the previous material out of the nozzle "
+"(in length of filament) when switching to a different material."
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
+msgid "End of Filament Purge Speed"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
+msgid ""
+"How fast to prime the material after replacing an empty spool with a fresh "
+"spool of the same material."
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
+msgid "End of Filament Purge Length"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
+msgid ""
+"How much material to use to purge the previous material out of the nozzle "
+"(in length of filament) when replacing an empty spool with a fresh spool of "
+"the same material."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2542,7 +2549,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
+msgid "How long the material can be kept out of dry storage safely."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2552,7 +2559,10 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
+msgid ""
+"A factor indicating how much the filament gets compressed between the feeder "
+"and the nozzle chamber, used to determine how far to move the material for a "
+"filament switch."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3422,8 +3432,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid ""
-"Retract the filament when the nozzle is moving over a non-printed area. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -4247,7 +4256,7 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
 msgid ""
-"Distance of the support structure from the overhang in the X/Y directions. "
+"Distance of the support structure from the overhang in the X/Y directions."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -5530,7 +5539,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
+msgid "Make the meshes more suited for 3D printing."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -5687,7 +5696,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
+msgid "Non-traditional ways to print your models."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -5905,7 +5914,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
+msgid "Features that haven't completely been fleshed out yet."
 msgstr ""
 
 #: fdmprinter.def.json

resources/i18n/fi_FI/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"

resources/i18n/fi_FI/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2017-09-27 12:27+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"
@@ -76,8 +76,8 @@ msgstr "Materiaalin GUID"
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "Materiaalin GUID. Tämä määritetään automaattisesti. "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -289,16 +289,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "Suuttimen kärjestä mitattu etäisyys, jonka suuttimen lämpö siirtyy tulostuslankaan."
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "Tulostuslangan säilytysetäisyys"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "Suuttimen kärjestä mitattu etäisyys, jonka päähän tulostuslanka asetetaan säilytykseen, kun suulaketta ei enää käytetä."
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1254,6 +1244,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "Kaikkia monikulmioita ensimmäisessä kerroksessa koskeva siirtymien määrä. Negatiivisella arvolla kompensoidaan ensimmäisen kerroksen litistymistä, joka tunnetaan \"elefantin jalkana\"."
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2183,7 +2183,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
+msgid "How fast to prime the material after switching to a different material."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2193,27 +2193,27 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
+msgid "End of Filament Purge Speed"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
+msgid "End of Filament Purge Length"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2223,7 +2223,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
+msgid "How long the material can be kept out of dry storage safely."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2233,7 +2233,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3013,8 +3013,8 @@ msgstr "Ota takaisinveto käyttöön"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "Vedä tulostuslanka takaisin, kun suutin liikkuu sellaisen alueen yli, jota ei tulosteta. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3708,8 +3708,8 @@ msgstr "Tuen X-/Y-minimietäisyys"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "Tukirakenteen etäisyys ulokkeesta X-/Y-suunnissa. "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4805,8 +4805,8 @@ msgstr "Verkkokorjaukset"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "category_fixes"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -4925,8 +4925,8 @@ msgstr "Erikoistilat"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "category_blackmagic"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -5100,8 +5100,8 @@ msgstr "Kokeellinen"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "kokeellinen!"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -6382,6 +6382,38 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Mallissa käytettävä muunnosmatriisi, kun malli ladataan tiedostosta."
 
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "Materiaalin GUID. Tämä määritetään automaattisesti. "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "Tulostuslangan säilytysetäisyys"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "Suuttimen kärjestä mitattu etäisyys, jonka päähän tulostuslanka asetetaan säilytykseen, kun suulaketta ei enää käytetä."
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "Vedä tulostuslanka takaisin, kun suutin liikkuu sellaisen alueen yli, jota ei tulosteta. "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "Tukirakenteen etäisyys ulokkeesta X-/Y-suunnissa. "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "category_fixes"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "category_blackmagic"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "kokeellinen!"
+
 #~ msgctxt "machine_head_polygon description"
 #~ msgid "A 2D silhouette of the print head (fan caps excluded)."
 #~ msgstr "2D-siluetti tulostuspäästä (tuulettimen kannattimet pois lukien)"

resources/i18n/fr_FR/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-03-13 14:00+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: French\n"

resources/i18n/fr_FR/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: French <info@lionbridge.com>, French <info@bothof.nl>\n"
@@ -81,8 +81,8 @@ msgstr "GUID matériau"
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "GUID du matériau. Cela est configuré automatiquement. "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -294,16 +294,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "Distance depuis la pointe du bec d'impression sur laquelle la chaleur du bec d'impression est transférée au filament."
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "Distance de stationnement du filament"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "Distance depuis la pointe du bec sur laquelle stationner le filament lorsqu'une extrudeuse n'est plus utilisée."
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1259,6 +1249,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "Le décalage appliqué à tous les polygones dans la première couche. Une valeur négative peut compenser l'écrasement de la première couche, appelé « patte d'éléphant »."
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2190,8 +2190,8 @@ msgstr "Vitesse de purge d'insertion"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Valeur interne de la Material Station"
+msgid "How fast to prime the material after switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length label"
@@ -2200,28 +2200,28 @@ msgstr "Longueur de la purge d'insertion"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
-msgstr "Valeur interne de la Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
-msgstr "Vitesse de purge de l'extrémité du filament"
+msgid "End of Filament Purge Speed"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Valeur interne de la Material Station"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
-msgstr "Longueur de purge de l'extrémité du filament"
+msgid "End of Filament Purge Length"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
-msgstr "Valeur interne de la Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2230,8 +2230,8 @@ msgstr "Durée maximum du stationnement"
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
-msgstr "Valeur interne de la Material Station"
+msgid "How long the material can be kept out of dry storage safely."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor label"
@@ -2240,8 +2240,8 @@ msgstr "Facteur de déplacement sans chargement"
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
-msgstr "Valeur interne de la Material Station"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3020,8 +3020,8 @@ msgstr "Activer la rétraction"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "Rétracte le filament quand la buse se déplace vers une zone non imprimée. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3715,8 +3715,8 @@ msgstr "Distance X/Y minimale des supports"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "Distance entre la structure de support et le porte-à-faux dans les directions X/Y. "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4325,8 +4325,7 @@ msgstr "Distance de la bordure"
 #: fdmprinter.def.json
 msgctxt "brim_gap description"
 msgid "The horizontal distance between the first brim line and the outline of the first layer of the print. A small gap can make the brim easier to remove while still providing the thermal benefits."
-msgstr "La distance horizontale entre la première ligne de bordure et le contour de la première couche de l'impression. Un petit trou peut faciliter l'enlèvement"
-" de la bordure tout en offrant des avantages thermiques."
+msgstr "La distance horizontale entre la première ligne de bordure et le contour de la première couche de l'impression. Un petit trou peut faciliter l'enlèvement de la bordure tout en offrant des avantages thermiques."
 
 #: fdmprinter.def.json
 msgctxt "brim_replaces_support label"
@@ -4815,8 +4814,8 @@ msgstr "Corrections"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "catégorie_corrections"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -4935,8 +4934,8 @@ msgstr "Modes spéciaux"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "catégorie_noirmagique"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -4946,9 +4945,7 @@ msgstr "Séquence d'impression"
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
 msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
-msgstr "Imprime tous les modèles en même temps, couche par couche, ou attend la fin d'un modèle pour en commencer un autre. Le mode « Un modèle à la fois » est"
-" disponible seulement si a) un seul extrudeur est activé et si b) tous les modèles sont suffisamment éloignés pour que la tête puisse passer entre eux"
-" et qu'ils sont tous inférieurs à la distance entre la buse et les axes X/Y. "
+msgstr "Imprime tous les modèles en même temps, couche par couche, ou attend la fin d'un modèle pour en commencer un autre. Le mode « Un modèle à la fois » est disponible seulement si a) un seul extrudeur est activé et si b) tous les modèles sont suffisamment éloignés pour que la tête puisse passer entre eux et qu'ils sont tous inférieurs à la distance entre la buse et les axes X/Y. "
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -5112,8 +5109,8 @@ msgstr "Expérimental"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "expérimental !"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -5982,8 +5979,7 @@ msgstr "Densité maximale du remplissage mince du pont"
 #: fdmprinter.def.json
 msgctxt "bridge_sparse_infill_max_density description"
 msgid "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin."
-msgstr "Densité maximale du remplissage considéré comme étant mince. La couche sur le remplissage mince est considérée comme non soutenue et peut donc être traitée"
-" comme une couche du pont."
+msgstr "Densité maximale du remplissage considéré comme étant mince. La couche sur le remplissage mince est considérée comme non soutenue et peut donc être traitée comme une couche du pont."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
@@ -6153,9 +6149,7 @@ msgstr "Essuyer la buse entre les couches"
 #: fdmprinter.def.json
 msgctxt "clean_between_layers description"
 msgid "Whether to include nozzle wipe G-Code between layers (maximum 1 per layer). Enabling this setting could influence behavior of retract at layer change. Please use Wipe Retraction settings to control retraction at layers where the wipe script will be working."
-msgstr "Inclure ou non le G-Code d'essuyage de la buse entre les couches (maximum 1 par couche). L'activation de ce paramètre peut influencer le comportement de"
-" la rétraction lors du changement de couche. Veuillez utiliser les paramètres de rétraction d'essuyage pour contrôler la rétraction aux couches où le script"
-" d'essuyage sera exécuté."
+msgstr "Inclure ou non le G-Code d'essuyage de la buse entre les couches (maximum 1 par couche). L'activation de ce paramètre peut influencer le comportement de la rétraction lors du changement de couche. Veuillez utiliser les paramètres de rétraction d'essuyage pour contrôler la rétraction aux couches où le script d'essuyage sera exécuté."
 
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe label"
@@ -6165,8 +6159,7 @@ msgstr "Volume de matériau entre les essuyages"
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe description"
 msgid "Maximum material that can be extruded before another nozzle wipe is initiated. If this value is less than the volume of material required in a layer, the setting has no effect in this layer, i.e. it is limited to one wipe per layer."
-msgstr "Le volume maximum de matériau qui peut être extrudé avant qu'un autre essuyage de buse ne soit lancé. Si cette valeur est inférieure au volume de matériau"
-" nécessaire dans une couche, le paramètre n'a aucun effet dans cette couche, c'est-à-dire qu'il est limité à un essuyage par couche."
+msgstr "Le volume maximum de matériau qui peut être extrudé avant qu'un autre essuyage de buse ne soit lancé. Si cette valeur est inférieure au volume de matériau nécessaire dans une couche, le paramètre n'a aucun effet dans cette couche, c'est-à-dire qu'il est limité à un essuyage par couche."
 
 #: fdmprinter.def.json
 msgctxt "wipe_retraction_enable label"
@@ -6246,8 +6239,7 @@ msgstr "Décalage en Z de l'essuyage"
 #: fdmprinter.def.json
 msgctxt "wipe_hop_enable description"
 msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate."
-msgstr "Lors de l'essuyage, le plateau de fabrication est abaissé pour créer un espace entre la buse et l'impression. Cela évite que la buse ne touche l'impression"
-" pendant les déplacements, réduisant ainsi le risque de heurter l'impression à partir du plateau de fabrication."
+msgstr "Lors de l'essuyage, le plateau de fabrication est abaissé pour créer un espace entre la buse et l'impression. Cela évite que la buse ne touche l'impression pendant les déplacements, réduisant ainsi le risque de heurter l'impression à partir du plateau de fabrication."
 
 #: fdmprinter.def.json
 msgctxt "wipe_hop_amount label"
@@ -6399,6 +6391,70 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matrice de transformation à appliquer au modèle lors de son chargement depuis le fichier."
 
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "GUID du matériau. Cela est configuré automatiquement. "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "Distance de stationnement du filament"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "Distance depuis la pointe du bec sur laquelle stationner le filament lorsqu'une extrudeuse n'est plus utilisée."
+
+#~ msgctxt "material_flush_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valeur interne de la Material Station"
+
+#~ msgctxt "material_flush_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valeur interne de la Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_speed label"
+#~ msgid "End Of Filament Purge Speed"
+#~ msgstr "Vitesse de purge de l'extrémité du filament"
+
+#~ msgctxt "material_end_of_filament_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valeur interne de la Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_length label"
+#~ msgid "End Of Filament Purge Length"
+#~ msgstr "Longueur de purge de l'extrémité du filament"
+
+#~ msgctxt "material_end_of_filament_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valeur interne de la Material Station"
+
+#~ msgctxt "material_maximum_park_duration description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valeur interne de la Material Station"
+
+#~ msgctxt "material_no_load_move_factor description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valeur interne de la Material Station"
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "Rétracte le filament quand la buse se déplace vers une zone non imprimée. "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "Distance entre la structure de support et le porte-à-faux dans les directions X/Y. "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "catégorie_corrections"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "catégorie_noirmagique"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "expérimental !"
+
 #~ msgctxt "machine_head_polygon label"
 #~ msgid "Machine Head Polygon"
 #~ msgstr "Polygone de la tête de machine"

resources/i18n/hu_HU/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2019-10-11 21:12+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2020-03-24 09:27+0100\n"
 "Last-Translator: Nagy Attila <vokroot@gmail.com>\n"
 "Language-Team: AT-VLOG\n"
@@ -54,12 +54,8 @@ msgstr "Fúvóka átmérő"
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size description"
-msgid ""
-"The inner diameter of the nozzle. Change this setting when using a non-standard "
-"nozzle size."
-msgstr ""
-"A fúvóka belső átmérője. Akkor változtasd meg ezt az értéket, ha nem szabványos "
-"méretű fúvókát használsz."
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "A fúvóka belső átmérője. Akkor változtasd meg ezt az értéket, ha nem szabványos méretű fúvókát használsz."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x label"
@@ -98,12 +94,8 @@ msgstr "Extruder Abszolút Indulási Helyzet"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
-"Make the extruder starting position absolute rather than relative to the last-"
-"known location of the head."
-msgstr ""
-"Az extruder abszolút kezdeti helyzete helyett a fej utolsó ismert helyzetét "
-"használja."
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
+msgstr "Az extruder abszolút kezdeti helyzete helyett a fej utolsó ismert helyzetét használja."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_x label"
@@ -142,12 +134,8 @@ msgstr "Extruder abszolút vég pozíció"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
-msgstr ""
-"Legyen az extruder végállása az abszolút helyzet helyett, az utolsó ismert fej "
-"pozíció."
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Legyen az extruder végállása az abszolút helyzet helyett, az utolsó ismert fej pozíció."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_x label"
@@ -176,9 +164,7 @@ msgstr "Az extruder Elsődleges Z Pozíciója"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Az az elsődleges Z helyzet, ahol a fúvóka a nyomtatást kezdi."
 
 #: fdmextruder.def.json
@@ -188,14 +174,8 @@ msgstr "Extruder hűtőventilátor"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_cooling_fan_number description"
-msgid ""
-"The number of the print cooling fan associated with this extruder. Only change "
-"this from the default value of 0 when you have a different print cooling fan for "
-"each extruder."
-msgstr ""
-"Az extruderekhez társított nyomtatási hűtőventilátor száma.Csak akkor "
-"változtassa meg ezt az alapértelmezett 0-tól, ha minden extruder számára külön "
-"nyomtatási hűtőventilátor van."
+msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder."
+msgstr "Az extruderekhez társított nyomtatási hűtőventilátor száma.Csak akkor változtassa meg ezt az alapértelmezett 0-tól, ha minden extruder számára külön nyomtatási hűtőventilátor van."
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion label"
@@ -214,9 +194,7 @@ msgstr "Az Extruder Elsődleges X Pozíciója"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Az az X koordináta, ahol a fúvóka a nyomtatást kezdi."
 
 #: fdmextruder.def.json
@@ -226,9 +204,7 @@ msgstr "Az Extruder Elsődleges Y Pozíciója"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Az az Y koordináta, ahol a fúvóka a nyomtatást kezdi."
 
 #: fdmextruder.def.json
@@ -248,7 +224,5 @@ msgstr "Átmérő"
 
 #: fdmextruder.def.json
 msgctxt "material_diameter description"
-msgid ""
-"Adjusts the diameter of the filament used. Match this value with the diameter of "
-"the used filament."
+msgid "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament."
 msgstr "Szálátmérő beállítása. Egyeztesd a használt nyomtatószál átmérőjével."

resources/i18n/it_IT/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-03-13 14:00+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Italian\n"

resources/i18n/it_IT/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Italian <info@lionbridge.com>, Italian <info@bothof.nl>\n"
@@ -81,8 +81,8 @@ msgstr "GUID materiale"
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "Il GUID del materiale. È impostato automaticamente. "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -294,16 +294,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "La distanza dalla punta dell’ugello in cui il calore dall’ugello viene trasferito al filamento."
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "Distanza posizione filamento"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "La distanza dalla punta dell’ugello in cui posizionare il filamento quando l’estrusore non è più utilizzato."
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1259,6 +1249,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "È l'entità di offset (estensione dello strato) applicata a tutti i poligoni di supporto in ciascuno strato. Un valore negativo può compensare lo schiacciamento del primo strato noto come \"zampa di elefante\"."
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2190,8 +2190,8 @@ msgstr "Velocità di svuotamento dello scarico"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Valore interno della Material Station"
+msgid "How fast to prime the material after switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length label"
@@ -2200,28 +2200,28 @@ msgstr "Lunghezza di svuotamento dello scarico"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
-msgstr "Valore interno della Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
-msgstr "Velocità di svuotamento della fine del filamento"
+msgid "End of Filament Purge Speed"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Valore interno della Material Station"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
-msgstr "Lunghezza di svuotamento della fine del filamento"
+msgid "End of Filament Purge Length"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
-msgstr "Valore interno della Material Station"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2230,8 +2230,8 @@ msgstr "Durata di posizionamento massima"
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
-msgstr "Valore interno della Material Station"
+msgid "How long the material can be kept out of dry storage safely."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor label"
@@ -2240,8 +2240,8 @@ msgstr "Fattore di spostamento senza carico"
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
-msgstr "Valore interno della Material Station"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3020,8 +3020,8 @@ msgstr "Abilitazione della retrazione"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "Ritrae il filamento quando l'ugello si sta muovendo su un'area non stampata. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3715,8 +3715,8 @@ msgstr "Distanza X/Y supporto minima"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "Indica la distanza della struttura di supporto dallo sbalzo, nelle direzioni X/Y. "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4325,8 +4325,7 @@ msgstr "Distanza del Brim"
 #: fdmprinter.def.json
 msgctxt "brim_gap description"
 msgid "The horizontal distance between the first brim line and the outline of the first layer of the print. A small gap can make the brim easier to remove while still providing the thermal benefits."
-msgstr "Distanza orizzontale tra la linea del primo brim e il profilo del primo layer della stampa. Un piccolo interstizio può semplificare la rimozione del brim"
-" e allo stesso tempo fornire dei vantaggi termici."
+msgstr "Distanza orizzontale tra la linea del primo brim e il profilo del primo layer della stampa. Un piccolo interstizio può semplificare la rimozione del brim e allo stesso tempo fornire dei vantaggi termici."
 
 #: fdmprinter.def.json
 msgctxt "brim_replaces_support label"
@@ -4815,8 +4814,8 @@ msgstr "Correzioni delle maglie"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "category_fixes"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -4935,8 +4934,8 @@ msgstr "Modalità speciali"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "category_blackmagic"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -4946,9 +4945,7 @@ msgstr "Sequenza di stampa"
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
 msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
-msgstr "Indica se stampare tutti i modelli un layer alla volta o se attendere di terminare un modello prima di passare al successivo. La modalità \"uno per volta\""
-" è possibile solo se a) è abilitato solo un estrusore b) tutti i modelli sono separati in modo tale che l'intera testina di stampa possa muoversi tra di"
-" essi e che tutti i modelli siano più bassi della distanza tra l'ugello e gli assi X/Y. "
+msgstr "Indica se stampare tutti i modelli un layer alla volta o se attendere di terminare un modello prima di passare al successivo. La modalità \"uno per volta\" è possibile solo se a) è abilitato solo un estrusore b) tutti i modelli sono separati in modo tale che l'intera testina di stampa possa muoversi tra di essi e che tutti i modelli siano più bassi della distanza tra l'ugello e gli assi X/Y. "
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -5112,8 +5109,8 @@ msgstr "Sperimentale"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "sperimentale!"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -5982,8 +5979,7 @@ msgstr "Densità massima del riempimento rado del Bridge"
 #: fdmprinter.def.json
 msgctxt "bridge_sparse_infill_max_density description"
 msgid "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin."
-msgstr "Densità massima del riempimento considerato rado. Il rivestimento esterno sul riempimento rado è considerato non supportato; pertanto potrebbe essere trattato"
-" come rivestimento esterno ponte."
+msgstr "Densità massima del riempimento considerato rado. Il rivestimento esterno sul riempimento rado è considerato non supportato; pertanto potrebbe essere trattato come rivestimento esterno ponte."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
@@ -6153,9 +6149,7 @@ msgstr "Pulitura ugello tra gli strati"
 #: fdmprinter.def.json
 msgctxt "clean_between_layers description"
 msgid "Whether to include nozzle wipe G-Code between layers (maximum 1 per layer). Enabling this setting could influence behavior of retract at layer change. Please use Wipe Retraction settings to control retraction at layers where the wipe script will be working."
-msgstr "Indica se includere nel G-Code la pulitura ugello tra i layer (massimo 1 per layer). L'attivazione di questa impostazione potrebbe influenzare il comportamento"
-" della retrazione al cambio layer. Utilizzare le impostazioni di retrazione per pulitura per controllare la retrazione in corrispondenza dei layer in cui"
-" sarà in funzione lo script di pulitura."
+msgstr "Indica se includere nel G-Code la pulitura ugello tra i layer (massimo 1 per layer). L'attivazione di questa impostazione potrebbe influenzare il comportamento della retrazione al cambio layer. Utilizzare le impostazioni di retrazione per pulitura per controllare la retrazione in corrispondenza dei layer in cui sarà in funzione lo script di pulitura."
 
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe label"
@@ -6165,8 +6159,7 @@ msgstr "Volume di materiale tra le operazioni di pulitura"
 #: fdmprinter.def.json
 msgctxt "max_extrusion_before_wipe description"
 msgid "Maximum material that can be extruded before another nozzle wipe is initiated. If this value is less than the volume of material required in a layer, the setting has no effect in this layer, i.e. it is limited to one wipe per layer."
-msgstr "Il massimo volume di materiale che può essere estruso prima di iniziare un'altra operazione di pulitura ugello. Se questo valore è inferiore al volume"
-" del materiale richiesto in un layer, l'impostazione non ha effetto in questo layer, vale a dire che si limita a una pulitura per layer."
+msgstr "Il massimo volume di materiale che può essere estruso prima di iniziare un'altra operazione di pulitura ugello. Se questo valore è inferiore al volume del materiale richiesto in un layer, l'impostazione non ha effetto in questo layer, vale a dire che si limita a una pulitura per layer."
 
 #: fdmprinter.def.json
 msgctxt "wipe_retraction_enable label"
@@ -6246,8 +6239,7 @@ msgstr "Pulitura Z Hop"
 #: fdmprinter.def.json
 msgctxt "wipe_hop_enable description"
 msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate."
-msgstr "Durante la pulizia, il piano di stampa viene abbassato per creare uno spazio tra l'ugello e la stampa. Questo impedisce l'urto dell'ugello sulla stampa"
-" durante gli spostamenti, riducendo la possibilità di far cadere la stampa dal piano."
+msgstr "Durante la pulizia, il piano di stampa viene abbassato per creare uno spazio tra l'ugello e la stampa. Questo impedisce l'urto dell'ugello sulla stampa durante gli spostamenti, riducendo la possibilità di far cadere la stampa dal piano."
 
 #: fdmprinter.def.json
 msgctxt "wipe_hop_amount label"
@@ -6399,6 +6391,70 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matrice di rotazione da applicare al modello quando caricato dal file."
 
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "Il GUID del materiale. È impostato automaticamente. "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "Distanza posizione filamento"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "La distanza dalla punta dell’ugello in cui posizionare il filamento quando l’estrusore non è più utilizzato."
+
+#~ msgctxt "material_flush_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valore interno della Material Station"
+
+#~ msgctxt "material_flush_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valore interno della Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_speed label"
+#~ msgid "End Of Filament Purge Speed"
+#~ msgstr "Velocità di svuotamento della fine del filamento"
+
+#~ msgctxt "material_end_of_filament_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valore interno della Material Station"
+
+#~ msgctxt "material_end_of_filament_purge_length label"
+#~ msgid "End Of Filament Purge Length"
+#~ msgstr "Lunghezza di svuotamento della fine del filamento"
+
+#~ msgctxt "material_end_of_filament_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valore interno della Material Station"
+
+#~ msgctxt "material_maximum_park_duration description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valore interno della Material Station"
+
+#~ msgctxt "material_no_load_move_factor description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Valore interno della Material Station"
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "Ritrae il filamento quando l'ugello si sta muovendo su un'area non stampata. "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "Indica la distanza della struttura di supporto dallo sbalzo, nelle direzioni X/Y. "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "category_fixes"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "category_blackmagic"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "sperimentale!"
+
 #~ msgctxt "machine_head_polygon label"
 #~ msgid "Machine Head Polygon"
 #~ msgstr "Poligono testina macchina"

resources/i18n/ja_JP/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-03-13 14:00+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Japanese\n"

resources/i18n/ja_JP/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-09-23 14:15+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Japanese <info@lionbridge.com>, Japanese <info@bothof.nl>\n"
@@ -83,11 +83,10 @@ msgctxt "material_guid label"
 msgid "Material GUID"
 msgstr "マテリアルGUID"
 
-# msgstr "マテリアルGUID"
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "マテリアルのGUID。これは自動的に設定されます。 "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -316,16 +315,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "ノズルからの熱がフィラメントに伝達される距離。"
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "フィラメント留め位置"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "エクストルーダーが使用していない時、フィラメントを留めている場所からノズルまでの距離。"
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1305,6 +1294,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "最初のレイヤーのポリゴンに適用されるオフセットの値。マイナスの値はelephant's footと呼ばれる第一層が潰れるを現象を軽減させます。"
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2271,8 +2270,8 @@ msgstr "フラッシュパージ速度"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Material Station内部値"
+msgid "How fast to prime the material after switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length label"
@@ -2281,28 +2280,28 @@ msgstr "フラッシュパージ長さ"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
-msgstr "Material Station内部値"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
-msgstr "フィラメント端パージ速度"
+msgid "End of Filament Purge Speed"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Material Station内部値"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
-msgstr "フィラメント端パージ長さ"
+msgid "End of Filament Purge Length"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
-msgstr "Material Station内部値"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2311,8 +2310,8 @@ msgstr "最大留め期間"
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
-msgstr "Material Station内部値"
+msgid "How long the material can be kept out of dry storage safely."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor label"
@@ -2321,8 +2320,8 @@ msgstr "無負荷移動係数"
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
-msgstr "Material Station内部値"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3110,8 +3109,8 @@ msgstr "引き戻し有効"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "ノズルが印刷しないで良い領域を移動する際にフィラメントを引き戻す。 "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3809,8 +3808,8 @@ msgstr "最小サポートX/Y距離"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "X/Y方向におけるオーバーハングからサポートまでの距離。 "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4936,8 +4935,8 @@ msgstr "メッシュ修正"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "カテゴリー_メッシュ修正"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -5056,8 +5055,8 @@ msgstr "特別モード"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "カテゴリー_ブラックマジック"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -5067,8 +5066,7 @@ msgstr "印刷頻度"
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
 msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
-msgstr "すべてのモデルをレイヤーごとに印刷するか、1つのモデルがプリント完了するのを待ち次のモデルに移動するかどうか。a）エクストルーダーが1つだけ有効であり、b）プリントヘッド全体がモデル間を通ることができるようにすべてのモデルが離れていて、すべてのモデルがノズルとX/Y軸間の距離よりも小さい場合、1つずつ印刷する事ができます。"
-" "
+msgstr "すべてのモデルをレイヤーごとに印刷するか、1つのモデルがプリント完了するのを待ち次のモデルに移動するかどうか。a）エクストルーダーが1つだけ有効であり、b）プリントヘッド全体がモデル間を通ることができるようにすべてのモデルが離れていて、すべてのモデルがノズルとX/Y軸間の距離よりも小さい場合、1つずつ印刷する事ができます。 "
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -5237,8 +5235,8 @@ msgstr "実験"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "実験的！"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -6534,6 +6532,71 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。"
 
+# msgstr "マテリアルGUID"
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "マテリアルのGUID。これは自動的に設定されます。 "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "フィラメント留め位置"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "エクストルーダーが使用していない時、フィラメントを留めている場所からノズルまでの距離。"
+
+#~ msgctxt "material_flush_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station内部値"
+
+#~ msgctxt "material_flush_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station内部値"
+
+#~ msgctxt "material_end_of_filament_purge_speed label"
+#~ msgid "End Of Filament Purge Speed"
+#~ msgstr "フィラメント端パージ速度"
+
+#~ msgctxt "material_end_of_filament_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station内部値"
+
+#~ msgctxt "material_end_of_filament_purge_length label"
+#~ msgid "End Of Filament Purge Length"
+#~ msgstr "フィラメント端パージ長さ"
+
+#~ msgctxt "material_end_of_filament_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station内部値"
+
+#~ msgctxt "material_maximum_park_duration description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station内部値"
+
+#~ msgctxt "material_no_load_move_factor description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station内部値"
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "ノズルが印刷しないで良い領域を移動する際にフィラメントを引き戻す。 "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "X/Y方向におけるオーバーハングからサポートまでの距離。 "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "カテゴリー_メッシュ修正"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "カテゴリー_ブラックマジック"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "実験的！"
+
 #~ msgctxt "machine_head_polygon label"
 #~ msgid "Machine Head Polygon"
 #~ msgstr "プリントヘッドポリゴン"

resources/i18n/ko_KR/fdmextruder.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2019-03-13 14:00+0200\n"
 "Last-Translator: Korean <info@bothof.nl>\n"
 "Language-Team: Jinbum Kim <Jinbuhm.Kim@gmail.com>, Korean <info@bothof.nl>\n"

resources/i18n/ko_KR/fdmprinter.def.json.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.5\n"
+"Project-Id-Version: Cura 4.6\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"POT-Creation-Date: 2020-04-06 16:33+0000\n"
 "PO-Revision-Date: 2020-02-21 14:59+0100\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Korean <info@lionbridge.com>, Jinbum Kim <Jinbuhm.Kim@gmail.com>, Korean <info@bothof.nl>\n"
@@ -82,8 +82,8 @@ msgstr "재료 GUID"
 
 #: fdmprinter.def.json
 msgctxt "material_guid description"
-msgid "GUID of the material. This is set automatically. "
-msgstr "재료의 GUID. 자동으로 설정됩니다. "
+msgid "GUID of the material. This is set automatically."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_diameter label"
@@ -295,16 +295,6 @@ msgctxt "machine_heat_zone_length description"
 msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament."
 msgstr "노즐의 열이 필라멘트로 전달되는 노즐의 끝에서부터의 거리."
 
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance label"
-msgid "Filament Park Distance"
-msgstr "필라멘트 park 거리"
-
-#: fdmprinter.def.json
-msgctxt "machine_filament_park_distance description"
-msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
-msgstr "익스트루더가 더 이상 사용되지 않을 때 필라멘트를 파킹 할 노즐의 끝에서부터의 거리."
-
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_temp_enabled label"
 msgid "Enable Nozzle Temperature Control"
@@ -1260,6 +1250,16 @@ msgctxt "xy_offset_layer_0 description"
 msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
 msgstr "첫 번째 레이어의 모든 다각형에 적용된 오프셋의 양입니다. 음수 값은 \"elephant's foot\"이라고 알려진 현상을 보완 할 수 있습니다."
 
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset label"
+msgid "Hole Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "hole_xy_offset description"
+msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -2191,8 +2191,8 @@ msgstr "수평 퍼지 속도"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Material Station의 내부 값"
+msgid "How fast to prime the material after switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length label"
@@ -2201,28 +2201,28 @@ msgstr "수평 퍼지 길이"
 
 #: fdmprinter.def.json
 msgctxt "material_flush_purge_length description"
-msgid "Material Station internal value"
-msgstr "Material Station의 내부 값"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed label"
-msgid "End Of Filament Purge Speed"
-msgstr "필라멘트 끝의 퍼지 속도"
+msgid "End of Filament Purge Speed"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_speed description"
-msgid "Material Station internal value"
-msgstr "Material Station의 내부 값"
+msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length label"
-msgid "End Of Filament Purge Length"
-msgstr "필라멘트 끝의 퍼지 길이"
+msgid "End of Filament Purge Length"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
-msgid "Material Station internal value"
-msgstr "Material Station의 내부 값"
+msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2231,8 +2231,8 @@ msgstr "최대 파크 기간"
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration description"
-msgid "Material Station internal value"
-msgstr "Material Station의 내부 값"
+msgid "How long the material can be kept out of dry storage safely."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor label"
@@ -2241,8 +2241,8 @@ msgstr "로드 이동 요인 없음"
 
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
-msgid "Material Station internal value"
-msgstr "Material Station의 내부 값"
+msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3021,8 +3021,8 @@ msgstr "리트렉션 활성화"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable description"
-msgid "Retract the filament when the nozzle is moving over a non-printed area. "
-msgstr "노즐이 프린팅되지 않은 영역 위로 움직일 때 필라멘트를 리트렉션합니다. "
+msgid "Retract the filament when the nozzle is moving over a non-printed area."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "retract_at_layer_change label"
@@ -3716,8 +3716,8 @@ msgstr "최소 서포트 X/Y 거리"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_distance_overhang description"
-msgid "Distance of the support structure from the overhang in the X/Y directions. "
-msgstr "X/Y 방향에서 오버행으로부터 서포트까지의 거리. "
+msgid "Distance of the support structure from the overhang in the X/Y directions."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -4815,8 +4815,8 @@ msgstr "메쉬 수정"
 
 #: fdmprinter.def.json
 msgctxt "meshfix description"
-msgid "category_fixes"
-msgstr "카테고리 수정"
+msgid "Make the meshes more suited for 3D printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all label"
@@ -4935,8 +4935,8 @@ msgstr "특수 모드"
 
 #: fdmprinter.def.json
 msgctxt "blackmagic description"
-msgid "category_blackmagic"
-msgstr "블랙매직 카테고리"
+msgid "Non-traditional ways to print your models."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence label"
@@ -5110,8 +5110,8 @@ msgstr "실험적인"
 
 #: fdmprinter.def.json
 msgctxt "experimental description"
-msgid "experimental!"
-msgstr "실험적인!"
+msgid "Features that haven't completely been fleshed out yet."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_tree_enable label"
@@ -6390,6 +6390,70 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬입니다."
 
+#~ msgctxt "material_guid description"
+#~ msgid "GUID of the material. This is set automatically. "
+#~ msgstr "재료의 GUID. 자동으로 설정됩니다. "
+
+#~ msgctxt "machine_filament_park_distance label"
+#~ msgid "Filament Park Distance"
+#~ msgstr "필라멘트 park 거리"
+
+#~ msgctxt "machine_filament_park_distance description"
+#~ msgid "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used."
+#~ msgstr "익스트루더가 더 이상 사용되지 않을 때 필라멘트를 파킹 할 노즐의 끝에서부터의 거리."
+
+#~ msgctxt "material_flush_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station의 내부 값"
+
+#~ msgctxt "material_flush_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station의 내부 값"
+
+#~ msgctxt "material_end_of_filament_purge_speed label"
+#~ msgid "End Of Filament Purge Speed"
+#~ msgstr "필라멘트 끝의 퍼지 속도"
+
+#~ msgctxt "material_end_of_filament_purge_speed description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station의 내부 값"
+
+#~ msgctxt "material_end_of_filament_purge_length label"
+#~ msgid "End Of Filament Purge Length"
+#~ msgstr "필라멘트 끝의 퍼지 길이"
+
+#~ msgctxt "material_end_of_filament_purge_length description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station의 내부 값"
+
+#~ msgctxt "material_maximum_park_duration description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station의 내부 값"
+
+#~ msgctxt "material_no_load_move_factor description"
+#~ msgid "Material Station internal value"
+#~ msgstr "Material Station의 내부 값"
+
+#~ msgctxt "retraction_enable description"
+#~ msgid "Retract the filament when the nozzle is moving over a non-printed area. "
+#~ msgstr "노즐이 프린팅되지 않은 영역 위로 움직일 때 필라멘트를 리트렉션합니다. "
+
+#~ msgctxt "support_xy_distance_overhang description"
+#~ msgid "Distance of the support structure from the overhang in the X/Y directions. "
+#~ msgstr "X/Y 방향에서 오버행으로부터 서포트까지의 거리. "
+
+#~ msgctxt "meshfix description"
+#~ msgid "category_fixes"
+#~ msgstr "카테고리 수정"
+
+#~ msgctxt "blackmagic description"
+#~ msgid "category_blackmagic"
+#~ msgstr "블랙매직 카테고리"
+
+#~ msgctxt "experimental description"
+#~ msgid "experimental!"
+#~ msgstr "실험적인!"
+
 #~ msgctxt "machine_head_polygon label"
 #~ msgid "Machine Head Polygon"
 #~ msgstr "머신 헤드 폴리곤"