Merge master into material marketplace

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,9 @@
 <!--
-The following template is useful for filing new issues. Processing an issue will go much faster when this is filled out, and issues which do not use this template will be removed.
+The following template is useful for filing new issues. Processing an issue will go much faster when this is filled out, and issues which do not use this template WILL BE REMOVED.
 
 Before filing, PLEASE check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
 
-Also, please note the application version in the title of the issue. For example: "[3.2.1] Cannot connect to 3rd-party printer". Please do not write thigns like "Request:" or "[BUG]" in the title; this is what labels are for.
+Also, please note the application version in the title of the issue. For example: "[3.2.1] Cannot connect to 3rd-party printer". Please do not write things like "Request:" or "[BUG]" in the title; this is what labels are for.
 
 It is also helpful to attach a project (.3mf or .curaproject) file and Cura log file so we can debug issues quicker.
 Information about how to find the log file can be found at https://github.com/Ultimaker/Cura/wiki/Cura-Preferences-and-Settings-Locations. To upload a project, try changing the extension to e.g. .curaproject.3mf.zip so that github accepts uploading the file. Otherwise we recommend http://wetransfer.com, but other file hosts like Google Drive or Dropbox work well too.
@@ -15,28 +15,19 @@ Thank you for using Cura!
 <!-- The version of the application this issue occurs with -->
 
 **Platform**
-<!-- Information about the platform the issue occurs on -->
+<!-- Information about the operating system the issue occurs on -->
-
-**Qt**
-<!-- The version of Qt used (not necessary if you're using the version from Ultimaker's website) -->
-
-**PyQt**
-<!-- The version of PyQt used (not necessary if you're using the version from Ultimaker's website) -->
-
-**Display Driver**
-<!--  Video driver name and version -->
 
 **Printer**
 <!-- Which printer was selected in Cura. Please attach project file as .curaproject.3mf.zip -->
 
 **Steps to Reproduce**
-<!-- Add the steps needed that lead up to the issue (replace this text) -->
+<!-- Add the steps needed that lead up to the issue -->
 
 **Actual Results**
-<!-- What happens after the above steps have been followed (replace this text) -->
+<!-- What happens after the above steps have been followed -->
 
 **Expected results**
-<!-- What should happen after the above steps have been followed (replace this text) -->
+<!-- What should happen after the above steps have been followed -->
 
 **Additional Information**
-<!-- Extra information relevant to the issue, like screenshots (replace this text) -->
+<!-- Extra information relevant to the issue, like screenshots -->

cura/CuraApplication.py

@@ -746,12 +746,6 @@ class CuraApplication(QtApplication):
 
         controller = self.getController()
 
-        # Initialize UI state
-        controller.setActiveStage("PrepareStage")
-        controller.setActiveView("SolidView")
-        controller.setCameraTool("CameraTool")
-        controller.setSelectionTool("SelectionTool")
-
         t = controller.getTool("TranslateTool")
         if t:
             t.setEnabledAxis([ToolHandle.XAxis, ToolHandle.YAxis, ToolHandle.ZAxis])
@@ -788,8 +782,11 @@ class CuraApplication(QtApplication):
         self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles))
         self.initializeEngine()
 
-        # Make sure the correct stage is activated after QML is loaded
+        # Initialize UI state
         controller.setActiveStage("PrepareStage")
+        controller.setActiveView("SolidView")
+        controller.setCameraTool("CameraTool")
+        controller.setSelectionTool("SelectionTool")
 
         # Hide the splash screen
         self.closeSplash()
@@ -1012,7 +1009,7 @@ class CuraApplication(QtApplication):
         return self._i18n_catalog.i18nc("@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm.", "%(width).1f x %(depth).1f x %(height).1f mm") % {'width' : self._scene_bounding_box.width.item(), 'depth': self._scene_bounding_box.depth.item(), 'height' : self._scene_bounding_box.height.item()}
 
     def updatePlatformActivityDelayed(self, node = None):
-        if node is not None and node.getMeshData() is not None:
+        if node is not None and (node.getMeshData() is not None or node.callDecoration("getLayerData")):
             self._update_platform_activity_timer.start()
 
     ##  Update scene bounding box for current build plate
@@ -1380,7 +1377,7 @@ class CuraApplication(QtApplication):
         try:
             group_node = Selection.getAllSelectedObjects()[0]
         except Exception as e:
-            Logger.log("d", "mergeSelected: Exception:", e)
+            Logger.log("e", "mergeSelected: Exception: %s", e)
             return
 
         meshes = [node.getMeshData() for node in group_node.getAllChildren() if node.getMeshData()]
@@ -1753,3 +1750,7 @@ class CuraApplication(QtApplication):
                     node = node.getParent()
 
                 Selection.add(node)
+
+    @pyqtSlot()
+    def showMoreInformationDialogForAnonymousDataCollection(self):
+        self._plugin_registry.getPluginObject("SliceInfoPlugin").showMoreInfoDialog()

cura/Machines/MaterialManager.py

@@ -235,7 +235,7 @@ class MaterialManager(QObject):
         return self._material_group_map.get(root_material_id)
 
     def getRootMaterialIDForDiameter(self, root_material_id: str, approximate_diameter: str) -> str:
-        return self._material_diameter_map.get(root_material_id).get(approximate_diameter, root_material_id)
+        return self._material_diameter_map.get(root_material_id, {}).get(approximate_diameter, root_material_id)
 
     def getRootMaterialIDWithoutDiameter(self, root_material_id: str) -> str:
         return self._diameter_material_map.get(root_material_id)

cura/Machines/Models/QualityManagementModel.py

@@ -69,9 +69,7 @@ class QualityManagementModel(ListModel):
         # Create quality_changes group items
         quality_changes_item_list = []
         for quality_changes_group in quality_changes_group_dict.values():
-            if quality_changes_group.quality_type not in available_quality_types:
+            quality_group = quality_group_dict.get(quality_changes_group.quality_type)
-                continue
-            quality_group = quality_group_dict[quality_changes_group.quality_type]
             item = {"name": quality_changes_group.name,
                     "is_read_only": False,
                     "quality_group": quality_group,

cura/Machines/Models/QualitySettingsModel.py

@@ -84,6 +84,9 @@ class QualitySettingsModel(ListModel):
         quality_group = self._selected_quality_item["quality_group"]
         quality_changes_group = self._selected_quality_item["quality_changes_group"]
 
+        quality_node = None
+        settings_keys = set()
+        if quality_group:
             if self._selected_position == self.GLOBAL_STACK_POSITION:
                 quality_node = quality_group.node_for_global
             else:

cura/Machines/QualityManager.py

@@ -163,7 +163,7 @@ class QualityManager(QObject):
     def _updateQualityGroupsAvailability(self, machine: "GlobalStack", quality_group_list):
         used_extruders = set()
         for i in range(machine.getProperty("machine_extruder_count", "value")):
-            if machine.extruders[str(i)].isEnabled:
+            if str(i) in machine.extruders and machine.extruders[str(i)].isEnabled:
                 used_extruders.add(str(i))
 
         # Update the "is_available" flag for each quality group.

cura/Machines/VariantManager.py

@@ -74,7 +74,11 @@ class VariantManager:
                 for variant_type in ALL_VARIANT_TYPES:
                     self._machine_to_variant_dict_map[variant_definition][variant_type] = dict()
 
+            try:
                 variant_type = variant_metadata["hardware_type"]
+            except KeyError:
+                Logger.log("w", "Variant %s does not specify a hardware_type; assuming 'nozzle'", variant_metadata["id"])
+                variant_type = VariantType.NOZZLE
             variant_type = VariantType(variant_type)
             variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type]
             if variant_name in variant_dict:

cura/MultiplyObjectsJob.py

@@ -32,14 +32,19 @@ class MultiplyObjectsJob(Job):
 
         root = scene.getRoot()
         arranger = Arrange.create(scene_root=root)
+        processed_nodes = []
         nodes = []
 
         for node in self._objects:
             # If object is part of a group, multiply group
             current_node = node
-            while current_node.getParent() and current_node.getParent().callDecoration("isGroup"):
+            while current_node.getParent() and (current_node.getParent().callDecoration("isGroup") or current_node.getParent().callDecoration("isSliceable")):
                 current_node = current_node.getParent()
 
+            if current_node in processed_nodes:
+                continue
+            processed_nodes.append(current_node)
+
             node_too_big = False
             if node.getBoundingBox().width < 300 or node.getBoundingBox().depth < 300:
                 offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(current_node, min_offset=self._min_offset)

cura/PrintInformation.py

@@ -138,6 +138,7 @@ class PrintInformation(QObject):
 
     def setPreSliced(self, pre_sliced):
         self._pre_sliced = pre_sliced
+        self._updateJobName()
         self.preSlicedChanged.emit()
 
     @pyqtProperty(Duration, notify = currentPrintTimeChanged)
@@ -322,15 +323,20 @@ class PrintInformation(QObject):
         # when a file is opened using the terminal; the filename comes from _onFileLoaded and still contains its
         # extension. This cuts the extension off if necessary.
         name = os.path.splitext(name)[0]
+        filename_parts = os.path.basename(base_name).split(".")
+
+        # If it's a gcode, also always update the job name
+        is_gcode = False
+        if len(filename_parts) > 1:
+            # Only check the extension(s)
+            is_gcode = "gcode" in filename_parts[1:]
 
         # if this is a profile file, always update the job name
         # name is "" when I first had some meshes and afterwards I deleted them so the naming should start again
         is_empty = name == ""
-        if is_project_file or (is_empty or (self._base_name == "" and self._base_name != name)):
+        if is_gcode or is_project_file or (is_empty or (self._base_name == "" and self._base_name != name)):
-            # remove ".curaproject" suffix from (imported) the file name
+            # Only take the file name part
-            if name.endswith(".curaproject"):
+            self._base_name = filename_parts[0]
-                name = name[:name.rfind(".curaproject")]
-            self._base_name = name
             self._updateJobName()
 
     @pyqtProperty(str, fset = setBaseName, notify = baseNameChanged)

cura/PrinterOutput/GenericOutputController.py

@@ -58,8 +58,7 @@ class GenericOutputController(PrinterOutputController):
         self._output_device.sendCommand("G90")
 
     def homeHead(self, printer):
-        self._output_device.sendCommand("G28 X")
+        self._output_device.sendCommand("G28 X Y")
-        self._output_device.sendCommand("G28 Y")
 
     def homeBed(self, printer):
         self._output_device.sendCommand("G28 Z")
@@ -152,3 +151,17 @@ class GenericOutputController(PrinterOutputController):
         for extruder in self._preheat_hotends:
             self.setTargetHotendTemperature(extruder.getPrinter(), extruder.getPosition(), 0)
         self._preheat_hotends = set()
+
+    # Cancel any ongoing preheating timers, without setting back the temperature to 0
+    # This can be used eg at the start of a print
+    def stopPreheatTimers(self):
+        if self._preheat_hotends_timer.isActive():
+            for extruder in self._preheat_hotends:
+                extruder.updateIsPreheating(False)
+            self._preheat_hotends = set()
+
+            self._preheat_hotends_timer.stop()
+
+        if self._preheat_bed_timer.isActive():
+            self._preheat_printer.updateIsPreheating(False)
+            self._preheat_bed_timer.stop()

cura/PrinterOutput/NetworkedPrinterOutputDevice.py

@@ -59,7 +59,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
         printer_type = self._properties.get(b"machine", b"").decode("utf-8")
         printer_type_identifiers = {
             "9066": "ultimaker3",
-            "9511": "ultimaker3_extended"
+            "9511": "ultimaker3_extended",
+            "9051": "ultimaker_s5"
         }
         self._printer_type = "Unknown"
         for key, value in printer_type_identifiers.items():

cura/PrinterOutputDevice.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-
+from UM.Decorators import deprecated
 from UM.i18n import i18nCatalog
 from UM.OutputDevice.OutputDevice import OutputDevice
 from PyQt5.QtCore import pyqtProperty, QObject, QTimer, pyqtSignal, QVariant
@@ -175,6 +175,10 @@ class PrinterOutputDevice(QObject, OutputDevice):
     def acceptsCommands(self):
         return self._accepts_commands
 
+    @deprecated("Please use the protected function instead", "3.2")
+    def setAcceptsCommands(self, accepts_commands):
+        self._setAcceptsCommands(accepts_commands)
+
     ##  Set a flag to signal the UI that the printer is not (yet) ready to receive commands
     def _setAcceptsCommands(self, accepts_commands):
         if self._accepts_commands != accepts_commands:

cura/Scene/CuraSceneNode.py

@@ -103,6 +103,25 @@ class CuraSceneNode(SceneNode):
                 return True
         return False
 
+    ##  Override of SceneNode._calculateAABB to exclude non-printing-meshes from bounding box
+    def _calculateAABB(self):
+        aabb = None
+        if self._mesh_data:
+            aabb = self._mesh_data.getExtents(self.getWorldTransformation())
+        else:  # If there is no mesh_data, use a boundingbox that encompasses the local (0,0,0)
+            position = self.getWorldPosition()
+            aabb = AxisAlignedBox(minimum = position, maximum = position)
+
+        for child in self._children:
+            if child.callDecoration("isNonPrintingMesh"):
+                # Non-printing-meshes inside a group should not affect push apart or drop to build plate
+                continue
+            if aabb is None:
+                aabb = child.getBoundingBox()
+            else:
+                aabb = aabb + child.getBoundingBox()
+        self._aabb = aabb
+
     ##  Taken from SceneNode, but replaced SceneNode with CuraSceneNode
     def __deepcopy__(self, memo):
         copy = CuraSceneNode(no_setting_override = True)  # Setting override will be added later

cura/Settings/ContainerManager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os.path
@@ -22,12 +22,10 @@ from UM.Settings.DefinitionContainer import DefinitionContainer
 from UM.Settings.InstanceContainer import InstanceContainer
 
 from UM.MimeTypeDatabase import MimeTypeNotFoundError
+from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.ContainerRegistry import ContainerRegistry
-
-from UM.i18n import i18nCatalog
-
 from cura.Settings.ExtruderManager import ExtruderManager
-from cura.Settings.ExtruderStack import ExtruderStack
+from UM.i18n import i18nCatalog
 
 catalog = i18nCatalog("cura")
 
@@ -289,7 +287,9 @@ class ContainerManager(QObject):
             with open(file_url, "rt", encoding = "utf-8") as f:
                 container.deserialize(f.read())
         except PermissionError:
-            return {"status": "error", "message": "Permission denied when trying to read the file"}
+            return {"status": "error", "message": "Permission denied when trying to read the file."}
+        except ContainerFormatError:
+            return {"status": "error", "Message": "The material file appears to be corrupt."}
         except Exception as ex:
             return {"status": "error", "message": str(ex)}
 

cura/Settings/CuraContainerRegistry.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os
@@ -10,6 +10,7 @@ from typing import Optional
 from PyQt5.QtWidgets import QMessageBox
 
 from UM.Decorators import override
+from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.InstanceContainer import InstanceContainer
@@ -418,7 +419,6 @@ class CuraContainerRegistry(ContainerRegistry):
 
         Logger.log("d", "Converting ContainerStack {stack} to {type}", stack = container.getId(), type = container_type)
 
-        new_stack = None
         if container_type == "extruder_train":
             new_stack = ExtruderStack.ExtruderStack(container.getId())
         else:
@@ -704,7 +704,11 @@ class CuraContainerRegistry(ContainerRegistry):
                 instance_container = InstanceContainer(container_id)
                 with open(file_path, "r", encoding = "utf-8") as f:
                     serialized = f.read()
+                try:
                     instance_container.deserialize(serialized, file_path)
+                except ContainerFormatError:
+                    Logger.logException("e", "Unable to deserialize InstanceContainer %s", file_path)
+                    continue
                 self.addContainer(instance_container)
                 break
 

cura/Settings/CuraContainerStack.py

@@ -283,6 +283,13 @@ class CuraContainerStack(ContainerStack):
 
         self._containers = new_containers
 
+        # CURA-5281
+        # Some stacks can have empty definition_changes containers which will cause problems.
+        # Make sure that all stacks here have non-empty definition_changes containers.
+        if isinstance(new_containers[_ContainerIndexes.DefinitionChanges], type(self._empty_instance_container)):
+            from cura.Settings.CuraStackBuilder import CuraStackBuilder
+            CuraStackBuilder.createDefinitionChangesContainer(self, self.getId() + "_settings")
+
     ## protected:
 
     # Helper to make sure we emit a PyQt signal on container changes.

cura/Settings/MachineManager.py

@@ -74,6 +74,7 @@ class MachineManager(QObject):
 
         self._stacks_have_errors = None  # type:Optional[bool]
 
+        self._empty_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
         self._empty_definition_changes_container = ContainerRegistry.getInstance().findContainers(id = "empty_definition_changes")[0]
         self._empty_variant_container = ContainerRegistry.getInstance().findContainers(id = "empty_variant")[0]
         self._empty_material_container = ContainerRegistry.getInstance().findContainers(id = "empty_material")[0]
@@ -310,19 +311,40 @@ class MachineManager(QObject):
         global_quality_changes = global_stack.qualityChanges
         global_quality_changes_name = global_quality_changes.getName()
 
+        # Try to set the same quality/quality_changes as the machine specified.
+        # If the quality/quality_changes is not available, switch to the default or the first quality that's available.
+        same_quality_found = False
+        quality_groups = self._application.getQualityManager().getQualityGroups(global_stack)
+
         if global_quality_changes.getId() != "empty_quality_changes":
-            quality_changes_groups = self._application._quality_manager.getQualityChangesGroups(global_stack)
+            quality_changes_groups = self._application.getQualityManager().getQualityChangesGroups(global_stack)
-            if global_quality_changes_name in quality_changes_groups:
+            new_quality_changes_group = quality_changes_groups.get(global_quality_changes_name)
-                new_quality_changes_group = quality_changes_groups[global_quality_changes_name]
+            if new_quality_changes_group is not None:
                 self._setQualityChangesGroup(new_quality_changes_group)
+                same_quality_found = True
+                Logger.log("i", "Machine '%s' quality changes set to '%s'",
+                           global_stack.getName(), new_quality_changes_group.name)
         else:
-            quality_groups = self._application._quality_manager.getQualityGroups(global_stack)
+            new_quality_group = quality_groups.get(quality_type)
-            if quality_type not in quality_groups:
+            if new_quality_group is not None:
-                Logger.log("w", "Quality type [%s] not found in available qualities [%s]", quality_type, ", ".join(quality_groups.keys()))
-                self._setEmptyQuality()
-                return
-            new_quality_group = quality_groups[quality_type]
                 self._setQualityGroup(new_quality_group, empty_quality_changes = True)
+                same_quality_found = True
+                Logger.log("i", "Machine '%s' quality set to '%s'",
+                           global_stack.getName(), new_quality_group.quality_type)
+
+        # Could not find the specified quality/quality_changes, switch to the preferred quality if available,
+        # otherwise the first quality that's available, otherwise empty (not supported).
+        if not same_quality_found:
+            Logger.log("i", "Machine '%s' could not find quality_type '%s' and quality_changes '%s'. "
+                       "Available quality types are [%s]. Switching to default quality.",
+                       global_stack.getName(), quality_type, global_quality_changes_name,
+                       ", ".join(quality_groups.keys()))
+            preferred_quality_type = global_stack.getMetaDataEntry("preferred_quality_type")
+            quality_group = quality_groups.get(preferred_quality_type)
+            if quality_group is None:
+                if quality_groups:
+                    quality_group = list(quality_groups.values())[0]
+            self._setQualityGroup(quality_group, empty_quality_changes = True)
 
     @pyqtSlot(str)
     def setActiveMachine(self, stack_id: str) -> None:
@@ -1012,6 +1034,10 @@ class MachineManager(QObject):
         if empty_quality_changes:
             self._current_quality_changes_group = None
 
+        if quality_group is None:
+            self._setEmptyQuality()
+            return
+
         # Set quality and quality_changes for the GlobalStack
         self._global_container_stack.quality = quality_group.node_for_global.getContainer()
         if empty_quality_changes:
@@ -1123,11 +1149,13 @@ class MachineManager(QObject):
 
         Logger.log("d", "Current quality type = [%s]", current_quality_type)
         if not self.activeMaterialsCompatible():
+            if current_quality_type is not None:
                 Logger.log("i", "Active materials are not compatible, setting all qualities to empty (Not Supported).")
                 self._setEmptyQuality()
             return
 
         if not available_quality_types:
+            if self._current_quality_changes_group is None:
                 Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).")
                 self._setEmptyQuality()
             return

cura/Settings/SettingInheritanceManager.py

@@ -82,8 +82,9 @@ class SettingInheritanceManager(QObject):
 
     def _onActiveExtruderChanged(self):
         new_active_stack = ExtruderManager.getInstance().getActiveExtruderStack()
-        # if not new_active_stack:
+        if not new_active_stack:
-        #     new_active_stack = self._global_container_stack
+            self._active_container_stack = None
+            return
 
         if new_active_stack != self._active_container_stack:  # Check if changed
             if self._active_container_stack:  # Disconnect signal from old container (if any)
@@ -154,6 +155,8 @@ class SettingInheritanceManager(QObject):
         has_setting_function = False
         if not stack:
             stack = self._active_container_stack
+        if not stack: #No active container stack yet!
+            return False
         containers = []
 
         ## Check if the setting has a user state. If not, it is never overwritten.

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -16,6 +16,7 @@ from UM.Application import Application
 from UM.Logger import Logger
 from UM.i18n import i18nCatalog
 from UM.Signal import postponeSignals, CompressTechnique
+from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.DefinitionContainer import DefinitionContainer
 from UM.Settings.InstanceContainer import InstanceContainer
@@ -303,7 +304,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                     containers_found_dict["quality_changes"] = True
                     # Check if there really is a conflict by comparing the values
                     instance_container = InstanceContainer(container_id)
+                    try:
                         instance_container.deserialize(serialized, file_name = instance_container_file_name)
+                    except ContainerFormatError:
+                        Logger.logException("e", "Failed to deserialize InstanceContainer %s from project file %s",
+                                            instance_container_file_name, file_name)
+                        return ThreeMFWorkspaceReader.PreReadResult.failed
                     if quality_changes[0] != instance_container:
                         quality_changes_conflict = True
             elif container_type == "quality":
@@ -610,8 +616,15 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
             definitions = self._container_registry.findDefinitionContainersMetadata(id = container_id)
             if not definitions:
                 definition_container = DefinitionContainer(container_id)
+                try:
                     definition_container.deserialize(archive.open(definition_container_file).read().decode("utf-8"),
                                                      file_name = definition_container_file)
+                except ContainerFormatError:
+                    # We cannot just skip the definition file because everything else later will just break if the
+                    # machine definition cannot be found.
+                    Logger.logException("e", "Failed to deserialize definition file %s in project file %s",
+                                        definition_container_file, file_name)
+                    definition_container = self._container_registry.findDefinitionContainers(id = "fdmprinter")[0] #Fall back to defaults.
                 self._container_registry.addContainer(definition_container)
             Job.yieldThread()
 
@@ -650,8 +663,13 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
                 if to_deserialize_material:
                     material_container = xml_material_profile(container_id)
+                    try:
                         material_container.deserialize(archive.open(material_container_file).read().decode("utf-8"),
                                                        file_name = container_id + "." + self._material_container_suffix)
+                    except ContainerFormatError:
+                        Logger.logException("e", "Failed to deserialize material file %s in project file %s",
+                                            material_container_file, file_name)
+                        continue
                     if need_new_name:
                         new_name = ContainerRegistry.getInstance().uniqueName(material_container.getName())
                         material_container.setName(new_name)

plugins/ChangeLogPlugin/ChangeLog.py

@@ -23,9 +23,9 @@ class ChangeLog(Extension, QObject,):
         self._changelog_context = None
         version_string = Application.getInstance().getVersion()
         if version_string is not "master":
-            self._version = Version(version_string)
+            self._current_app_version = Version(version_string)
         else:
-            self._version = None
+            self._current_app_version = None
 
         self._change_logs = None
         Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
@@ -76,7 +76,7 @@ class ChangeLog(Extension, QObject,):
                     self._change_logs[open_version][open_header].append(line)
 
     def _onEngineCreated(self):
-        if not self._version:
+        if not self._current_app_version:
             return #We're on dev branch.
 
         if Preferences.getInstance().getValue("general/latest_version_changelog_shown") == "master":
@@ -91,7 +91,7 @@ class ChangeLog(Extension, QObject,):
         if not Application.getInstance().getGlobalContainerStack():
             return
 
-        if self._version > latest_version_shown:
+        if self._current_app_version > latest_version_shown:
             self.showChangelog()
 
     def showChangelog(self):

plugins/ChangeLogPlugin/ChangeLog.txt

@@ -1,94 +1,122 @@
 [3.3.0]
+
+*Profile for the Ultimaker S5
+New printer profile for the Ultimaker S5, our latest 3D printer.
+
+*Profile for Tough PLA
+New material profile for Tough PLA, a material that prints with the convenience of PLA but with toughness and impact strength similar to ABS.
+
 *Configuration/sync button
-This new feature for network connected printers allows you to easily synchronize with all available configurations in your Cura Connect group. The name of the Host of the group is automatically pulled from the API, and network printers and local printers are now separated in the list for clarity.
+Configuration and synchronization button now available for Ultimaker network-connected printers to easily synchronize all possible available configurations in your Cura Connect group. The name of the group host is automatically pulled from the API, and network printers and local printers are separated in the list for clarity.
 
-*Single extrusion mode Ultimaker 3
+*Setting visibility preset
-Single extrusion mode allows to disable the unused extruder. This has the following positive effects:
+Presets guide you to find the most important settings incrementally. A small menu is located next to the search bar to easily access these new setting visibility presets. Contributed by fieldOfView.
-- Printing profiles are optimized to print with a single extruder, increasing print quality.
-- Global settings, like build plate temperature, are set for the active extruder.
-- The ‘print one at a time’ feature is now available.
 
-*Plugin browser updates
+*Print/save hotkey
-The plugin browser has been updated to look and feel similar to the other UI elements. The author name is clickable, which opens email for support. The plugins can now be uninstalled with an uninstall button.
+Send a print to the queue using Ctrl + P (Windows/Linux) or Cmd + P (Mac). If no printer is present on the network, it will save to file instead.
 
-*Block support - fieldOfView
+*3D model assistant
-This new feature allows you to easily add small cubic areas which prevent support material from being generated. Select the ‘block support’ tool and click the model to place a cube. This cube can be scaled, rotated and moved with the adjustment tools to modify it.
+Models sliced to print with ABS, PC, PP or CPE+ that have a larger footprint than 150 x 150 x 150 mm will notify the user with an icon and popup of how they can achieve the best possible print quality and reliability.
 
-*Setting visibility preset - fieldOfView
+*Refactored machine manager
-A convenient way to select a preset of settings to be visible. These presets guide you to find the most important Cura settings in an incremental way. A small menu is located next to the ‘search bar’ to easily access these new setting visibility presets.
+Refactored machine manager resulted in less manager classes. Changing settings, materials, variants and machines is now clearer. This results in an overall speed up when making changes.
 
-*Model assistant
+*Multiply models faster
-This feature provides useful information to the user based on their model. For now, it informs the user when printing models with a footprint larger than 15x15x10cm, printed with ABS, PC, PP or CPE+, that they may want to make changes to the model such as filleting sharp edges.
+Significant speed increase when multiplying models.
+
+*Auto slicing disabled by default
+The auto slice tool is now disabled by default. Users can still enable the feature in the user preferences dialog.
+
+*Updated fonts
+Default font changed to NotoSans to increase readability and consistency with Cura Connect.
+
+*Plugin browser look and feel
+The plugin browser has been updated with a better look and feel to bring it in line with other UI elements. The author name is clickable, which opens email for support. Plugins can now be uninstalled with an uninstall button.
+
+*Show tooltip for unavailable profile
+Tooltips have been added to incompatible settings, to give explanations why they are incompatible.
+
+*Empty material slots Ultimaker 3
+When a material is not loaded in the Ultimaker 3, it is now displayed as ‘Empty’ rather than ‘Unknown’.
+
+*Send over network confirmation
+When a print job is sent to a networked printer, a popup will confirm the job was sent, with a button to redirect the user to the monitor in Cura Connect.
+
+*Post processing scripts
+Fixed an issue where post processing scripts could be lost between sessions. Post processing scripts are now persistent between sessions.
+
+*Single extrusion mode
+Disable an extruder on a dual extrusion printer, so you are not limited by the other extruder’s parameters. To disable an extruder, right click it in the right panel, and select ‘Disable extruder’ to disable it. Re-enable by right clicking and selecting ‘enable extruder’. Printing profiles are optimized for the active extruder, as well as global settings, such as build plate temperature, to achieve better print quality. Using single extrusion mode also makes the ‘print one at a time’ feature available for the Ultimaker 3 and Ultimaker S5.
+
+*New UFP extension
+UFP (Ultimaker format package) is a new file extension that contains compressed gcode and a preview thumbnail. Using this extension enables a model preview (similar to the solid view) on the Ultimaker S5 touchscreen and in Cura Connect.
+
+*Compressed Gcode
+Gcode saved from Ultimaker Cura using the Ultimaker 3 profile is compressed (using gzip) to save space on printers.
 
 *Circular prime tower
-The prime tower shape has changed from rectangular to circular. This shape should increase the adhesion to the build plate, overall strength, and prevent delamination of the layers.
+Prime towers are now circular, resulting in a less jerky print head action, a more robust structure, better layer adhesion, and better build plate adhesion compared to square prime towers, reducing the chance of prime tower failure mid-print.
 
 *Connected infill lines
-Grid and triangular infill lines are now connected. This strengthens the internal structure of the infill and results in a more constant flow of filament while printing.
+Grid and triangular infill patterns now have connected lines for a more constant flow, better model rigidity, and reduced impact on the quality of the outer wall.
+
+*Support blocker - fieldOfView
+Generate a cube mesh to prevent support material generation in specific areas of a model. Each cube can be scaled, rotated, and moved with the standard adjustment tools to fit your requirements. When the support blocker tool is selected, single click in the area you want to block support to generate a mesh. If it is positioned by accident, click it again to remove it.
 
 *Real bridging - smartavionics
-This new experimental feature adds bridge detection which adjusts the print speed, flow and fan speed to enhance print quality on bridging parts.
+New experimental feature that detects bridges, adjusting the print speed, slow and fan speed to enhance print quality on bridging parts.
-
-*Initial layer flow
-The flow of the initial layer can now be adjusted separately. The new setting is found in the ‘material’ category.
-
-*Initial travel move retraction - smartavionics
-The initial travel move–before printing the brim/skirt–is now retracted. This reduces the chance of the prime blob dragging into the printed part.
 
 *Updated CuraEngine executable - thopiekar
 The CuraEngine executable now contains a dedicated icon, author information and a license.
 
-*Removed unnecessary retractions in spiralize - smartavionics
+*Use RapidJSON and ClipperLib from system libraries
-This feature removes retractions on layer change in spiralize mode, improving model quality.
+Application updated to use verified copies of libraries, reducing maintenance time keeping them up to date (the operating system is now responsible), as well as reducing the amount of code shipped (as necessary code is already on the user’s system).
 
-*Improve travel paths - smartavionics
+*Initial layer flow
-This feature optimizes the travel paths in a print, reducing print times and oozing of the material.
+New setting in the ‘material’ category where the initial layer flow can be adjusted.
 
-*Refactor machine manager
+*Initial travel move retraction - smartavionics
-The refactor of the machine manager resulted in fewer manager classes and made changing settings, materials, variants and machines more streamlined. This results in a significant overall improvement in speed when changing any of the aforementioned properties.
+Retraction has been added to the initial travel move, reducing the chance of prime blobs getting dragged into parts before brim/skirts are printed.
 
-*Speed up ‘multiply model’
+*Unnecessary retractions in spiralize - smartavionics
-The viewport frame rate is significantly increased when working with multiple models.
+Removes retractions on layer change in spiralize mode, improving model quality.
 
-*New font: Noto Sans
+*Faster travel paths - smartavionics
-The font of Ultimaker Cura has been changed to Noto Sans. This improves readability and consistency with Cura Connect. The font update also fixes some rendering issues on macOS.
+Until now, the path order optimizer worked on the basis that the shortest possible route could be taken from any one point to another. When combing is used, any route may longer, due to the need to route around obstacles. Now, it can use the combed distances to give more consistent results.
 
-*Plugin updates - Pheneeny
+*New plugins - Pheneeny
-Three new plugins were added to Ultimaker Cura; Scalable extra prime, Print temperature offset and Enclosure fan.
+Three new plugins have been added to Ultimaker Cura: Scalable extra prime, Print temperature offset, and Enclosure fan.
-Also Alexander Roessler made a new NGC writer plugin so you can export files in NGC format.
 
 *Pre-heat extruders - fieldOfView
 This new feature allows to preheat the extruders in the printer monitor.
 
-*Persistent post-processing scripts
+*Renamed TweakAtZ to ‘ChangeAtZ’
-Scripts are no longer erased after restarting Ultimaker Cura.
+This script has been renamed to be more consistent with other scripts.
 
-*GZ Reader
+*Import XML material profile checks
-By default, G-code for Ultimaker 3 machines is now saved as gzipped G-Code.
+XML material profile files are now checked before import in Ultimaker Cura to avoid potential issues. Contributed by fieldOfView.
 
-*Print preview image
+*Bug fixes
-Adds a preview image of the gcode to the slice information. This can be shown in Cura Connect.
+- Slice engine crash default temperature 0. Fixed an issue where the slicing engine could crash when slicing with a material at 0°C.
+- Network printer reconnect. Fixed an issue where the user could not connect to the printer after losing connection.
+- Pause at height ‘redo layers’ broken. Fixed an issue where setting ‘pause at height redo layers’ to 1 or more would cause failed prints.
+- Reset icon fix. Fixed an issue where manually reverting a default print profile value instead of using the reset button would cause the reset icon to remain.
+- Infill density for all extruders. The infill density in the recommended mode now applies to all extruders instead of extruder 1.
+- Polypropylene 0.25mm print profile. Fixed the maximum number of allowed extrusions for all 0.25mm Polypropylene profile prints.
+- SolidWorks plugin. Replaced comtypes module with win32com to fix issues.
+- Font rendering issues. Fixed font rendering issues on Max OSX.
+- Slice engine avoids broken wall segments. Fixed an issue where narrow walls created broken line segments by testing for such situations and using slightly narrow lines in those cases.
 
-*Use RapidJSON and ClipperLib from system libraries
+*Third party printers
-This reduces both the amount of trouble required to keep these libraries up to date (the operating system is now responsible) as well as reducing the amount of code we’re shipping.
 
-*TweakAtZ renamed to ChangeAtZ
+- FABtotum TPU profiles. Added third-party material profiles for TPU. Contributed by krios-fabteam.
-The TweakAtZ script has been renamed to ChangeAtZ to be more consistent with the rest of the scripts.
+- Dagoma profiles. Updated printer profiles contributed by dagoma3d.
-
+- uBuild profile. Updated printer profiles contributed by uBuild-3D.
-*XML material profile improvements
+- Cartesio printer updates. Updated profiles contributed by maukcc.
-XML material profiles are now checked before importing into Ultimaker Cura. ALso, XML material profiles can now contain Ultimaker Cura-specific properties (by fieldOfView).
+- Printrbot Simple Maker's Kit 1405. Profiles contributed by timur-tabi.
-
+- Added SeeMeCNC. Profiles contributed by pouncingiguana.
-*Ultimaker 3 network status improvements
+- Velleman Vertex. Updated printer and quality profiles contributed by velbn.
-- When a material is not loaded in the Ultimaker 3, Cura now displays it as ‘Empty’ rather than ‘Unknown’.
+- gMax 1.5. Profiles contributed by gordo3di.
-- When an Ultimaker 3 is in maintenance mode, Cura now displays it as ‘Unavailable’ rather than ‘Unknown’.
-
-*Bug Fixes
-- Cura Engine no longer crashes when slicing with a material at 0°C.
-- Cura reconnects to networked printers after connectivity loss.
-- Pause at height ‘redo layers’ broken no longer results in failed prints.
-- Setting reset icon no longer remains visible after resetting.
-- The infill density in the recommended mode now applies to all extruders instead of extruder 1.
-- The maximum number of allowed extrusions for all 0.25mm Polypropylene profile prints has been fixed.
 
 [3.2.1]
 *Bug fixes

plugins/CuraProfileReader/CuraProfileReader.py

@@ -1,9 +1,10 @@
-# Copyright (c) 2016 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 import configparser
 
 from UM.PluginRegistry import PluginRegistry
 from UM.Logger import Logger
+from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.InstanceContainer import InstanceContainer  # The new profile to make.
 from cura.ReaderWriters.ProfileReader import ProfileReader
 
@@ -77,7 +78,10 @@ class CuraProfileReader(ProfileReader):
         profile.addMetaDataEntry("type", "quality_changes")
         try:
             profile.deserialize(serialized)
-        except Exception as e:  # Parsing error. This is not a (valid) Cura profile then.
+        except ContainerFormatError as e:
+            Logger.log("e", "Error in the format of a container: %s", str(e))
+            return None
+        except Exception as e:
             Logger.log("e", "Error while trying to parse profile: %s", str(e))
             return None
         return profile

plugins/GCodeProfileReader/GCodeProfileReader.py

@@ -1,9 +1,10 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import re #Regular expressions for parsing escape characters in the settings.
 import json
 
+from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Logger import Logger
 from UM.i18n import i18nCatalog
@@ -113,6 +114,9 @@ def readQualityProfileFromString(profile_string):
     profile = InstanceContainer("")
     try:
         profile.deserialize(profile_string)
+    except ContainerFormatError as e:
+        Logger.log("e", "Corrupt profile in this g-code file: %s", str(e))
+        return None
     except Exception as e:  # Not a valid g-code file.
         Logger.log("e", "Unable to serialise the profile: %s", str(e))
         return None

plugins/GCodeReader/FlavorParser.py

@@ -362,12 +362,14 @@ class FlavorParser:
                 else:
                     Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type)
 
-            # When the layer change is reached, the polygon is computed so we have just one layer per layer per extruder
+            # When the layer change is reached, the polygon is computed so we have just one layer per extruder
             if self._is_layers_in_file and line[:len(self._layer_keyword)] == self._layer_keyword:
                 try:
                     layer_number = int(line[len(self._layer_keyword):])
                     self._createPolygon(self._current_layer_thickness, current_path, self._extruder_offsets.get(self._extruder_number, [0, 0]))
                     current_path.clear()
+                    # Start the new layer at the end position of the last layer
+                    current_path.append([current_position.x, current_position.y, current_position.z, current_position.f, current_position.e[self._extruder_number], LayerPolygon.MoveCombingType])
 
                     # When using a raft, the raft layers are stored as layers < 0, it mimics the same behavior
                     # as in ProcessSlicedLayersJob
@@ -406,7 +408,11 @@ class FlavorParser:
                     self._createPolygon(self._current_layer_thickness, current_path, self._extruder_offsets.get(self._extruder_number, [0, 0]))
                     current_path.clear()
 
+                    # When changing tool, store the end point of the previous path, then process the code and finally
+                    # add another point with the new position of the head.
+                    current_path.append([current_position.x, current_position.y, current_position.z, current_position.f, current_position.e[self._extruder_number], LayerPolygon.MoveCombingType])
                     current_position = self.processTCode(T, line, current_position, current_path)
+                    current_path.append([current_position.x, current_position.y, current_position.z, current_position.f, current_position.e[self._extruder_number], LayerPolygon.MoveCombingType])
 
             if line.startswith("M"):
                 M = self._getInt(line, "M")

plugins/ModelChecker/ModelChecker.py

@@ -31,9 +31,10 @@ class ModelChecker(QObject, Extension):
 
         Application.getInstance().initializationFinished.connect(self._pluginsInitialized)
         Application.getInstance().getController().getScene().sceneChanged.connect(self._onChanged)
+        Application.getInstance().globalContainerStackChanged.connect(self._onChanged)
 
     ##  Pass-through to allow UM.Signal to connect with a pyqtSignal.
-    def _onChanged(self, _):
+    def _onChanged(self, *args, **kwargs):
         self.onChanged.emit()
 
     ##  Called when plug-ins are initialized.
@@ -53,7 +54,6 @@ class ModelChecker(QObject, Extension):
         # has not done yet.
         global_container_stack = Application.getInstance().getGlobalContainerStack()
         if global_container_stack is None:
-            Application.getInstance().callLater(lambda: self.onChanged.emit())
             return False
 
         material_shrinkage = self._getMaterialShrinkage()

plugins/PostProcessingPlugin/PostProcessingPlugin.py

@@ -208,7 +208,7 @@ class PostProcessingPlugin(QObject, Extension):
         for script_str in scripts_list_strs.split("\n"): #Encoded config files should never contain three newlines in a row. At most 2, just before section headers.
             if not script_str: #There were no scripts in this one (or a corrupt file caused more than 3 consecutive newlines here).
                 continue
-            script_str = script_str.replace("\\n", "\n").replace("\\\\", "\\") #Unescape escape sequences.
+            script_str = script_str.replace(r"\\\n", "\n").replace(r"\\\\", "\\\\") #Unescape escape sequences.
             script_parser = configparser.ConfigParser(interpolation = None)
             script_parser.optionxform = str #Don't transform the setting keys as they are case-sensitive.
             script_parser.read_string(script_str)
@@ -241,7 +241,7 @@ class PostProcessingPlugin(QObject, Extension):
             parser.write(serialized)
             serialized.seek(0)
             script_str = serialized.read()
-            script_str = script_str.replace("\\", "\\\\").replace("\n", "\\n") #Escape newlines because configparser sees those as section delimiters.
+            script_str = script_str.replace("\\\\", r"\\\\").replace("\n", r"\\\n") #Escape newlines because configparser sees those as section delimiters.
             script_list_strs.append(script_str)
 
         script_list_strs = "\n".join(script_list_strs) #ConfigParser should never output three newlines in a row when serialised, so it's a safe delimiter.

plugins/PostProcessingPlugin/Script.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2015 Jaime van Kessel
-# Copyright (c) 2017 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
-from UM.Logger import Logger
 from UM.Signal import Signal, signalemitter
 from UM.i18n import i18nCatalog
 
 # Setting stuff import
 from UM.Application import Application
+from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.DefinitionContainer import DefinitionContainer
@@ -39,8 +39,12 @@ class Script:
                 self._definition = definitions[0]
             else:
                 self._definition = DefinitionContainer(setting_data["key"])
+                try:
                     self._definition.deserialize(json.dumps(setting_data))
                     ContainerRegistry.getInstance().addContainer(self._definition)
+                except ContainerFormatError:
+                    self._definition = None
+                    return
         self._stack.addContainer(self._definition)
         self._instance = InstanceContainer(container_id="ScriptInstanceContainer")
         self._instance.setDefinition(self._definition.getId())

plugins/SliceInfoPlugin/MoreInfoWindow.qml

@@ -0,0 +1,151 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.7
+import QtQuick.Window 2.2
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+
+import UM 1.3 as UM
+import Cura 1.0 as Cura
+
+
+UM.Dialog
+{
+    id: baseDialog
+    title: catalog.i18nc("@title:window", "More information on anonymous data collection")
+    visible: false
+
+    minimumWidth: 500 * screenScaleFactor
+    minimumHeight: 400 * screenScaleFactor
+    width: minimumWidth
+    height: minimumHeight
+
+    property bool allowSendData: true  // for saving the user's choice
+
+    onAccepted: manager.setSendSliceInfo(allowSendData)
+
+    onVisibilityChanged:
+    {
+        if (visible)
+        {
+            baseDialog.allowSendData = UM.Preferences.getValue("info/send_slice_info");
+            if (baseDialog.allowSendData)
+            {
+                allowSendButton.checked = true;
+            }
+            else
+            {
+                dontSendButton.checked = true;
+            }
+        }
+    }
+
+    Item
+    {
+        id: textRow
+        anchors
+        {
+            top: parent.top
+            bottom: radioButtonsRow.top
+            bottomMargin: UM.Theme.getSize("default_margin").height
+            left: parent.left
+            right: parent.right
+        }
+
+        Label
+        {
+            id: headerText
+            anchors
+            {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+
+            text: catalog.i18nc("@text:window", "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent.")
+            wrapMode: Text.WordWrap
+        }
+
+        TextArea
+        {
+            id: exampleData
+            anchors
+            {
+                top: headerText.bottom
+                topMargin: UM.Theme.getSize("default_margin").height
+                bottom: parent.bottom
+                bottomMargin: UM.Theme.getSize("default_margin").height
+                left: parent.left
+                right: parent.right
+            }
+
+            text: manager.getExampleData()
+            readOnly: true
+            textFormat: TextEdit.PlainText
+        }
+    }
+
+    Column
+    {
+        id: radioButtonsRow
+        width: parent.width
+        anchors.bottom: buttonRow.top
+        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+
+        ExclusiveGroup { id: group }
+
+        RadioButton
+        {
+            id: dontSendButton
+            text: catalog.i18nc("@text:window", "I don't want to send these data")
+            exclusiveGroup: group
+            onClicked:
+            {
+                baseDialog.allowSendData = !checked;
+            }
+        }
+        RadioButton
+        {
+            id: allowSendButton
+            text: catalog.i18nc("@text:window", "Allow sending these data to Ultimaker and help us improve Cura")
+            exclusiveGroup: group
+            onClicked:
+            {
+                baseDialog.allowSendData = checked;
+            }
+        }
+    }
+
+    Item
+    {
+        id: buttonRow
+        anchors.bottom: parent.bottom
+        width: parent.width
+        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+
+        UM.I18nCatalog { id: catalog; name: "cura" }
+
+        Button
+        {
+            anchors.right: parent.right
+            text: catalog.i18nc("@action:button", "OK")
+            onClicked:
+            {
+                baseDialog.accepted()
+                baseDialog.hide()
+            }
+        }
+
+        Button
+        {
+            anchors.left: parent.left
+            text: catalog.i18nc("@action:button", "Cancel")
+            onClicked:
+            {
+                baseDialog.rejected()
+                baseDialog.hide()
+            }
+        }
+    }
+}

plugins/SliceInfoPlugin/SliceInfo.py

@@ -1,8 +1,12 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from cura.CuraApplication import CuraApplication
+import json
-from cura.Settings.ExtruderManager import ExtruderManager
+import os
+import platform
+import time
+
+from PyQt5.QtCore import pyqtSlot, QObject
 
 from UM.Extension import Extension
 from UM.Application import Application
@@ -11,18 +15,11 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
 from UM.Message import Message
 from UM.i18n import i18nCatalog
 from UM.Logger import Logger
-
+from UM.PluginRegistry import PluginRegistry
-import time
-
 from UM.Qt.Duration import DurationFormat
 
 from .SliceInfoJob import SliceInfoJob
 
-import platform
-import math
-import urllib.request
-import urllib.parse
-import json
 
 catalog = i18nCatalog("cura")
 
@@ -30,15 +27,19 @@ catalog = i18nCatalog("cura")
 ##      This Extension runs in the background and sends several bits of information to the Ultimaker servers.
 #       The data is only sent when the user in question gave permission to do so. All data is anonymous and
 #       no model files are being sent (Just a SHA256 hash of the model).
-class SliceInfo(Extension):
+class SliceInfo(QObject, Extension):
     info_url = "https://stats.ultimaker.com/api/cura"
 
-    def __init__(self):
+    def __init__(self, parent = None):
-        super().__init__()
+        QObject.__init__(self, parent)
+        Extension.__init__(self)
         Application.getInstance().getOutputDeviceManager().writeStarted.connect(self._onWriteStarted)
         Preferences.getInstance().addPreference("info/send_slice_info", True)
         Preferences.getInstance().addPreference("info/asked_send_slice_info", False)
 
+        self._more_info_dialog = None
+        self._example_data_content = None
+
         if not Preferences.getInstance().getValue("info/asked_send_slice_info"):
             self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura collects anonymized usage statistics."),
                                                    lifetime = 0,
@@ -47,32 +48,64 @@ class SliceInfo(Extension):
 
             self.send_slice_info_message.addAction("Dismiss", name = catalog.i18nc("@action:button", "Allow"), icon = None,
                     description = catalog.i18nc("@action:tooltip", "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing."))
-            self.send_slice_info_message.addAction("Disable", name = catalog.i18nc("@action:button", "Disable"), icon = None,
+            self.send_slice_info_message.addAction("MoreInfo", name = catalog.i18nc("@action:button", "More info"), icon = None,
-                    description = catalog.i18nc("@action:tooltip", "Don't allow Cura to send anonymized usage statistics. You can enable it again in the preferences."), button_style = Message.ActionButtonStyle.LINK)
+                    description = catalog.i18nc("@action:tooltip", "See more information on what data Cura sends."), button_style = Message.ActionButtonStyle.LINK)
             self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered)
             self.send_slice_info_message.show()
 
+        Application.getInstance().initializationFinished.connect(self._onAppInitialized)
+
+    def _onAppInitialized(self):
+        if self._more_info_dialog is None:
+            self._more_info_dialog = self._createDialog("MoreInfoWindow.qml")
+
     ##  Perform action based on user input.
     #   Note that clicking "Disable" won't actually disable the data sending, but rather take the user to preferences where they can disable it.
     def messageActionTriggered(self, message_id, action_id):
         Preferences.getInstance().setValue("info/asked_send_slice_info", True)
-        if action_id == "Disable":
+        if action_id == "MoreInfo":
-            Preferences.getInstance().addPreference("info/send_slice_info", False)
+            self.showMoreInfoDialog()
         self.send_slice_info_message.hide()
 
+    def showMoreInfoDialog(self):
+        if self._more_info_dialog is None:
+            self._more_info_dialog = self._createDialog("MoreInfoWindow.qml")
+        self._more_info_dialog.open()
+
+    def _createDialog(self, qml_name):
+        Logger.log("d", "Creating dialog [%s]", qml_name)
+        file_path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), qml_name)
+        dialog = Application.getInstance().createQmlComponent(file_path, {"manager": self})
+        return dialog
+
+    @pyqtSlot(result = str)
+    def getExampleData(self) -> str:
+        if self._example_data_content is None:
+            file_path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "example_data.json")
+            with open(file_path, "r", encoding = "utf-8") as f:
+                self._example_data_content = f.read()
+        return self._example_data_content
+
+    @pyqtSlot(bool)
+    def setSendSliceInfo(self, enabled: bool):
+        Preferences.getInstance().setValue("info/send_slice_info", enabled)
+
     def _onWriteStarted(self, output_device):
         try:
             if not Preferences.getInstance().getValue("info/send_slice_info"):
                 Logger.log("d", "'info/send_slice_info' is turned off.")
                 return  # Do nothing, user does not want to send data
 
-            global_container_stack = Application.getInstance().getGlobalContainerStack()
+            application = Application.getInstance()
-            print_information = Application.getInstance().getPrintInformation()
+            machine_manager = application.getMachineManager()
+            print_information = application.getPrintInformation()
+
+            global_stack = machine_manager.activeMachine
 
             data = dict()  # The data that we're going to submit.
             data["time_stamp"] = time.time()
             data["schema_version"] = 0
-            data["cura_version"] = Application.getInstance().getVersion()
+            data["cura_version"] = application.getVersion()
 
             active_mode = Preferences.getInstance().getValue("cura/active_mode")
             if active_mode == 0:
@@ -80,7 +113,7 @@ class SliceInfo(Extension):
             else:
                 data["active_mode"] = "custom"
 
-            definition_changes = global_container_stack.definitionChanges
+            definition_changes = global_stack.definitionChanges
             machine_settings_changed_by_user = False
             if definition_changes.getId() != "empty":
                 # Now a definition_changes container will always be created for a stack,
@@ -92,16 +125,17 @@ class SliceInfo(Extension):
             data["language"] = Preferences.getInstance().getValue("general/language")
             data["os"] = {"type": platform.system(), "version": platform.version()}
 
-            data["active_machine"] = {"definition_id": global_container_stack.definition.getId(), "manufacturer": global_container_stack.definition.getMetaData().get("manufacturer","")}
+            data["active_machine"] = {"definition_id": global_stack.definition.getId(),
+                                      "manufacturer": global_stack.definition.getMetaDataEntry("manufacturer", "")}
 
             # add extruder specific data to slice info
             data["extruders"] = []
-            extruders = list(ExtruderManager.getInstance().getMachineExtruders(global_container_stack.getId()))
+            extruders = list(global_stack.extruders.values())
             extruders = sorted(extruders, key = lambda extruder: extruder.getMetaDataEntry("position"))
 
             for extruder in extruders:
                 extruder_dict = dict()
-                extruder_dict["active"] = ExtruderManager.getInstance().getActiveExtruderStack() == extruder
+                extruder_dict["active"] = machine_manager.activeStack == extruder
                 extruder_dict["material"] = {"GUID": extruder.material.getMetaData().get("GUID", ""),
                                              "type": extruder.material.getMetaData().get("material", ""),
                                              "brand": extruder.material.getMetaData().get("brand", "")
@@ -123,11 +157,11 @@ class SliceInfo(Extension):
                 extruder_dict["extruder_settings"] = extruder_settings
                 data["extruders"].append(extruder_dict)
 
-            data["quality_profile"] = global_container_stack.quality.getMetaData().get("quality_type")
+            data["quality_profile"] = global_stack.quality.getMetaData().get("quality_type")
 
             data["models"] = []
             # Listing all files placed on the build plate
-            for node in DepthFirstIterator(CuraApplication.getInstance().getController().getScene().getRoot()):
+            for node in DepthFirstIterator(application.getController().getScene().getRoot()):
                 if node.callDecoration("isSliceable"):
                     model = dict()
                     model["hash"] = node.getMeshData().getHash()
@@ -173,28 +207,28 @@ class SliceInfo(Extension):
                                    "total": int(print_information.currentPrintTime.getDisplayString(DurationFormat.Format.Seconds))}
 
             print_settings = dict()
-            print_settings["layer_height"] = global_container_stack.getProperty("layer_height", "value")
+            print_settings["layer_height"] = global_stack.getProperty("layer_height", "value")
 
             # Support settings
-            print_settings["support_enabled"] = global_container_stack.getProperty("support_enable", "value")
+            print_settings["support_enabled"] = global_stack.getProperty("support_enable", "value")
-            print_settings["support_extruder_nr"] = int(global_container_stack.getExtruderPositionValueWithDefault("support_extruder_nr"))
+            print_settings["support_extruder_nr"] = int(global_stack.getExtruderPositionValueWithDefault("support_extruder_nr"))
 
             # Platform adhesion settings
-            print_settings["adhesion_type"] = global_container_stack.getProperty("adhesion_type", "value")
+            print_settings["adhesion_type"] = global_stack.getProperty("adhesion_type", "value")
 
             # Shell settings
-            print_settings["wall_line_count"] = global_container_stack.getProperty("wall_line_count", "value")
+            print_settings["wall_line_count"] = global_stack.getProperty("wall_line_count", "value")
-            print_settings["retraction_enable"] = global_container_stack.getProperty("retraction_enable", "value")
+            print_settings["retraction_enable"] = global_stack.getProperty("retraction_enable", "value")
 
             # Prime tower settings
-            print_settings["prime_tower_enable"] = global_container_stack.getProperty("prime_tower_enable", "value")
+            print_settings["prime_tower_enable"] = global_stack.getProperty("prime_tower_enable", "value")
 
             # Infill settings
-            print_settings["infill_sparse_density"] = global_container_stack.getProperty("infill_sparse_density", "value")
+            print_settings["infill_sparse_density"] = global_stack.getProperty("infill_sparse_density", "value")
-            print_settings["infill_pattern"] = global_container_stack.getProperty("infill_pattern", "value")
+            print_settings["infill_pattern"] = global_stack.getProperty("infill_pattern", "value")
-            print_settings["gradual_infill_steps"] = global_container_stack.getProperty("gradual_infill_steps", "value")
+            print_settings["gradual_infill_steps"] = global_stack.getProperty("gradual_infill_steps", "value")
 
-            print_settings["print_sequence"] = global_container_stack.getProperty("print_sequence", "value")
+            print_settings["print_sequence"] = global_stack.getProperty("print_sequence", "value")
 
             data["print_settings"] = print_settings
 

plugins/SliceInfoPlugin/example_data.json

@@ -0,0 +1,113 @@
+{
+    "time_stamp": 1523973715.486928,
+    "schema_version": 0,
+    "cura_version": "3.3",
+    "active_mode": "custom",
+    "machine_settings_changed_by_user": true,
+    "language": "en_US",
+    "os": {
+        "type": "Linux",
+        "version": "#43~16.04.1-Ubuntu SMP Wed Mar 14 17:48:43 UTC 2018"
+    },
+    "active_machine": {
+        "definition_id": "ultimaker3",
+        "manufacturer": "Ultimaker B.V."
+    },
+    "extruders": [
+        {
+            "active": true,
+            "material": {
+                "GUID": "506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9",
+                "type": "PLA",
+                "brand": "Generic"
+            },
+            "material_used": 0.84,
+            "variant": "AA 0.4",
+            "nozzle_size": 0.4,
+            "extruder_settings": {
+                "wall_line_count": 3,
+                "retraction_enable": true,
+                "infill_sparse_density": 30,
+                "infill_pattern": "triangles",
+                "gradual_infill_steps": 0,
+                "default_material_print_temperature": 200,
+                "material_print_temperature": 200
+            }
+        },
+        {
+            "active": false,
+            "material": {
+                "GUID": "86a89ceb-4159-47f6-ab97-e9953803d70f",
+                "type": "PVA",
+                "brand": "Generic"
+            },
+            "material_used": 0.5,
+            "variant": "BB 0.4",
+            "nozzle_size": 0.4,
+            "extruder_settings": {
+                "wall_line_count": 3,
+                "retraction_enable": true,
+                "infill_sparse_density": 20,
+                "infill_pattern": "triangles",
+                "gradual_infill_steps": 0,
+                "default_material_print_temperature": 215,
+                "material_print_temperature": 220
+            }
+        }
+    ],
+    "quality_profile": "fast",
+    "models": [
+        {
+            "hash": "b72789b9beb5366dff20b1cf501020c3d4d4df7dc2295ecd0fddd0a6436df070",
+            "bounding_box": {
+                "minimum": {
+                    "x": -10.0,
+                    "y": 0.0,
+                    "z": -5.0
+                },
+                "maximum": {
+                    "x": 9.999999046325684,
+                    "y": 40.0,
+                    "z": 5.0
+                }
+            },
+            "transformation": {
+                "data": "[[ 1.  0.  0.  0.] [ 0.  1.  0. 20.] [ 0.  0.  1.  0.] [ 0.  0.  0.  1.]]"
+            },
+            "extruder": 0,
+            "model_settings": {
+                "support_enabled": true,
+                "support_extruder_nr": 1,
+                "infill_mesh": false,
+                "cutting_mesh": false,
+                "support_mesh": false,
+                "anti_overhang_mesh": false,
+                "wall_line_count": 3,
+                "retraction_enable": true,
+                "infill_sparse_density": 30,
+                "infill_pattern": "triangles",
+                "gradual_infill_steps": 0
+            }
+        }
+    ],
+    "print_times": {
+        "travel": 187,
+        "support": 825,
+        "infill": 351,
+        "total": 7234
+    },
+    "print_settings": {
+        "layer_height": 0.15,
+        "support_enabled": true,
+        "support_extruder_nr": 1,
+        "adhesion_type": "brim",
+        "wall_line_count": 3,
+        "retraction_enable": true,
+        "prime_tower_enable": true,
+        "infill_sparse_density": 20,
+        "infill_pattern": "triangles",
+        "gradual_infill_steps": 0,
+        "print_sequence": "all_at_once"
+    },
+    "output_to": "LocalFileOutputDevice"
+}

plugins/SupportEraser/SupportEraser.py

@@ -19,8 +19,10 @@ from cura.Scene.CuraSceneNode import CuraSceneNode
 
 from cura.PickingPass import PickingPass
 
+from UM.Operations.GroupedOperation import GroupedOperation
 from UM.Operations.AddSceneNodeOperation import AddSceneNodeOperation
 from UM.Operations.RemoveSceneNodeOperation import RemoveSceneNodeOperation
+from cura.Operations.SetParentOperation import SetParentOperation
 
 from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator
 from cura.Scene.BuildPlateDecorator import BuildPlateDecorator
@@ -56,7 +58,7 @@ class SupportEraser(Tool):
         modifiers = QApplication.keyboardModifiers()
         ctrl_is_active = modifiers & Qt.ControlModifier
 
-        if event.type == Event.MousePressEvent and self._controller.getToolsEnabled():
+        if event.type == Event.MousePressEvent and MouseEvent.LeftButton in event.buttons and self._controller.getToolsEnabled():
             if ctrl_is_active:
                 self._controller.setActiveTool("TranslateTool")
                 return
@@ -117,7 +119,10 @@ class SupportEraser(Tool):
         new_instance.resetState()  # Ensure that the state is not seen as a user state.
         settings.addInstance(new_instance)
 
-        op = AddSceneNodeOperation(node, parent)
+        op = GroupedOperation()
+        # First add node to the scene at the correct position/scale, before parenting, so the eraser mesh does not get scaled with the parent
+        op.addOperation(AddSceneNodeOperation(node, self._controller.getScene().getRoot()))
+        op.addOperation(SetParentOperation(node, parent))
         op.push()
         node.setPosition(position, CuraSceneNode.TransformSpace.World)
 

plugins/SupportEraser/__init__.py

@@ -4,7 +4,7 @@
 from . import SupportEraser
 
 from UM.i18n import i18nCatalog
-i18n_catalog = i18nCatalog("uranium")
+i18n_catalog = i18nCatalog("cura")
 
 def getMetaData():
     return {

plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py

@@ -50,6 +50,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         self._number_of_extruders = 2
 
+        self._dummy_lambdas = set()
+
         self._print_jobs = []
 
         self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "ClusterMonitorItem.qml")
@@ -64,6 +66,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
         self._authentication_state = AuthState.Authenticated
 
         self._error_message = None
+        self._write_job_progress_message = None
         self._progress_message = None
 
         self._active_printer = None  # type: Optional[PrinterOutputModel]
@@ -179,16 +182,33 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         job = WriteFileJob(writer, stream, nodes, preferred_format["mode"])
 
+        self._write_job_progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), lifetime = 0, dismissable = False, progress = -1,
+                                                   title = i18n_catalog.i18nc("@info:title", "Sending Data"), use_inactivity_timer = False)
+        self._write_job_progress_message.show()
+
+        self._dummy_lambdas = (target_printer, preferred_format, stream)
+        job.finished.connect(self._sendPrintJobWaitOnWriteJobFinished)
+
+        job.start()
+
+        yield True #Return that we had success!
+        yield #To prevent having to catch the StopIteration exception.
+
+    from cura.Utils.Threading import call_on_qt_thread
+
+    def _sendPrintJobWaitOnWriteJobFinished(self, job):
+        self._write_job_progress_message.hide()
+
         self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), lifetime = 0, dismissable = False, progress = -1,
                                          title = i18n_catalog.i18nc("@info:title", "Sending Data"))
         self._progress_message.addAction("Abort", i18n_catalog.i18nc("@action:button", "Cancel"), icon = None, description = "")
         self._progress_message.actionTriggered.connect(self._progressMessageActionTriggered)
         self._progress_message.show()
 
-        job.start()
-
         parts = []
 
+        target_printer, preferred_format, stream = self._dummy_lambdas
+
         # If a specific printer was selected, it should be printed with that machine.
         if target_printer:
             target_printer = self._printer_uuid_to_unique_name_mapping[target_printer]
@@ -199,8 +219,6 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         file_name = Application.getInstance().getPrintInformation().jobName + "." + preferred_format["extension"]
 
-        while not job.isFinished():
-            sleep(0.1)
         output = stream.getvalue() #Either str or bytes depending on the output mode.
         if isinstance(stream, io.StringIO):
             output = output.encode("utf-8")
@@ -209,9 +227,6 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         self._latest_reply_handler = self.postFormWithParts("print_jobs/", parts, onFinished=self._onPostPrintJobFinished, onProgress=self._onUploadPrintJobProgress)
 
-        yield True #Return that we had success!
-        yield #To prevent having to catch the StopIteration exception.
-
     @pyqtProperty(QObject, notify=activePrinterChanged)
     def activePrinter(self) -> Optional[PrinterOutputModel]:
         return self._active_printer

plugins/UM3NetworkPrinting/DiscoverUM3Action.qml

@@ -251,11 +251,17 @@ Cura.MachineAction
                             {
                                 if (base.selectedDevice.printerType == "ultimaker3")
                                 {
-                                    return catalog.i18nc("@label", "Ultimaker 3")
+                                    return "Ultimaker 3";
-                                } else if(base.selectedDevice.printerType == "ultimaker3_extended")
+                                }
+                                else if (base.selectedDevice.printerType == "ultimaker3_extended")
                                 {
-                                    return catalog.i18nc("@label", "Ultimaker 3 Extended")
+                                    return "Ultimaker 3 Extended";
-                                } else
+                                }
+                                else if (base.selectedDevice.printerType == "ultimaker_s5")
+                                {
+                                    return "Ultimaker S5";
+                                }
+                                else
                                 {
                                     return catalog.i18nc("@label", "Unknown") // We have no idea what type it is. Should not happen 'in the field'
                                 }

plugins/UM3NetworkPrinting/PrintWindow.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -48,7 +48,7 @@ UM.Dialog
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         anchors.leftMargin: UM.Theme.getSize("default_margin").width
         anchors.rightMargin: UM.Theme.getSize("default_margin").width
-        height: 50 * screenScaleFactord
+        height: 50 * screenScaleFactor
         Label
         {
             id: manualPrinterSelectionLabel

plugins/USBPrinting/USBPrinterOutputDevice.py

@@ -104,6 +104,9 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
         if self._is_printing:
             return  # Aleady printing
 
+        # cancel any ongoing preheat timer before starting a print
+        self._printers[0].getController().stopPreheatTimers()
+
         Application.getInstance().getController().setActiveStage("MonitorStage")
 
         # find the G-code for the active build plate to print

plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py

@@ -4,6 +4,8 @@
 import configparser #To parse preference files.
 import io #To serialise the preference files afterwards.
 import os
+import urllib.parse
+import re
 
 from UM.VersionUpgrade import VersionUpgrade #We're inheriting from this.
 
@@ -118,6 +120,12 @@ class VersionUpgrade27to30(VersionUpgrade):
         if not parser.has_section("general"):
             parser.add_section("general")
 
+        # Clean up the filename
+        file_base_name = os.path.basename(filename)
+        file_base_name = urllib.parse.unquote_plus(file_base_name)
+
+        um2_pattern = re.compile(r"^ultimaker[^a-zA-Z\\d\\s:]2_.*$")
+
         # The ultimaker 2 family
         ultimaker2_prefix_list = ["ultimaker2_extended_",
                                   "ultimaker2_go_",
@@ -127,9 +135,8 @@ class VersionUpgrade27to30(VersionUpgrade):
                                "ultimaker2_plus_"]
 
         # set machine definition to "ultimaker2" for the custom quality profiles that can be for the ultimaker 2 family
-        file_base_name = os.path.basename(filename)
+        is_ultimaker2_family = um2_pattern.match(file_base_name) is not None
-        is_ultimaker2_family = False
+        if not is_ultimaker2_family and not any(file_base_name.startswith(ep) for ep in exclude_prefix_list):
-        if not any(file_base_name.startswith(ep) for ep in exclude_prefix_list):
             is_ultimaker2_family = any(file_base_name.startswith(ep) for ep in ultimaker2_prefix_list)
 
         # ultimaker2 family quality profiles used to set as "fdmprinter" profiles

plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py

@@ -85,6 +85,34 @@ class VersionUpgrade32to33(VersionUpgrade):
         setting_version = int(parser.get("metadata", "setting_version", fallback = 0))
         return format_version * 1000000 + setting_version
 
+    ##  Upgrades a preferences file from version 3.2 to 3.3.
+    #
+    #   \param serialised The serialised form of a preferences file.
+    #   \param filename The name of the file to upgrade.
+    def upgradePreferences(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+
+        # Update version numbers
+        if "general" not in parser:
+            parser["general"] = {}
+        parser["general"]["version"] = "6"
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "4"
+
+        # The auto_slice preference changed its default value to "disabled" so if there is no value in previous versions,
+        # then it means the desired value is auto_slice "enabled"
+        if "auto_slice" not in parser["general"]:
+            parser["general"]["auto_slice"] = "True"
+        elif parser["general"]["auto_slice"] == "False":   # If the value is False, then remove the entry
+            del parser["general"]["auto_slice"]
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]
+
     ##  Upgrades a container stack from version 3.2 to 3.3.
     #
     #   \param serialised The serialised form of a container stack.

plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py

@@ -9,6 +9,8 @@ def getMetaData():
     return {
         "version_upgrade": {
             # From                           To                              Upgrade function
+            ("preferences", 5000004):        ("preferences", 6000004,        upgrade.upgradePreferences),
+
             ("machine_stack", 3000004):      ("machine_stack", 4000004,      upgrade.upgradeStack),
             ("extruder_train", 3000004):     ("extruder_train", 4000004,     upgrade.upgradeStack),
 
@@ -18,6 +20,10 @@ def getMetaData():
             ("variant", 2000004):            ("variant", 3000004,            upgrade.upgradeVariants)
         },
         "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
             "machine_stack": {
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./machine_instances"}

resources/definitions/deltacomb.def.json

@@ -14,7 +14,7 @@
     },
 
     "overrides": {
-        "machine_heated_bed":                    { "default_value": false },
+        "machine_heated_bed":                    { "default_value": true },
         "machine_width":                         { "default_value": 190 },
         "machine_height":                        { "default_value": 250 },
         "machine_depth":                         { "default_value": 190 },
@@ -25,41 +25,32 @@
         "machine_start_gcode":                   { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."},
         "machine_end_gcode":                     { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
         "machine_shape":                         { "default_value": "elliptic" },
-        "machine_max_feedrate_x":                { "default_value": 250 },
+        "retraction_hop_enabled":                { "default_value": true },
-        "machine_max_feedrate_y":                { "default_value": 250 },
+        "retraction_amount" :                    { "default_value": 3.5 },
-        "machine_max_feedrate_z":                { "default_value": 15 },
+        "retraction_speed" :                     { "default_value": 50 },
-        "machine_max_acceleration_x":            { "default_value": 10000 },
-        "machine_max_acceleration_y":            { "default_value": 10000 },
-        "machine_max_acceleration_z":            { "default_value": 50 },
-        "machine_max_acceleration_e":            { "default_value": 100 },
-        "machine_acceleration":                  { "default_value": 4000 },
-        "machine_max_jerk_xy":                   { "default_value": 25.0 },
-        "machine_max_jerk_z":                    { "default_value": 0.4 },
-        "machine_max_jerk_e":                    { "default_value": 1.0 },
-        "retraction_hop_enabled":                { "default_value": false },
-        "retraction_amount" :                    { "default_value": 4.5 },
-        "retraction_speed" :                     { "default_value": 40 },
         "material_diameter":                     { "default_value": 1.75 },
         "material_final_print_temperature":      { "value": "material_print_temperature - 5" },
         "material_initial_print_temperature":    { "value": "material_print_temperature" },
         "material_print_temperature_layer_0":    { "value": "material_print_temperature + 5" },
-        "travel_avoid_distance":                 { "default_value": 1, "value": 1 },
+        "travel_avoid_distance":                 { "default_value": 1, "value": "1" },
-        "speed_print" :                          { "default_value": 70 },
+        "speed_print" :                          { "default_value": 60 },
-        "speed_travel":                          { "default_value": 80, "value": 80 },
+        "speed_travel":                          { "value": "150.0" },
         "speed_infill":                          { "value": "round(speed_print * 1.05, 0)" },
         "speed_topbottom":                       { "value": "round(speed_print * 0.95, 0)" },
         "speed_wall":                            { "value": "speed_print" },
-        "speed_wall_0":                          { "value": "round(speed_print * 0.9, 0)" },
+        "speed_wall_0":                          { "value": "20" },
         "speed_wall_x":                          { "value": "speed_wall" },
         "speed_layer_0":                         { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
         "speed_travel_layer_0":                  { "value": "round(speed_travel * 0.7, 0)" },
         "skirt_brim_speed":                      { "value": "speed_layer_0" },
         "skirt_line_count":                      { "default_value": 3 },
         "skirt_brim_minimal_length":             { "default_value": 150 },
-        "infill_sparse_density":                 { "default_value": 24 },
+        "infill_sparse_density":                 { "default_value": 90 },
-        "top_bottom_thickness":                  { "default_value": 0.6 },
+        "gradual_infill_steps":                  { "default_value": 2 },
-        "support_z_distance":                    { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" },
         "infill_before_walls" :                  { "default_value": false },
+        "top_bottom_thickness":                  { "default_value": 0.6 },
+        "support_z_distance":                    { "value": "layer_height * 2" },
+        "support_bottom_distance":               { "value": "layer_height" },
         "support_use_towers" :                   { "default_value": false }
     }
 }

resources/definitions/fdmprinter.def.json

@@ -5008,7 +5008,7 @@
                     "unit": "mm³",
                     "default_value": 0,
                     "minimum_value": "0",
-                    "maximum_value_warning": "1",
+                    "maximum_value_warning": "2.5",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
@@ -5532,6 +5532,20 @@
                     "maximum_value_warning": "0.1",
                     "settable_per_mesh": true
                 },
+                "meshfix_maximum_travel_resolution":
+                {
+                    "label": "Maximum Travel Resolution",
+                    "description": "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0.02,
+                    "value": "meshfix_maximum_resolution * speed_travel / speed_print",
+                    "minimum_value": "0.001",
+                    "minimum_value_warning": "0.005",
+                    "maximum_value_warning": "1",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "support_skip_some_zags":
                 {
                     "label": "Break Up Support In Chunks",

resources/definitions/felixtec4dual.def.json

@@ -0,0 +1,59 @@
+{
+    "version": 2,
+    "name": "Felix Tec 4 Dual",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "kerog777@gmail.com",
+        "manufacturer": "Felix",
+        "platform": "FelixTec4_platform.stl",
+        "platform_offset": [-128,0, 102],
+        "machine_extruder_trains":
+        {
+            "0": "felixtec4_dual_extruder_0",
+            "1": "felixtec4_dual_extruder_1"
+        },
+        "file_formats": "text/x-gcode",
+        "has_variants": true,
+        "has_materials": true,
+        "preferred_variant_name": "0.35 mm",
+        "variants_name": "Nozzle Diam"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "FelixTec4Dual" },
+
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.3 },
+        "infill_sparse_density": { "default_value": 20 },
+        "wall_thickness": { "default_value": 1 },
+        "top_bottom_thickness": { "default_value": 1 },
+
+        "infill_pattern": { "value": "'tetrahedral'" },
+
+        "machine_width": { "default_value": 255 },
+        "machine_depth": { "default_value": 205 },
+        "machine_height": { "default_value": 225 },
+
+        "machine_heated_bed": { "default_value": true },
+        "machine_gcode_flavor": { "default_value": "Repetier" },
+        "machine_center_is_zero": { "default_value": false },
+
+        "speed_print": { "default_value": 60 },
+        "speed_travel": { "default_value": 200 },
+
+        "retraction_amount": { "default_value": 1 },
+        "retraction_speed": { "default_value": 50},
+        "material_flow": { "default_value": 87 },
+        "machine_nozzle_size": { "default_value": 0.35 },
+        "adhesion_type": { "default_value": "skirt" },
+        "skirt_brim_minimal_length": { "default_value": 130},
+
+        "material_diameter": { "default_value": 1.75 },
+         "machine_start_gcode": {
+            "default_value": "; FELIXprinters | www.FELIXprinters.com | Zeemanlaan 15 3401 MV IJsselstein The Netherlands\n; FELIX Tec 4 | Start Code Dual Extruders v1.0\n; Modified by kerog777@gmail.com\n;================================ \n;Initializing\nM80   ; Turn on the power supply\nM107     ; Turn off fans\nM117 Heating up\nM104 T0 S120\nM104 T1 S120\nM140 S{print_bed_temperature}   ; Heatup Bed and continue\nG28             ; Home all\nM109 T0 S{print_temperature}   ; Heatup hot-end and continue\nM117 Purging\nT0    ; Select extruder 1\nG92 E0    ; Reset extruder\nG1 X10.0 Y1.1 Z5.0 F15240   ; Move to start-line position\nG1 Z0.3 F15240    ; Move z up\nG1 X127.0 Y1.1 Z0.3 F1500.0 E15    ; Purge 1st line\nG92 E0    ; Reset extruder\n\n;================================ ; Initializing done\nM117 FELIXprinting"
+        },
+        "machine_end_gcode": {
+            "default_value": "; FELIXprinters End Code Tec Series v1.0\n; Modified by kerog777@gmail.com\n; ================================= \n; Move extruder to park position\nG91       ; Make coordinates relative\nG1 Z2 F1000       ; Move z 2mm up\nG90       ; Use absolute coordinates again\n  G1 X0 Y0 F15240   ; Move bed and printhead to ergonomic position\n\n; ================================= ; Turn off heaters\nM140 S0    ; Turn off bed heater\nT0    ; Select left extruder\nM104 T0 S0    ; Turn off heater and continue\n G92 E0    ; Reset extruder position\nG1 E-6    ; Retract filament 8mm\nG92 E0    ; Reset extruder position\nT1    ; Select right extruder\nM104 T1 S0    ; Turn off heater and continue\nG92 E0    ; Reset extruder position\nG1 E-6    ; Retract filament 8mm\nG92 E0    ; Reset extruder position\nT0    ; Select left extruder\n\n; ================================= ; Turn the rest off\nM107        ; Turn off fan\nM84    ; Disable steppers\nM117 Finished Printing!"
+        }
+    }
+}

resources/definitions/rigid3d_mucit.def.json

@@ -0,0 +1,149 @@
+{
+    "name": "Rigid3D Mucit",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Rigid3D",
+        "manufacturer": "Rigid3D",
+        "has_materials": false,
+        "file_formats": "text/x-gcode",
+        "platform": "rigid3d_mucit_platform.stl",
+        "platform_offset": [ 0, -19, 0],
+        "preferred_quality_type": "draft"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Rigid3D Mucit" },
+        "z_seam_type": {
+            "default_value": "random"
+        },
+        "machine_heated_bed": {
+            "default_value": false
+        },
+        "layer_height_0": {
+            "default_value": 0.2
+        },
+        "wall_thickness": {
+            "default_value": 0.8
+        },
+        "top_bottom_thickness": {
+            "default_value": 0.8
+        },
+        "xy_offset": {
+             "default_value": -0.2
+        },
+        "material_print_temperature": {
+            "value": "205"
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "speed_print": {
+            "default_value": 40
+        },
+        "speed_layer_0": {
+            "value": "15"
+        },
+        "speed_travel": {
+            "value": "100"
+        },
+        "support_enable": {
+            "default_value": false
+        },
+        "infill_sparse_density": {
+            "default_value": 15
+        },
+        "infill_pattern": {
+            "value": "'lines'"
+        },
+        "retraction_amount": {
+            "default_value": 1
+        },
+        "machine_width": {
+            "default_value": 150
+        },
+        "machine_height": {
+            "default_value": 150
+        },
+        "machine_depth": {
+            "default_value": 150
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap"
+        },
+        "cool_fan_enabled": {
+            "default_value": true
+        },
+        "cool_fan_speed": {
+            "default_value": 100,
+            "value": "100"
+        },
+        "cool_fan_speed_min": {
+            "default_value": 0
+        },
+        "cool_fan_full_at_height": {
+            "default_value": 0.5,
+            "value": "0.5"
+        },
+        "support_z_distance": {
+            "default_value": 0.2
+        },
+        "support_interface_enable": {
+            "default_value": true
+        },
+        "support_interface_height": {
+            "default_value": 0.8
+        },
+        "support_interface_density": {
+            "default_value": 70
+        },
+        "support_interface_pattern": {
+            "default_value": "grid"
+        },
+        "fill_outline_gaps": {
+            "default_value": true
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "ironing_only_highest_layer": {
+            "default_value": true
+        },
+        "material_initial_print_temperature": {
+            "value": "205"
+        },
+        "optimize_wall_printing_order": {
+            "default_value": true
+        },
+        "retraction_speed": {
+            "value": "40"
+        },
+        "roofing_layer_count": {
+            "value": "1"
+        },
+        "speed_equalize_flow_enabled": {
+            "default_value": true
+        },
+        "speed_topbottom": {
+            "value": "40"
+        },
+        "speed_travel_layer_0": {
+            "value": "15"
+        },
+        "speed_wall_0": {
+            "value": "30"
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "machine_start_gcode": {
+            "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"
+        }
+    }
+}

resources/definitions/ultimaker2.def.json

@@ -14,6 +14,7 @@
         "platform_offset": [9, 0, 0],
         "has_materials": false,
         "has_machine_quality": true,
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "generic_pva", "generic_tough_pla"],
         "first_start_actions": ["UM2UpgradeSelection"],
         "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"]
     },

resources/definitions/ultimaker_original.def.json

@@ -11,6 +11,7 @@
         "icon": "icon_ultimaker.png",
         "platform": "ultimaker_platform.stl",
         "has_materials": true,
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "generic_pva", "generic_tough_pla"],
         "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
         "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"]
     },

resources/definitions/ultimaker_original_dual.def.json

@@ -11,6 +11,7 @@
         "icon": "icon_ultimaker.png",
         "platform": "ultimaker_platform.stl",
         "has_materials": true,
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "generic_pva", "generic_tough_pla"],
         "machine_extruder_trains":
         {
             "0": "ultimaker_original_dual_1st",

resources/definitions/ultimaker_s5.def.json

@@ -0,0 +1,159 @@
+{
+    "id": "ultimaker_s5",
+    "version": 2,
+    "name": "Ultimaker S5",
+    "inherits": "ultimaker",
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker B.V.",
+        "category": "Ultimaker",
+        "visible": true,
+        "file_formats": "application/x-ufp;text/x-gcode",
+        "platform": "ultimaker_s5_platform.obj",
+        "platform_texture": "UltimakerS5backplate.png",
+        "platform_offset": [0, -30, -10],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_machine_materials": true,
+        "has_variant_materials": true,
+        "has_variant_buildplates": true,
+        "has_variants": true,
+        "preferred_variant_name": "AA 0.4",
+        "preferred_variant_buildplate_name": "Glass",
+        "preferred_quality_type": "normal",
+        "variants_name": "Print core",
+        "nozzle_offsetting_for_disallowed_areas": false,
+        "machine_extruder_trains":
+        {
+            "0": "ultimaker_s5_extruder_left",
+            "1": "ultimaker_s5_extruder_right"
+        },
+        "first_start_actions": [ "DiscoverUM3Action" ],
+        "supported_actions": [ "DiscoverUM3Action" ],
+        "supports_usb_connection": false,
+        "weight": -1
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "Ultimaker S5" },
+        "machine_width": { "default_value": 330 },
+        "machine_depth": { "default_value": 245 },
+        "machine_height": { "default_value": 300 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
+        "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value":
+            [
+                [ -41.4, -45.8 ],
+                [ -41.4, 36.0 ],
+                [ 63.3, 36.0 ],
+                [ 63.3, -45.8 ]
+            ]
+        },
+        "machine_gcode_flavor": { "default_value": "Griffin" },
+        "machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_y": { "default_value": 300 },
+        "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_acceleration": { "default_value": 3000 },
+        "gantry_height": { "default_value": 60 },
+        "machine_extruder_count": { "default_value": 2 },
+        "extruder_prime_pos_abs": { "default_value": true },
+        "machine_start_gcode": { "default_value": "" },
+        "machine_end_gcode": { "default_value": "" },
+        "prime_tower_position_x": { "default_value": 345 },
+        "prime_tower_position_y": { "default_value": 222.5 },
+        "prime_blob_enable": { "enabled": true },
+
+        "speed_travel":
+        {
+            "maximum_value": "150",
+            "value": "150"
+        },
+
+        "acceleration_enabled": { "value": "True" },
+        "acceleration_layer_0": { "value": "acceleration_topbottom" },
+        "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_print": { "value": "4000" },
+        "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_support_interface": { "value": "acceleration_topbottom" },
+        "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" },
+        "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" },
+        "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" },
+        "brim_width": { "value": "3" },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" },
+        "cool_fan_speed": { "value": "50" },
+        "cool_fan_speed_max": { "value": "100" },
+        "cool_min_speed": { "value": "5" },
+        "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" },
+        "infill_overlap": { "value": "0" },
+        "infill_pattern": { "value": "'triangles'" },
+        "infill_wipe_dist": { "value": "0" },
+        "jerk_enabled": { "value": "True" },
+        "jerk_layer_0": { "value": "jerk_topbottom" },
+        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_print": { "value": "25" },
+        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_support_interface": { "value": "jerk_topbottom" },
+        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
+        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
+        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+        "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
+        "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
+        "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
+        "line_width": { "value": "machine_nozzle_size * 0.875" },
+        "machine_min_cool_heat_time_window": { "value": "15" },
+        "default_material_print_temperature": { "value": "200" },
+        "material_standby_temperature": { "value": "100" },
+        "multiple_mesh_overlap": { "value": "0" },
+        "prime_tower_enable": { "value": "True" },
+        "raft_airgap": { "value": "0" },
+        "raft_base_speed": { "value": "20" },
+        "raft_base_thickness": { "value": "0.3" },
+        "raft_interface_line_spacing": { "value": "0.5" },
+        "raft_interface_line_width": { "value": "0.5" },
+        "raft_interface_speed": { "value": "20" },
+        "raft_interface_thickness": { "value": "0.2" },
+        "raft_jerk": { "value": "jerk_layer_0" },
+        "raft_margin": { "value": "10" },
+        "raft_speed": { "value": "25" },
+        "raft_surface_layers": { "value": "1" },
+        "retraction_amount": { "value": "2" },
+        "retraction_count_max": { "value": "10" },
+        "retraction_extrusion_window": { "value": "1" },
+        "retraction_hop": { "value": "2" },
+        "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
+        "retraction_hop_only_when_collides": { "value": "True" },
+        "retraction_min_travel": { "value": "5" },
+        "retraction_prime_speed": { "value": "15" },
+        "skin_overlap": { "value": "10" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "35" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "support_angle": { "value": "45" },
+        "support_pattern": { "value": "'triangles'" },
+        "support_use_towers": { "value": "False" },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_z_distance": { "value": "0" },
+        "switch_extruder_prime_speed": { "value": "15" },
+        "switch_extruder_retraction_amount": { "value": "8" },
+        "top_bottom_thickness": { "value": "1" },
+        "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
+        "wall_0_inset": { "value": "0" },
+        "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
+        "wall_thickness": { "value": "1" },
+        "meshfix_maximum_resolution": { "value": "0.04" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_combing": { "default_value": "all" },
+        "initial_layer_line_width_factor": { "value": "120" },
+        "zig_zaggify_infill": { "value": "True" }
+    }
+}

resources/definitions/zyyx_agile.def.json

@@ -0,0 +1,58 @@
+{
+    "name": "ZYYX Agile",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Magicfirm Europe",
+        "manufacturer": "Magicfirm Europe",
+        "file_formats": "application/x3g",
+        "platform": "zyyx_platform.stl",
+        "has_machine_quality": true,
+        "quality_definition": "zyyx_agile",
+        "preferred_material": "zyyx_pro_pla",
+        "preferred_quality_type": "normal",
+        "machine_x3g_variant": "z"
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "ZYYX Agile" },
+        "machine_start_gcode": {
+            "default_value": "; ZYYX 3D Printer start gcode\nM73 P0; enable build progress\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\nG162 X Y F3000; home XY axes maximum\nM133 T0 ; stabilize extruder temperature\nG161 Z F450\nG161 Z F450; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F200\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0\nM131 A; store surface calibration point 1\nG1 X0 Y0 Z5 F200\nG1 X-177 Y0 Z5 F3000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0 E0\nG1 X-177 Y0 Z5 F200\nG1 X0 Y0 Z5 F3000; move to home point\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0; set reference again\nG1 X0 Y0 Z5 F200; clear Z\nG1 X0 Y-225 Z5 F3000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG92 X0 Y-225 Z0 E0\nG1 X0 Y-225 Z5 F200\nG162 X Y F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 X135 Y115 Z5 F450; clear nozzle from hole\nG1 X0 Y115 Z5 F3000; clear nozzle from hole\nG92 E0 ; Set E to 0"
+        },
+        "machine_end_gcode": {
+            "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n"
+        },
+        "machine_width": { "default_value": 265 },
+        "machine_depth": { "default_value": 225 },
+        "machine_height": { "default_value": 195 },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_gcode_flavor": { "default_value": "Makerbot" },
+        "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] },
+        "gantry_height": { "default_value": 10 },
+        "machine_steps_per_mm_x": { "default_value": 88.888889 },
+        "machine_steps_per_mm_y": { "default_value": 88.888889 },
+        "machine_steps_per_mm_z": { "default_value": 400 },
+        "machine_steps_per_mm_e": { "default_value": 96.27520187033366 },
+        "retraction_amount": { "default_value": 0.7 },
+        "retraction_speed": { "default_value": 15 },
+        "speed_print": { "default_value": 50 },
+        "speed_wall": { "value": 25 },
+        "speed_wall_x": { "value": 35 },
+        "speed_travel": { "value": 80 },
+        "speed_layer_0": { "value": 15 },
+        "support_interface_enable": { "default_value": true },
+        "support_interface_height": { "default_value": 0.8 },
+        "support_interface_density": { "default_value": 80 },
+        "support_interface_pattern": { "default_value": "grid" },
+        "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" },
+        "retract_at_layer_change": { "default_value": true },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "travel_avoid_other_parts": { "default_value": false },
+        "raft_airgap": { "default_value": 0.15 },
+        "raft_margin": { "default_value": 6 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/felixtec4_dual_extruder_0.def.json

@@ -0,0 +1,26 @@
+{
+    "id": "felixtec4_dual_extruder_0",
+    "version": 2,
+    "name": "Left Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "felixtec4dual",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }
+    }
+}

resources/extruders/felixtec4_dual_extruder_1.def.json

@@ -0,0 +1,26 @@
+{
+    "id": "felixtec4_dual_extruder_1",
+    "version": 2,
+    "name": "Right Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "felixtec4dual",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "2"
+        },
+        "machine_nozzle_offset_x": { "default_value": 13 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }
+    }
+}

resources/extruders/ultimaker_s5_extruder_left.def.json

@@ -0,0 +1,30 @@
+{
+    "id": "ultimaker_s5_extruder_left",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ultimaker_s5",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "default_value": 310 },
+        "machine_extruder_start_pos_y": { "default_value": 237 },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "default_value": 310 },
+        "machine_extruder_end_pos_y": { "default_value": 237 },
+        "machine_nozzle_head_distance": { "default_value": 2.7 },
+        "extruder_prime_pos_x": { "default_value": -3 },
+        "extruder_prime_pos_y": { "default_value": 6 },
+        "extruder_prime_pos_z": { "default_value": 2 }
+    }
+}

resources/extruders/ultimaker_s5_extruder_right.def.json

@@ -0,0 +1,30 @@
+{
+    "id": "ultimaker_s5_extruder_right",
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ultimaker_s5",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 22 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "default_value": 310 },
+        "machine_extruder_start_pos_y": { "default_value": 219 },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "default_value": 310 },
+        "machine_extruder_end_pos_y": { "default_value": 219 },
+        "machine_nozzle_head_distance": { "default_value": 4.2 },
+        "extruder_prime_pos_x": { "default_value": 333 },
+        "extruder_prime_pos_y": { "default_value": 6 },
+        "extruder_prime_pos_z": { "default_value": 2 }
+    }
+}

resources/i18n/cura.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2018-03-29 08:36+0200\n"
+"POT-Creation-Date: 2018-04-24 10:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
@@ -45,16 +45,17 @@ msgctxt "@info:title"
 msgid "Model Checker Warning"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:66
+#: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:80
 #, python-brace-format
 msgctxt "@info:status"
 msgid ""
-"Some models may not be printed optimally due to object size and chosen "
+"<p>One or more 3D models may not print optimally due to the model size and "
-"material for models: {model_names}.\n"
+"material configuration:</p>\n"
-"Tips that may be useful to improve the print quality:\n"
+"<p>{model_names}</p>\n"
-"1) Use rounded corners.\n"
+"<p>Find out how to ensure the best possible print quality and reliability.</"
-"2) Turn the fan off (only if there are no tiny details on the model).\n"
+"p>\n"
-"3) Use a different material."
+"<p><a href=\"https://ultimaker.com/3D-model-assistant\">View print quality "
+"guide</a></p>"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/Doodle3D/D3DCloudPrintOutputDevicePlugin.py:65
@@ -75,8 +76,8 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/Doodle3D/D3DCloudPrintOutputDevicePlugin.py:87
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/Doodle3D/D3DCloudPrintOutputDevicePlugin.py:155
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:258
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:184
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:174
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:391
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:397
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrintWindow.qml:88
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksConfiguration.qml:355
 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188
@@ -186,7 +187,7 @@ msgid "Save to Removable Drive {0}"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:110
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:116
 msgctxt "@info:status"
 msgid "There are no file formats available to write with!"
 msgstr ""
@@ -225,7 +226,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1577
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1592
 msgctxt "@info:title"
 msgid "Error"
 msgstr ""
@@ -254,8 +255,8 @@ msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151
 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1568
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1583
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1662
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1677
 msgctxt "@info:title"
 msgid "Warning"
 msgstr ""
@@ -283,13 +284,13 @@ msgid "Removable Drive"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:70
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:75
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:76
 msgctxt "@action:button Preceded by 'Ready to'."
 msgid "Print over network"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:71
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:76
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:77
 msgctxt "@properties:tooltip"
 msgid "Print over network"
 msgstr ""
@@ -399,20 +400,20 @@ msgid ""
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:249
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:163
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:161
 msgctxt "@info:status"
 msgid ""
 "Sending new jobs (temporarily) blocked, still sending the previous print job."
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:256
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:182
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:172
 msgctxt "@info:status"
 msgid "Sending data to printer"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:257
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:183
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:173
 msgctxt "@info:title"
 msgid "Sending Data"
 msgstr ""
@@ -461,39 +462,39 @@ msgid ""
 "and materials that are inserted in your printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:78
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:79
 msgctxt "@info:status"
 msgid "Connected over the network"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:247
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:241
 msgctxt "@info:status"
 msgid "Print job was successfully sent to the printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:249
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:243
 msgctxt "@info:title"
 msgid "Data Sent"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:250
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:244
 msgctxt "@action:button"
 msgid "View in Monitor"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:338
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:332
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Printer '{printer_name}' has finished printing '{job_name}'."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:340
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:334
 #, python-brace-format
 msgctxt "@info:status"
 msgid "The print job '{job_name}' was finished."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:341
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:335
 msgctxt "@info:status"
 msgid "Print finished"
 msgstr ""
@@ -825,24 +826,24 @@ msgctxt "@item:inlistbox"
 msgid "3MF File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:214
+#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:183
-#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:658
+#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:679
 msgctxt "@label"
 msgid "Nozzle"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:179
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:180
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Failed to get plugin ID from <filename>{0}</filename>"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:180
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:181
 msgctxt "@info:tile"
 msgid "Warning"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:235
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:236
 msgctxt "@window:title"
 msgid "Plugin browser"
 msgstr ""
@@ -967,12 +968,12 @@ msgctxt "@tooltip"
 msgid "Other"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/PrintInformation.py:226
+#: /home/ruben/Projects/Cura/cura/PrintInformation.py:227
 msgctxt "@label unknown material"
 msgid "Unknown"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/PrintInformation.py:300
+#: /home/ruben/Projects/Cura/cura/PrintInformation.py:301
 #, python-brace-format
 msgctxt "@label"
 msgid "Pre-sliced file {0}"
@@ -1010,7 +1011,7 @@ msgctxt "@info:title"
 msgid "Incompatible Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:803
+#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:826
 #, python-format
 msgctxt "@info:generic"
 msgid ""
@@ -1018,7 +1019,7 @@ msgid ""
 "[%s]"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:805
+#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:828
 msgctxt "@info:title"
 msgid "Settings updated"
 msgstr ""
@@ -1132,23 +1133,23 @@ msgctxt "@info:title"
 msgid "Local printers"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:108
+#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:106
 #, python-brace-format
 msgctxt "@item:inlistbox"
 msgid "All Supported Types ({0})"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109
+#: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:107
 msgctxt "@item:inlistbox"
 msgid "All Files (*)"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:511
+#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:523
 msgctxt "@label"
 msgid "Custom Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:512
+#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:524
 msgctxt "@label"
 msgid "Custom"
 msgstr ""
@@ -1171,12 +1172,12 @@ msgid "Multiplying and placing objects"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/cura/MultiplyObjectsJob.py:26
-#: /home/ruben/Projects/Cura/cura/MultiplyObjectsJob.py:81
+#: /home/ruben/Projects/Cura/cura/MultiplyObjectsJob.py:86
 msgctxt "@info:title"
 msgid "Placing Object"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/MultiplyObjectsJob.py:81
+#: /home/ruben/Projects/Cura/cura/MultiplyObjectsJob.py:86
 #: /home/ruben/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:88
 #: /home/ruben/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:152
 msgctxt "@info:status"
@@ -1334,22 +1335,22 @@ msgctxt "@action:button"
 msgid "Send report"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:300
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:303
 msgctxt "@info:progress"
 msgid "Loading machines..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:712
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:721
 msgctxt "@info:progress"
 msgid "Setting up scene..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:751
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:760
 msgctxt "@info:progress"
 msgid "Loading interface..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:975
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:984
 #, python-format
 msgctxt ""
 "@info 'width', 'depth' and 'height' are variable names that must NOT be "
@@ -1357,19 +1358,19 @@ msgctxt ""
 msgid "%(width).1f x %(depth).1f x %(height).1f mm"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1567
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1582
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Only one G-code file can be loaded at a time. Skipped importing {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1576
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1591
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Can't open any other file if G-code is loading. Skipped importing {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1661
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1676
 msgctxt "@info:status"
 msgid "The selected model was too small to load."
 msgstr ""
@@ -1592,7 +1593,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksMacroTutorial.qml:306
 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:509
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:173
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:174
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148
 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38
@@ -1700,63 +1701,53 @@ msgctxt "@label"
 msgid "Type"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:254
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:266
-msgctxt "@label"
-msgid "Ultimaker 3"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:257
-msgctxt "@label"
-msgid "Ultimaker 3 Extended"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:260
 msgctxt "@label"
 msgid "Unknown"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:273
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:279
 msgctxt "@label"
 msgid "Firmware version"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:285
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:291
 msgctxt "@label"
 msgid "Address"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:307
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:313
 msgctxt "@label"
 msgid "This printer is not set up to host a group of Ultimaker 3 printers."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:311
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:317
 msgctxt "@label"
 msgid "This printer is the host for a group of %1 Ultimaker 3 printers."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:321
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:327
 msgctxt "@label"
 msgid "The printer at this address has not yet responded."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:326
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:332
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/UM3InfoComponents.qml:39
 msgctxt "@action:button"
 msgid "Connect"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:340
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:346
 msgctxt "@title:window"
 msgid "Printer Address"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:370
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:376
 msgctxt "@alabel"
 msgid "Enter the IP address or hostname of your printer on the network."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:400
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:406
 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181
 msgctxt "@action:button"
 msgid "OK"
@@ -2481,12 +2472,12 @@ msgctxt "@title:tab"
 msgid "Plugins"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:216
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:217
 msgctxt "@title:window"
 msgid "Plugin License Agreement"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:237
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:238
 msgctxt "@label"
 msgid ""
 "This plugin contains a license.\n"
@@ -2494,12 +2485,12 @@ msgid ""
 "Do you agree with the terms below?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:259
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:260
 msgctxt "@action:button"
 msgid "Accept"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:270
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:271
 msgctxt "@action:button"
 msgid "Decline"
 msgstr ""
@@ -2959,7 +2950,7 @@ msgid "Unit"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537
 msgctxt "@title:tab"
 msgid "General"
 msgstr ""
@@ -3233,7 +3224,7 @@ msgid "Do not arrange objects on load"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:541
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:542
 msgctxt "@title:tab"
 msgid "Printers"
 msgstr ""
@@ -3288,7 +3279,7 @@ msgid "Aborting print..."
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:545
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546
 msgctxt "@title:tab"
 msgid "Profiles"
 msgstr ""
@@ -3395,7 +3386,7 @@ msgid "Global Settings"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:40
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:543
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544
 msgctxt "@title:tab"
 msgid "Materials"
 msgstr ""
@@ -3450,7 +3441,7 @@ msgid "Printer"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:891
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:902
 msgctxt "@title:window"
 msgid "Add Printer"
 msgstr ""
@@ -3781,7 +3772,7 @@ msgid ""
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:36
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:256
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:258
 msgctxt "@label"
 msgid "Extruder"
 msgstr ""
@@ -3839,7 +3830,7 @@ msgid "The nozzle inserted in this extruder."
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:25
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:472
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:479
 msgctxt "@label"
 msgid "Build plate"
 msgstr ""
@@ -4241,7 +4232,7 @@ msgid "Select the active output device"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:718
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:719
 msgctxt "@title:window"
 msgid "Open file(s)"
 msgstr ""
@@ -4315,80 +4306,75 @@ msgid "Set as Active Extruder"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:172
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:174
 msgctxt "@action:inmenu"
 msgid "Enable Extruder"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:217
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:178
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:180
 msgctxt "@action:inmenu"
 msgid "Disable Extruder"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:228
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:230
-msgctxt "@title:menu"
-msgid "&Build plate"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229
 msgctxt "@title:menu"
 msgid "&Profile"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:239
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:240
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:273
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:274
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&lugins"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:281
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&references"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:288
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:289
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:371
 msgctxt "@action:button"
 msgid "Open File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540
 msgctxt "@title:tab"
 msgid "Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:584
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:585
 msgctxt "@title:window"
 msgid "New project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:585
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586
 msgctxt "@info:question"
 msgid ""
 "Are you sure you want to start a new project? This will clear the build "
 "plate and any unsaved settings."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:819
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:820
 msgctxt "@window:title"
 msgid "Install Plugin"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:826
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:827
 msgctxt "@title:window"
 msgid "Open File(s)"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:829
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:830
 msgctxt "@text:window"
 msgid ""
 "We have found one or more G-Code files within the files you have selected. "
@@ -4431,71 +4417,71 @@ msgctxt "@label"
 msgid "Layer Height"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:251
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:252
 msgctxt "@tooltip"
 msgid ""
 "This quality profile is not available for you current material and nozzle "
 "configuration. Please change these to enable this quality profile"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:412
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:415
 msgctxt "@tooltip"
 msgid ""
 "A custom profile is currently active. To enable the quality slider, choose a "
 "default quality profile in Custom tab"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:429
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:432
 msgctxt "@label"
 msgid "Print Speed"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:441
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:444
 msgctxt "@label"
 msgid "Slower"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:452
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:455
 msgctxt "@label"
 msgid "Faster"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:480
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:483
 msgctxt "@tooltip"
 msgid ""
 "You have modified some profile settings. If you want to change these go to "
 "custom mode."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:503
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:506
 msgctxt "@label"
 msgid "Infill"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:737
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:740
 msgctxt "@label"
 msgid ""
 "Gradual infill will gradually increase the amount of infill towards the top."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:749
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:752
 msgctxt "@label"
 msgid "Enable gradual"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:816
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:819
 msgctxt "@label"
 msgid "Generate Support"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:850
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:853
 msgctxt "@label"
 msgid ""
 "Generate structures to support parts of the model which have overhangs. "
 "Without these structures, such parts would collapse during printing."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:922
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:925
 msgctxt "@label"
 msgid ""
 "Select which extruder to use for support. This will build up supporting "
@@ -4503,19 +4489,19 @@ msgid ""
 "mid air."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:945
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:948
 msgctxt "@label"
 msgid "Build Plate Adhesion"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1000
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1003
 msgctxt "@label"
 msgid ""
 "Enable printing a brim or raft. This will add a flat area around or under "
 "your object which is easy to cut off afterwards."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1043
 msgctxt "@label"
 msgid ""
 "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker "
@@ -4561,22 +4547,27 @@ msgctxt "@title:window"
 msgid "Engine Log"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:60
 msgctxt "@label"
 msgid "Printer type"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:362
 msgctxt "@label"
 msgid "Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:536
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:560
 msgctxt "@label"
 msgid "Check compatibility"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:554
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:578
 msgctxt "@tooltip"
 msgid "Click to check the material compatibility on Ultimaker.com."
 msgstr ""
@@ -4701,6 +4692,16 @@ msgctxt "name"
 msgid "USB printing"
 msgstr ""
 
+#: X3GWriter/plugin.json
+msgctxt "description"
+msgid "Allows saving the resulting slice as an X3G file."
+msgstr ""
+
+#: X3GWriter/plugin.json
+msgctxt "name"
+msgid "X3GWriter"
+msgstr ""
+
 #: GCodeGzWriter/plugin.json
 msgctxt "description"
 msgid "Writes g-code to a compressed archive."

resources/i18n/de_DE/cura.po

@@ -18,6 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.4\n"
 
+#Added after the string freeze.
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr "Verwenden Sie eiene Klebefolie oder Klebstoff mit dieser Materialcombination"
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
 msgctxt "@action"
 msgid "Machine Settings"

resources/i18n/es_ES/cura.po

@@ -18,6 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
+#Added after the string freeze.
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr "Use láminas de adherencia o pegamento con esta combinación de materiales"
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
 msgctxt "@action"
 msgid "Machine Settings"

resources/i18n/fr_FR/cura.po

@@ -18,6 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
+#Added after the string freeze.
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr "Utilisez feuilles d'adhérence ou de la colle avec cette combinaison des matériaux"
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
 msgctxt "@action"
 msgid "Machine Settings"
@@ -3504,12 +3510,12 @@ msgstr "Certains paramètres masqués utilisent des valeurs différentes de leur
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:61
 msgctxt "@label Header for list of settings."
 msgid "Affects"
-msgstr "Touche"
+msgstr "Dirige"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:66
 msgctxt "@label Header for list of settings."
 msgid "Affected By"
-msgstr "Touché par"
+msgstr "Est Dirigé Par"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154
 msgctxt "@label"

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

@@ -4881,7 +4881,7 @@ msgstr "Largeur minimale à laquelle la base du support conique est réduite. De
 #: fdmprinter.def.json
 msgctxt "infill_hollow label"
 msgid "Hollow Out Objects"
-msgstr "Éviter les objets"
+msgstr "Évider les objets"
 
 #: fdmprinter.def.json
 msgctxt "infill_hollow description"

resources/i18n/it_IT/cura.po

@@ -16,6 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#Added after the string freeze.
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr "Utilizzare un foglio di adesione o colla con questa combinazione di materiali"
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
 msgctxt "@action"
 msgid "Machine Settings"

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

@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-04-11 14:40+0100\n"
+"PO-Revision-Date: 2018-04-19 13:27+0900\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
+"Last-Translator: Jinbuhm Kim <Jinbuhm.Kim@gmail.com>\n"
-"Language-Team: Brule\n"
+"Language-Team: Jinbum Kim <Jinbuhm.Kim@gmail.com>, Korean <info@bothof.nl>\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
 msgid "Machine"
-msgstr "기계"
+msgstr "기기"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings description"
 msgid "Machine specific settings"
-msgstr "기계 별 설정 "
+msgstr "기기 세부 설정"
 
 #: fdmextruder.def.json
 msgctxt "extruder_nr label"
 msgid "Extruder"
-msgstr "압출기 "
+msgstr "익스트루더"
 
 #: fdmextruder.def.json
 msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "인쇄에 사용되는 압출기 트레인. 이것은 다중 압출에 사용됩니다. "
+msgstr "프린팅에 사용되는 익스트루더 트레인. 이것은 다중 압출에 사용됩니다."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_id label"
@@ -46,17 +46,19 @@ msgstr "노즐 ID"
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_id description"
 msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"."
-msgstr "\"AA 0.4\"및 \"BB 0.8\"과 같은 압출기 트레인의 노즐 ID."
+msgstr "\"AA 0.4\"및 \"BB 0.8\"과 같은 익스트루더 트레인의 노즐 ID."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
-msgstr "노즐 지름"
+msgstr "노즐 직경"
 
 #: 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."
+msgid ""
-msgstr "노즐의 내경. 비표준 노즐 크기를 사용할 때이 설정을 변경하십시오. "
+"The inner diameter of the nozzle. Change this setting when using a non-"
+"standard nozzle size."
+msgstr "노즐의 내경. 비표준 노즐 크기를 사용할 때, 이 설정을 변경하십시오."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x label"
@@ -66,7 +68,7 @@ msgstr "노즐 X 오프셋 "
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x description"
 msgid "The x-coordinate of the offset of the nozzle."
-msgstr "노즐 오프셋의 x 좌표입니다. "
+msgstr "노즐 오프셋의 x 좌표."
 
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_y label"
@@ -76,132 +78,146 @@ msgstr "노즐 Y 오프셋"
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_y description"
 msgid "The y-coordinate of the offset of the nozzle."
-msgstr "노즐 오프셋의 y 좌표입니다. "
+msgstr "노즐 오프셋의 y 좌표."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_code label"
 msgid "Extruder Start G-Code"
-msgstr "압출기 시작 G 코드"
+msgstr "익스트루더 스타트 G 코드"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_code description"
 msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "압출기를 켤 때마다 실행할 g 코드를 시작하십시오. "
+msgstr "익스트루더를 켤 때마다 실행할 스타드 g 코드."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs label"
 msgid "Extruder Start Position Absolute"
-msgstr "압출기 시작 위치의 절대 값 "
+msgstr "익스트루더 시작 위치의 절대 값"
 
 #: 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."
+msgid ""
-msgstr "압출기 시작 위치를 헤드의 마지막으로 알려진 위치에 상대적이 아닌 절대 위치로 만듭니다."
+"Make the extruder starting position absolute rather than relative to the "
+"last-known location of the head."
+msgstr ""
+"익스트루더 시작 위치를 헤드의 마지막으로 알려진 위치에 상대적이 아닌 절대 위"
+"치로 만듭니다."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_x label"
 msgid "Extruder Start Position X"
-msgstr "압출기 시작 X의 위치 "
+msgstr "익스트루더 시작 X의 위치"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_x description"
 msgid "The x-coordinate of the starting position when turning the extruder on."
-msgstr "압출기를 켤 때 시작 위치의 x 좌표. "
+msgstr "익스트루더를 켤 때 시작 위치의 x 좌표."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_y label"
 msgid "Extruder Start Position Y"
-msgstr "압출기 시작 위치 Y "
+msgstr "익스트루더 시작 위치 Y"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_y description"
 msgid "The y-coordinate of the starting position when turning the extruder on."
-msgstr "압출기를 켤 때 시작 위치의 y 좌표입니다. "
+msgstr "익스트루더를 켤 때 시작 위치의 y 좌표."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_code label"
 msgid "Extruder End G-Code"
-msgstr "압출기 최종 G 코드 "
+msgstr "익스트루더 엔드 G 코드"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_code description"
 msgid "End g-code to execute whenever turning the extruder off."
-msgstr "압출기를 끌 때마다 실행할 g 코드를 종료하십시오. "
+msgstr "익스트루더를 끌 때마다 실행할 엔드 g 코드."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs label"
 msgid "Extruder End Position Absolute"
-msgstr "압출기 끝 절대 위치 "
+msgstr "익스트루더 끝 절대 위치"
 
 #: 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."
+msgid ""
-msgstr "압출 성형기가 헤드의 마지막으로 알려진 위치에 상대적이 아닌 절대 위치로 끝나도록하십시오. "
+"Make the extruder ending position absolute rather than relative to the last-"
+"known location of the head."
+msgstr ""
+"익스트루더가 헤드의 마지막으로 알려진 위치에 상대값이 아닌 절대 위치로 끝나도"
+"록 하십시오."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_x label"
 msgid "Extruder End Position X"
-msgstr "압출기 끝 X 위치 "
+msgstr "익스트루더 끝 X 위치"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_x description"
 msgid "The x-coordinate of the ending position when turning the extruder off."
-msgstr "압출기를 끌 때 끝 위치의 x 좌표."
+msgstr "익스트루더를 끌 때 끝 위치의 x 좌표."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_y label"
 msgid "Extruder End Position Y"
-msgstr "압출기 끝 Y 위치 "
+msgstr "익스트루더 끝 Y 위치"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_y description"
 msgid "The y-coordinate of the ending position when turning the extruder off."
-msgstr "압출기를 끌 때 종료 위치의 y 좌표입니다. "
+msgstr "익스트루더를 끌 때 종료 위치의 y 좌표."
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z label"
 msgid "Extruder Prime Z Position"
-msgstr "압출기 프라임 Z 포지션 "
+msgstr "익스트루더 프라임 Z 위치"
 
 #: 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 ""
-msgstr "인쇄가 시작될 때 노즐이 끝나는 위치의 Z 좌표입니다. "
+"The Z coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr "프린팅이 시작될 때 노즐이 시작하는 위치의 Z 좌표입니다."
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
-msgstr "플레이트 접착력 강화 "
+msgstr "빌드 플레이트 고정"
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion description"
 msgid "Adhesion"
-msgstr "부착 "
+msgstr "고정"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
-msgstr "압출기 프라임 X 위치 "
+msgstr "익스트루더 프라임 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 ""
-msgstr "인쇄가 시작될 때 노즐이 끝내는 위치의 X 좌표입니다. "
+"The X coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr "프린팅이 시작될 때 노즐이 시작하는 위치의 X 좌표."
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y label"
 msgid "Extruder Prime Y Position"
-msgstr "압출기 프라임 Y 위치 "
+msgstr "익스트루더 프라임 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 ""
-msgstr "인쇄가 시작될 때 노즐이 끝내는 위치의 Y 좌표입니다. "
+"The Y coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr "프린팅이 시작될 때 노즐이 시작하는 위치의 Y 좌표."
 
 #: fdmextruder.def.json
 msgctxt "material label"
 msgid "Material"
-msgstr "자재"
+msgstr "재료"
 
 #: fdmextruder.def.json
 msgctxt "material description"
@@ -215,5 +231,9 @@ msgstr "직경"
 
 #: 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 ""
-msgstr "사용 된 필라멘트의 직경을 조정합니다. 이 값을 사용 필라멘트의 직경과 일치시킵니다."
+"Adjusts the diameter of the filament used. Match this value with the "
+"diameter of the used filament."
+msgstr ""
+"사용 된 필라멘트의 직경을 조정합니다. 이 값을 사용 필라멘트의 직경과 일치시킵"
+"니다."

resources/i18n/nl_NL/cura.po

@@ -16,6 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#Added after the string freeze.
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr "Gebruik een hechtingsvel of lijm met deze materiaalcombinatie"
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
 msgctxt "@action"
 msgid "Machine Settings"

resources/i18n/pl_PL/cura.po

@@ -1,14 +1,14 @@
 # Cura
-# Copyright (C) 2017 Ultimaker
+# Copyright (C) 2018 Ultimaker
 # This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.0\n"
+"Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-02-10 14:24+0100\n"
+"PO-Revision-Date: 2018-04-14 14:35+0200\n"
 "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
 "Language-Team: reprapy.pl\n"
 "Language: pl_PL\n"
@@ -43,7 +43,7 @@ msgstr "Pliki G-code"
 #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30
 msgctxt "@info:title"
 msgid "Model Checker Warning"
-msgstr ""
+msgstr "Ostrzeżenie Sprawdzacza Modelu"
 
 #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:66
 #, python-brace-format
@@ -55,6 +55,11 @@ msgid ""
 "2) Turn the fan off (only if there are no tiny details on the model).\n"
 "3) Use a different material."
 msgstr ""
+"Niektóre modele nie będą drukowane optymalnie z powodu rozmiaru obiektu i wybranych materiałów dla modeli: {model_names}.\n"
+"Porady, które mogą się przydać, aby poprawić jakość wydruku:\n"
+"1) Używaj zaokrąglonych narożników.\n"
+"2) Wyłącz wentylator (tylko jeśli model nie ma małych detali).\n"
+"3) Użyj innego materiału."
 
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/Doodle3D/D3DCloudPrintOutputDevicePlugin.py:65
 msgctxt "@action:button"
@@ -161,12 +166,12 @@ msgstr "Plik X3G"
 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:14
 msgctxt "@item:inlistbox"
 msgid "Compressed G-code File"
-msgstr ""
+msgstr "Skompresowany Plik G-code"
 
 #: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28
 msgctxt "@item:inlistbox"
 msgid "Ultimaker Format Package"
-msgstr ""
+msgstr "Pakiet Formatu Ultimaker"
 
 #: /home/ruben/Projects/Cura/plugins/PrepareStage/__init__.py:12
 msgctxt "@item:inmenu"
@@ -188,7 +193,7 @@ msgstr "Zapisz na dysk wymienny {0}"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:110
 msgctxt "@info:status"
 msgid "There are no file formats available to write with!"
-msgstr ""
+msgstr "Nie ma żadnych formatów plików do zapisania!"
 
 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:94
 #, python-brace-format
@@ -316,7 +321,7 @@ msgstr "Wymagany dostęp do drukarki. Proszę zatwierdzić prośbę na drukarce"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:97
 msgctxt "@info:title"
 msgid "Authentication status"
-msgstr ""
+msgstr "Status uwierzytelniania"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:99
 msgctxt "@info:status"
@@ -328,7 +333,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:110
 msgctxt "@info:title"
 msgid "Authentication Status"
-msgstr ""
+msgstr "Status Uwierzytelniania"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:101
 msgctxt "@action:button"
@@ -367,12 +372,12 @@ msgstr "Wyślij żądanie dostępu do drukarki"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:198
 msgctxt "@label"
 msgid "Unable to start a new print job."
-msgstr ""
+msgstr "Nie można uruchomić nowego zadania drukowania."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:200
 msgctxt "@label"
 msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing."
-msgstr ""
+msgstr "Wystąpił problem z konfiguracją twojego Ultimaker'a, przez który nie można rozpocząć wydruku. Proszę rozwiąż te problemy przed kontynuowaniem."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:206
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:228
@@ -412,19 +417,19 @@ msgstr "Wysyłanie danych"
 #, python-brace-format
 msgctxt "@info:status"
 msgid "No Printcore loaded in slot {slot_number}"
-msgstr ""
+msgstr "Brak Printcore'a w slocie {slot_number}"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:327
 #, python-brace-format
 msgctxt "@info:status"
 msgid "No material loaded in slot {slot_number}"
-msgstr ""
+msgstr "Brak załadowanego materiału w slocie {slot_number}"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:350
 #, python-brace-format
 msgctxt "@label"
 msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}"
-msgstr ""
+msgstr "Inny PrintCore (Cura: {cura_printcore_name}, Drukarka: {remote_printcore_name}) wybrany dla extrudera {extruder_id}"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:359
 #, python-brace-format
@@ -450,22 +455,22 @@ msgstr "PrintCore'y i/lub materiały w drukarce różnią się od tych w obecnym
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:78
 msgctxt "@info:status"
 msgid "Connected over the network"
-msgstr ""
+msgstr "Połączone przez sieć"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:247
 msgctxt "@info:status"
 msgid "Print job was successfully sent to the printer."
-msgstr ""
+msgstr "Zadanie drukowania zostało pomyślnie wysłane do drukarki."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:249
 msgctxt "@info:title"
 msgid "Data Sent"
-msgstr ""
+msgstr "Dane Wysłane"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:250
 msgctxt "@action:button"
 msgid "View in Monitor"
-msgstr ""
+msgstr "Zobacz w Monitorze"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:338
 #, python-brace-format
@@ -477,7 +482,7 @@ msgstr "{printer_name} skończyła drukowanie '{job_name}'."
 #, python-brace-format
 msgctxt "@info:status"
 msgid "The print job '{job_name}' was finished."
-msgstr ""
+msgstr "Zadanie '{job_name}' zostało zakończone."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:341
 msgctxt "@info:status"
@@ -519,7 +524,7 @@ msgstr "Nie można uzyskać dostępu do informacji o aktualizacji"
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:579
 msgctxt "@info:status"
 msgid "SolidWorks reported errors while opening your file. We recommend to solve these issues inside SolidWorks itself."
-msgstr ""
+msgstr "SolidWorks zgłosił błędy podczas otwierania twojego pliku. Zalecamy rozwiązanie tych problemów w samym SolidWorks."
 
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:591
 msgctxt "@info:status"
@@ -528,6 +533,9 @@ msgid ""
 "\n"
 "Thanks!"
 msgstr ""
+"Nie znaleziono modeli wewnątrz twojego rysunku. Czy mógłbyś sprawdzić jego zawartość ponownie i upewnić się, że znajduje się tam jedna część lub złożenie?\n"
+"\n"
+"Dziękuję!."
 
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:595
 msgctxt "@info:status"
@@ -536,6 +544,9 @@ msgid ""
 "\n"
 "Sorry!"
 msgstr ""
+"Znaleziono więcej niż jedną część lub złożenie wewnątrz rysunku. Obecnie obsługujemy tylko rysunki z dokładnie jedną częścią lub złożeniem.\n"
+"\n"
+"Przepraszamy!"
 
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/__init__.py:25
 msgctxt "@item:inlistbox"
@@ -611,12 +622,12 @@ msgstr "Modyfikuj G-Code"
 #: /home/ruben/Projects/Cura/plugins/SupportEraser/__init__.py:12
 msgctxt "@label"
 msgid "Support Blocker"
-msgstr ""
+msgstr "Blokada Podpory"
 
 #: /home/ruben/Projects/Cura/plugins/SupportEraser/__init__.py:13
 msgctxt "@info:tooltip"
 msgid "Create a volume in which supports are not printed."
-msgstr ""
+msgstr "Stwórz obszar, w którym podpory nie będą drukowane."
 
 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43
 msgctxt "@info"
@@ -972,12 +983,12 @@ msgstr "Niekompatybilny Materiał"
 #, python-format
 msgctxt "@info:generic"
 msgid "Settings have been changed to match the current availability of extruders: [%s]"
-msgstr ""
+msgstr "Ustawienia został zmienione, aby pasowały do obecnej dostępności extruderów: [%s]"
 
 #: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:805
 msgctxt "@info:title"
 msgid "Settings updated"
-msgstr ""
+msgstr "Ustawienia zostały zaaktualizowane"
 
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132
 #, python-brace-format
@@ -1014,7 +1025,7 @@ msgstr "Nie udało się zaimportować profilu z <filename>{0}</filename>: <messa
 #, python-brace-format
 msgctxt "@info:status Don't translate the XML tags <filename> or <message>!"
 msgid "No custom profile to import in file <filename>{0}</filename>"
-msgstr ""
+msgstr "Brak niestandardowego profilu do zaimportowania do pliku <filename>{0}</filename>"
 
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:219
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:229
@@ -1027,7 +1038,7 @@ msgstr "Ten profil <filename>{0}</filename> zawiera błędne dane, nie można go
 #, python-brace-format
 msgctxt "@info:status Don't translate the XML tags <filename> or <message>!"
 msgid "The machine defined in profile <filename>{0}</filename> ({1}) doesn't match with your current machine ({2}), could not import it."
-msgstr ""
+msgstr "Maszyna zdefiniowana w profilu <filename>{0}</filename> ({1}) nie zgadza się z obecnie wybraną maszyną ({2}), nie można tego zaimportować."
 
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317
 #, python-brace-format
@@ -1072,23 +1083,23 @@ msgstr "Grupa #{group_nr}"
 #: /home/ruben/Projects/Cura/cura/Machines/Models/MachineManagementModel.py:65
 msgctxt "@info:title"
 msgid "Network enabled printers"
-msgstr ""
+msgstr "Drukarki dostępne w sieci"
 
 #: /home/ruben/Projects/Cura/cura/Machines/Models/MachineManagementModel.py:80
 msgctxt "@info:title"
 msgid "Local printers"
-msgstr ""
+msgstr "Drukarki lokalne"
 
 #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:108
 #, python-brace-format
 msgctxt "@item:inlistbox"
 msgid "All Supported Types ({0})"
-msgstr ""
+msgstr "Wszystkie Wspierane Typy ({0})"
 
 #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109
 msgctxt "@item:inlistbox"
 msgid "All Files (*)"
-msgstr ""
+msgstr "Wszystkie Pliki (*)"
 
 #: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:511
 msgctxt "@label"
@@ -1149,7 +1160,7 @@ msgstr "Nie można Znaleźć Lokalizacji"
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:88
 msgctxt "@title:window"
 msgid "Cura can't start"
-msgstr ""
+msgstr "Cura nie może się uruchomić"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:94
 msgctxt "@label crash message"
@@ -1160,26 +1171,31 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</p>\n"
 "                "
 msgstr ""
+"<p><b>Ups, Ultimaker Cura natrafiła coś co nie wygląda dobrze.</p></b>\n"
+"                    <p>Natrafiliśmy na nieodwracalny błąd podczas uruchamiania. Prawdopodobnie jest to spowodowane błędem w plikach konfiguracyjnych. Zalecamy backup i reset konfiguracji.</p>\n"
+"                    <p>Backupy mogą być znalezione w folderze konfiguracyjnym.</p>\n"
+"                    <p>Proszę wyślij do nas ten Raport Błędu, aby rozwiązać problem.</p>\n"
+"              "
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:103
 msgctxt "@action:button"
 msgid "Send crash report to Ultimaker"
-msgstr ""
+msgstr "Wyślij raport błędu do Ultimaker"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:106
 msgctxt "@action:button"
 msgid "Show detailed crash report"
-msgstr ""
+msgstr "Pokaż szczegółowy raport błędu"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:110
 msgctxt "@action:button"
 msgid "Show configuration folder"
-msgstr ""
+msgstr "Pokaż folder konfiguracyjny"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:121
 msgctxt "@action:button"
 msgid "Backup and Reset Configuration"
-msgstr ""
+msgstr "Zrób Backup i Zresetuj Konfigurację"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:203
 msgctxt "@title:window"
@@ -1193,6 +1209,9 @@ msgid ""
 "            <p>Please use the \"Send report\" button to post a bug report automatically to our servers</p>\n"
 "        "
 msgstr ""
+"<p><b>Wystąpił błąd krytyczny. Proszę wyślij do nas ten Raport Błędu, aby rozwiązać problem</p></b>\n"
+"            <p>Proszę użyj przycisku \"Wyślij raport\", aby wysłać raport błędu automatycznie na nasze serwery</p>\n"
+"        "
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:231
 msgctxt "@title:groupbox"
@@ -1232,7 +1251,7 @@ msgstr "OpenGL"
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:262
 msgctxt "@label"
 msgid "Not yet initialized<br/>"
-msgstr ""
+msgstr "Jeszcze nie uruchomiono<br/>"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:265
 #, python-brace-format
@@ -1371,7 +1390,7 @@ msgstr "Podgrzewany stół"
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:168
 msgctxt "@label"
 msgid "G-code flavor"
-msgstr ""
+msgstr "Wersja G-code"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:181
 msgctxt "@label"
@@ -1436,22 +1455,22 @@ msgstr "Liczba ekstruderów"
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:311
 msgctxt "@label"
 msgid "Start G-code"
-msgstr ""
+msgstr "Początkowy G-code"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:321
 msgctxt "@tooltip"
 msgid "G-code commands to be executed at the very start."
-msgstr ""
+msgstr "Komedy G-code, które są wykonywane na samym początku."
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:330
 msgctxt "@label"
 msgid "End G-code"
-msgstr ""
+msgstr "Końcowy G-code"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:340
 msgctxt "@tooltip"
 msgid "G-code commands to be executed at the very end."
-msgstr ""
+msgstr "Komendy G-code, które są wykonywane na samym końcu."
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:371
 msgctxt "@label"
@@ -1486,17 +1505,17 @@ msgstr "Korekcja dyszy Y"
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:450
 msgctxt "@label"
 msgid "Extruder Start G-code"
-msgstr ""
+msgstr "Początkowy G-code Ekstrudera"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:468
 msgctxt "@label"
 msgid "Extruder End G-code"
-msgstr ""
+msgstr "Końcowy G-code Ekstrudera"
 
 #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.qml:22
 msgctxt "@info:tooltip"
 msgid "Some things could be problematic in this print. Click to see tips for adjustment."
-msgstr ""
+msgstr "Niektóre rzeczy mogą być problematyczne podczas tego wydruku. Kliknij, aby zobaczyć porady dotyczące regulacji."
 
 #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:18
 msgctxt "@label"
@@ -1555,12 +1574,12 @@ msgstr "Aktualizacja oprogramowania nie powiodła się z powodu utraconego oprog
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:57
 msgctxt "@window:title"
 msgid "Existing Connection"
-msgstr ""
+msgstr "Istniejące Połączenie"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:59
 msgctxt "@message:text"
 msgid "This printer/group is already added to Cura. Please select another printer/group."
-msgstr ""
+msgstr "Ta drukarka/grupa jest już dodana do Cura. Proszę wybierz inną drukarkę/grupę."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:76
 msgctxt "@title:window"
@@ -1682,7 +1701,7 @@ msgstr "Drukuj przez sieć"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrintWindow.qml:61
 msgctxt "@label"
 msgid "Printer selection"
-msgstr ""
+msgstr "Wybór drukarki"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrintWindow.qml:100
 msgctxt "@action:button"
@@ -1713,7 +1732,7 @@ msgstr "Zobacz zadania drukowania"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:37
 msgctxt "@label:status"
 msgid "Preparing to print"
-msgstr ""
+msgstr "Przygotowywanie do drukowania"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:39
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:263
@@ -1729,17 +1748,17 @@ msgstr "Dostępna"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:43
 msgctxt "@label:status"
 msgid "Lost connection with the printer"
-msgstr ""
+msgstr "Utracono połączenie z drukarką"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:45
 msgctxt "@label:status"
 msgid "Unavailable"
-msgstr ""
+msgstr "Niedostępne"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:47
 msgctxt "@label:status"
 msgid "Unknown"
-msgstr ""
+msgstr "Nieznane"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:249
 msgctxt "@label:status"
@@ -2276,7 +2295,7 @@ msgstr "Jak powinny być rozwiązywane błędy w maszynie?"
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:124
 msgctxt "@action:ComboBox option"
 msgid "Update"
-msgstr ""
+msgstr "Aktualizacja"
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:99
@@ -2287,7 +2306,7 @@ msgstr "Typ"
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159
 msgctxt "@action:label"
 msgid "Printer Group"
-msgstr ""
+msgstr "Grupa drukarek"
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:191
@@ -2379,17 +2398,17 @@ msgstr "Otwórz"
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginEntry.qml:127
 msgctxt "@action:button"
 msgid "Update"
-msgstr ""
+msgstr "Aktualizuj"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginEntry.qml:129
 msgctxt "@action:button"
 msgid "Install"
-msgstr ""
+msgstr "Instaluj"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:17
 msgctxt "@title:tab"
 msgid "Plugins"
-msgstr ""
+msgstr "Wtyczki"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:216
 msgctxt "@title:window"
@@ -2736,12 +2755,12 @@ msgstr "Informacja"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:94
 msgctxt "@title:window"
 msgid "Confirm Diameter Change"
-msgstr ""
+msgstr "Potwierdź Zmianę Średnicy"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:95
 msgctxt "@label (%1 is object name)"
 msgid "The new material diameter is set to %1 mm, which is not compatible to the current machine. Do you wish to continue?"
-msgstr ""
+msgstr "Nowa średnica materiał jest ustawiona na %1 mm, co nie jest kompatybilne z obecną maszyną. Czy chciałbyś kontynuować?"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:128
 msgctxt "@label"
@@ -2967,12 +2986,12 @@ msgstr "Automatycznie upuść modele na stół roboczy"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416
 msgctxt "@info:tooltip"
 msgid "Show caution message in g-code reader."
-msgstr ""
+msgstr "Pokaż wiadomości ostrzegawcze w czytniku g-code."
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:425
 msgctxt "@option:check"
 msgid "Caution message in g-code reader"
-msgstr ""
+msgstr "Wiadomość ostrzegawcza w czytniku g-code"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432
 msgctxt "@info:tooltip"
@@ -3211,13 +3230,13 @@ msgstr "Duplikuj profil"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:221
 msgctxt "@title:window"
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Potwierdź Usunięcie"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:240
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:222
 msgctxt "@label (%1 is object name)"
 msgid "Are you sure you wish to remove %1? This cannot be undone!"
-msgstr ""
+msgstr "Czy na pewno chcesz usunąć %1? Nie można tego cofnąć!"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:256
 msgctxt "@title:window"
@@ -3325,7 +3344,7 @@ msgstr "Udało się wyeksportować materiał do <filename>%1</filename>"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:337
 msgctxt "@action:label"
 msgid "Printer"
-msgstr ""
+msgstr "Drukarka"
 
 #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:891
@@ -3380,7 +3399,7 @@ msgstr "Struktura aplikacji"
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120
 msgctxt "@label"
 msgid "G-code generator"
-msgstr ""
+msgstr "Generator g-code"
 
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121
 msgctxt "@label"
@@ -3465,7 +3484,7 @@ msgstr "Ikony SVG"
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139
 msgctxt "@label"
 msgid "Linux cross-distribution application deployment"
-msgstr ""
+msgstr "Wdrożenie aplikacji pomiędzy dystrybucjami Linux"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:42
 msgctxt "@label"
@@ -3496,7 +3515,7 @@ msgstr "Skopiuj wartość do wszystkich ekstruderów"
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:539
 msgctxt "@action:menu"
 msgid "Copy all changed values to all extruders"
-msgstr ""
+msgstr "Skopiuj wszystkie zmienione wartości do wszystkich ekstruderów"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554
 msgctxt "@action:menu"
@@ -3656,12 +3675,12 @@ msgstr "Dystans Swobodnego Ruchu"
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:443
 msgctxt "@label"
 msgid "Send G-code"
-msgstr ""
+msgstr "Wyślij G-code"
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:506
 msgctxt "@tooltip of G-code command input"
 msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command."
-msgstr ""
+msgstr "Wyślij niestandardową komendę G-code do podłączonej drukarki. Naciśnij 'enter', aby wysłać komendę."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:36
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:256
@@ -3677,12 +3696,12 @@ msgstr "Docelowa temperatura głowicy. Głowica będzie się rozgrzewać lub ch
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:98
 msgctxt "@tooltip"
 msgid "The current temperature of this hotend."
-msgstr ""
+msgstr "Aktualna temperatura tej głowicy."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:172
 msgctxt "@tooltip of temperature input"
 msgid "The temperature to pre-heat the hotend to."
-msgstr ""
+msgstr "Temperatura do wstępnego podgrzewania głowicy."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:336
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:331
@@ -3699,7 +3718,7 @@ msgstr "Podgrzewanie wstępne"
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:365
 msgctxt "@tooltip of pre-heat"
 msgid "Heat the hotend in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the hotend to heat up when you're ready to print."
-msgstr ""
+msgstr "Podgrzej głowicę przed drukowaniem. Możesz w dalszym ciągu dostosowywać drukowanie podczas podgrzewania i nie będziesz musiał czekać na podgrzanie głowicy kiedy będziesz gotowy."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:401
 msgctxt "@tooltip"
@@ -3745,12 +3764,12 @@ msgstr "Przed drukowaniem podgrzej stół. W dalszym ciągu można dostosowywać
 #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25
 msgctxt "@label:category menu label"
 msgid "Network enabled printers"
-msgstr ""
+msgstr "Drukarki dostępne w sieci"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:42
 msgctxt "@label:category menu label"
 msgid "Local printers"
-msgstr ""
+msgstr "Drukarki lokalne"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12
 msgctxt "@title:menu menubar:toplevel"
@@ -3770,17 +3789,17 @@ msgstr "&Pole robocze"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13
 msgctxt "@action:inmenu"
 msgid "Visible Settings"
-msgstr ""
+msgstr "Widoczne Ustawienia"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43
 msgctxt "@action:inmenu"
 msgid "Show All Settings"
-msgstr ""
+msgstr "Pokaż Wszystkie Ustawienia"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54
 msgctxt "@action:inmenu"
 msgid "Manage Setting Visibility..."
-msgstr ""
+msgstr "Ustaw Widoczność Ustawień..."
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:27
 msgctxt "@label"
@@ -3804,12 +3823,12 @@ msgstr "Liczba kopii"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml:33
 msgctxt "@label:header configurations"
 msgid "Available configurations"
-msgstr ""
+msgstr "Dostępne konfiguracje"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml:28
 msgctxt "@label:extruder label"
 msgid "Extruder"
-msgstr ""
+msgstr "Ekstruder"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/RecentFilesMenu.qml:13
 msgctxt "@title:menu menubar:file"
@@ -4188,18 +4207,18 @@ msgstr "Ustaw jako aktywną głowicę"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:172
 msgctxt "@action:inmenu"
 msgid "Enable Extruder"
-msgstr ""
+msgstr "Włącz Ekstruder"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:217
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:178
 msgctxt "@action:inmenu"
 msgid "Disable Extruder"
-msgstr ""
+msgstr "Wyłącz Ekstruder"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:228
 msgctxt "@title:menu"
 msgid "&Build plate"
-msgstr ""
+msgstr "&Pole robocze"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229
 msgctxt "@title:menu"
@@ -4274,7 +4293,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:138
 msgctxt "@action:label"
 msgid "Build plate"
-msgstr ""
+msgstr "Pole robocze"
 
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:161
 msgctxt "@action:label"
@@ -4299,7 +4318,7 @@ msgstr "Wysokość warstwy"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:251
 msgctxt "@tooltip"
 msgid "This quality profile is not available for you current material and nozzle configuration. Please change these to enable this quality profile"
-msgstr ""
+msgstr "Ten profil jakości nie jest dostępny dla wybranego materiału i konfiguracji dyszy. Proszę to zmienić, aby włączyć ten profil jakości"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:412
 msgctxt "@tooltip"
@@ -4411,7 +4430,7 @@ msgstr "Dziennik silnika"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr ""
+msgstr "Typ drukarki"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"
@@ -4476,22 +4495,22 @@ msgstr "Czytnik X3D"
 #: GCodeWriter/plugin.json
 msgctxt "description"
 msgid "Writes g-code to a file."
-msgstr ""
+msgstr "Zapisuje g-code do pliku."
 
 #: GCodeWriter/plugin.json
 msgctxt "name"
 msgid "G-code Writer"
-msgstr ""
+msgstr "Pisarz G-code"
 
 #: ModelChecker/plugin.json
 msgctxt "description"
 msgid "Checks models and print configuration for possible printing issues and give suggestions."
-msgstr ""
+msgstr "Sprawdza możliwe problemy drukowania modeli i konfiguracji wydruku i podaje porady."
 
 #: ModelChecker/plugin.json
 msgctxt "name"
 msgid "Model Checker"
-msgstr ""
+msgstr "Sprawdzacz Modelu"
 
 #: cura-god-mode-plugin/src/GodMode/plugin.json
 msgctxt "description"
@@ -4546,22 +4565,22 @@ msgstr "Drukowanie USB"
 #: GCodeGzWriter/plugin.json
 msgctxt "description"
 msgid "Writes g-code to a compressed archive."
-msgstr ""
+msgstr "Zapisuje g-code do skompresowanego archiwum."
 
 #: GCodeGzWriter/plugin.json
 msgctxt "name"
 msgid "Compressed G-code Writer"
-msgstr ""
+msgstr "Zapisywacz Skompresowanego G-code"
 
 #: UFPWriter/plugin.json
 msgctxt "description"
 msgid "Provides support for writing Ultimaker Format Packages."
-msgstr ""
+msgstr "Zapewnia wsparcie dla zapisywania Pakietów Formatów Ultimaker."
 
 #: UFPWriter/plugin.json
 msgctxt "name"
 msgid "UFP Writer"
-msgstr ""
+msgstr "Zapisywacz UFP"
 
 #: PrepareStage/plugin.json
 msgctxt "description"
@@ -4616,7 +4635,7 @@ msgstr "Etap Monitorowania"
 #: FirmwareUpdateChecker/plugin.json
 msgctxt "description"
 msgid "Checks for firmware updates."
-msgstr "Sprawdź aktualizacje oprogramowania"
+msgstr "Sprawdź aktualizacje oprogramowania."
 
 #: FirmwareUpdateChecker/plugin.json
 msgctxt "name"
@@ -4636,7 +4655,7 @@ msgstr "Integracja z SolidWorks"
 #: SimulationView/plugin.json
 msgctxt "description"
 msgid "Provides the Simulation view."
-msgstr "Zapewnia widok Symulacji"
+msgstr "Zapewnia widok Symulacji."
 
 #: SimulationView/plugin.json
 msgctxt "name"
@@ -4646,12 +4665,12 @@ msgstr "Widok Symulacji"
 #: GCodeGzReader/plugin.json
 msgctxt "description"
 msgid "Reads g-code from a compressed archive."
-msgstr ""
+msgstr "Odczytuje g-code ze skompresowanych archiwum."
 
 #: GCodeGzReader/plugin.json
 msgctxt "name"
 msgid "Compressed G-code Reader"
-msgstr ""
+msgstr "Czytnik Skompresowanego G-code"
 
 #: PostProcessingPlugin/plugin.json
 msgctxt "description"
@@ -4666,12 +4685,12 @@ msgstr "Post Processing"
 #: SupportEraser/plugin.json
 msgctxt "description"
 msgid "Creates an eraser mesh to block the printing of support in certain places"
-msgstr ""
+msgstr "Tworzy siatkę do blokowania drukowania podpór w określonych miejscach"
 
 #: SupportEraser/plugin.json
 msgctxt "name"
 msgid "Support Eraser"
-msgstr ""
+msgstr "Usuwacz Podpór"
 
 #: AutoSave/plugin.json
 msgctxt "description"
@@ -4731,17 +4750,17 @@ msgstr "Zapewnia wsparcie dla importowania profili z plików g-code."
 #: GCodeProfileReader/plugin.json
 msgctxt "name"
 msgid "G-code Profile Reader"
-msgstr ""
+msgstr "Czytnik Profili G-code"
 
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "description"
 msgid "Upgrades configurations from Cura 3.2 to Cura 3.3."
-msgstr ""
+msgstr "Ulepsza konfigurację z Cura 3.2 do Cura 3.3."
 
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "name"
 msgid "Version Upgrade 3.2 to 3.3"
-msgstr ""
+msgstr "Ulepszenie Wersji z 3.2 do 3.3"
 
 #: VersionUpgrade/VersionUpgrade25to26/plugin.json
 msgctxt "description"

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

@@ -1,14 +1,14 @@
 # Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
+# Copyright (C) 2018 Ultimaker
 # This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.0\n"
+"Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2017-11-22 15:00+0100\n"
+"PO-Revision-Date: 2018-03-30 20:33+0200\n"
 "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
 "Language-Team: reprapy.pl\n"
 "Language: pl_PL\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
@@ -201,19 +201,19 @@ msgstr "Współrzędna Y, w której dysza jest czyszczona na początku wydruku."
 #: fdmextruder.def.json
 msgctxt "material label"
 msgid "Material"
-msgstr ""
+msgstr "Materiał"
 
 #: fdmextruder.def.json
 msgctxt "material description"
 msgid "Material"
-msgstr ""
+msgstr "Materiał"
 
 #: fdmextruder.def.json
 msgctxt "material_diameter label"
 msgid "Diameter"
-msgstr ""
+msgstr "Średnica"
 
 #: 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 ""
+msgstr "Dostosuj średnicę użytego filamentu. Dopasuj tę wartość do średnicy używanego filamentu."

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

@@ -1,14 +1,14 @@
 # Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
+# Copyright (C) 2018 Ultimaker
 # This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.0\n"
+"Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-02-10 14:03+0100\n"
+"PO-Revision-Date: 2018-04-17 16:45+0200\n"
 "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
 "Language-Team: reprapy.pl\n"
 "Language: pl_PL\n"
@@ -50,7 +50,7 @@ msgstr "Czy wyświetlać różna warianty drukarki, które są opisane w oddziel
 #: fdmprinter.def.json
 msgctxt "machine_start_gcode label"
 msgid "Start G-code"
-msgstr ""
+msgstr "Początkowy G-code"
 
 #: fdmprinter.def.json
 msgctxt "machine_start_gcode description"
@@ -58,11 +58,13 @@ msgid ""
 "G-code commands to be executed at the very start - separated by \n"
 "."
 msgstr ""
+"Polecenia G-code, które są wykonywane na samym początku - oddzielone za pomocą \n"
+"."
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode label"
 msgid "End G-code"
-msgstr ""
+msgstr "Końcowy G-code"
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode description"
@@ -70,6 +72,8 @@ msgid ""
 "G-code commands to be executed at the very end - separated by \n"
 "."
 msgstr ""
+"Polecenia G-code, które są wykonywane na samym końcu - oddzielone za pomocą \n"
+"."
 
 #: fdmprinter.def.json
 msgctxt "material_guid label"
@@ -164,22 +168,22 @@ msgstr "Eliptyczny"
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type label"
 msgid "Build Plate Material"
-msgstr ""
+msgstr "Materiał Platformy Roboczej"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type description"
 msgid "The material of the build plate installed on the printer."
-msgstr ""
+msgstr "Materiał platformy roboczej zainstalowanej w drukarce."
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type option glass"
 msgid "Glass"
-msgstr ""
+msgstr "Szkło"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type option aluminum"
 msgid "Aluminum"
-msgstr ""
+msgstr "Aluminium"
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
@@ -219,17 +223,17 @@ msgstr "Liczba Ekstruderów"
 #: fdmprinter.def.json
 msgctxt "machine_extruder_count description"
 msgid "Number of extruder trains. An extruder train is the combination of a feeder, bowden tube, and nozzle."
-msgstr "Liczba wózków esktruderów. Wózek ekstrudera to kombinacja podajnika, rurki Bowden i dyszy."
+msgstr "Liczba zespołów esktruderów. Zespół ekstrudera to kombinacja podajnika, rurki Bowden i dyszy."
 
 #: fdmprinter.def.json
 msgctxt "extruders_enabled_count label"
 msgid "Number of Extruders that are enabled"
-msgstr ""
+msgstr "Liczba Ekstruderów, które są dostępne"
 
 #: fdmprinter.def.json
 msgctxt "extruders_enabled_count description"
 msgid "Number of extruder trains that are enabled; automatically set in software"
-msgstr ""
+msgstr "Liczba zespołów ekstruderów, które są dostępne; automatycznie ustawiane w oprogramowaniu"
 
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_tip_outer_diameter label"
@@ -324,12 +328,12 @@ msgstr "Minimalny czas, w jakim ekstruder musi być nieużywany, aby schłodzić
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor label"
 msgid "G-code flavour"
-msgstr ""
+msgstr "Wersja G-code"
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor description"
 msgid "The type of g-code to be generated."
-msgstr ""
+msgstr "Typ g-code, który ma być generowany."
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
@@ -609,72 +613,72 @@ msgstr "Domyślny zryw dla silnika filamentu."
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_x label"
 msgid "Steps per Millimeter (X)"
-msgstr ""
+msgstr "Kroki na milimetr (X)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_x description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the X direction."
-msgstr ""
+msgstr "Ile kroków silnika krokowego będzie skutkowało ruchem o 1mm w osi X."
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_y label"
 msgid "Steps per Millimeter (Y)"
-msgstr ""
+msgstr "Kroki na milimetr (Y)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_y description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the Y direction."
-msgstr ""
+msgstr "Ile kroków silnika krokowego będzie skutkowało ruchem o 1mm w osi Y."
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_z label"
 msgid "Steps per Millimeter (Z)"
-msgstr ""
+msgstr "Kroki na milimetr (Z)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_z description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the Z direction."
-msgstr ""
+msgstr "Ile kroków silnika krokowego będzie skutkowało ruchem o 1mm w osi Z."
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_e label"
 msgid "Steps per Millimeter (E)"
-msgstr ""
+msgstr "Kroki na milimetr (E)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_e description"
 msgid "How many steps of the stepper motors will result in one millimeter of extrusion."
-msgstr ""
+msgstr "Ile kroków silnika krokowego będzie skutkowało ekstruzją 1mm."
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_x label"
 msgid "X Endstop in Positive Direction"
-msgstr ""
+msgstr "Krańcówka X w Pozycji Dodatniej"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_x description"
 msgid "Whether the endstop of the X axis is in the positive direction (high X coordinate) or negative (low X coordinate)."
-msgstr ""
+msgstr "Czy krańcówka osi X jest w pozycji dodatniej (wysokie współrzędne X) czy w ujemnej (niskie współrzędne X)."
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_y label"
 msgid "Y Endstop in Positive Direction"
-msgstr ""
+msgstr "Krańcówka Y w Pozycji Dodatniej"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_y description"
 msgid "Whether the endstop of the Y axis is in the positive direction (high Y coordinate) or negative (low Y coordinate)."
-msgstr ""
+msgstr "Czy krańcówka osi Y jest w pozycji dodatniej (wysokie współrzędne Y) czy w ujemnej (niskie współrzędne Y)."
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_z label"
 msgid "Z Endstop in Positive Direction"
-msgstr ""
+msgstr "Krańcówka Z w Pozycji Dodatniej"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_z description"
 msgid "Whether the endstop of the Z axis is in the positive direction (high Z coordinate) or negative (low Z coordinate)."
-msgstr ""
+msgstr "Czy krańcówka osi Z jest w pozycji dodatniej (wysokie współrzędne Z) czy w ujemnej (niskie współrzędne Z)."
 
 #: fdmprinter.def.json
 msgctxt "machine_minimum_feedrate label"
@@ -689,12 +693,12 @@ msgstr "Minimalna prędkość ruchu głowicy drukującej."
 #: fdmprinter.def.json
 msgctxt "machine_feeder_wheel_diameter label"
 msgid "Feeder Wheel Diameter"
-msgstr ""
+msgstr "Średnica Koła Podajnika"
 
 #: fdmprinter.def.json
 msgctxt "machine_feeder_wheel_diameter description"
 msgid "The diameter of the wheel that drives the material in the feeder."
-msgstr ""
+msgstr "Średnica koła, które przesuwa materiał w podajniku."
 
 #: fdmprinter.def.json
 msgctxt "resolution label"
@@ -1824,12 +1828,12 @@ msgstr "Dodatkowa szybkość, w wyniku której dysze chłodzą się podczas ekst
 #: fdmprinter.def.json
 msgctxt "default_material_bed_temperature label"
 msgid "Default Build Plate Temperature"
-msgstr ""
+msgstr "Domyślna Temp. Platformy Roboczej"
 
 #: fdmprinter.def.json
 msgctxt "default_material_bed_temperature description"
 msgid "The default temperature used for the heated build plate. This should be the \"base\" temperature of a build plate. All other print temperatures should use offsets based on this value"
-msgstr ""
+msgstr "Domyślna temperatura używana dla podgrzewanej platformy roboczej. To powinna być \"bazowa\" temperatura platformy roboczej. Wszystkie inne temperatury drukowania powinny używać przesunięcia względem tej wartości"
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temperature label"
@@ -1884,12 +1888,12 @@ msgstr "Energia powierzchni."
 #: fdmprinter.def.json
 msgctxt "material_shrinkage_percentage label"
 msgid "Shrinkage Ratio"
-msgstr ""
+msgstr "Współczynnik Skurczu"
 
 #: fdmprinter.def.json
 msgctxt "material_shrinkage_percentage description"
 msgid "Shrinkage ratio in percentage."
-msgstr ""
+msgstr "Współczynnik skurczu w procentach."
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -1904,12 +1908,12 @@ msgstr "Kompensacja przepływu: ilość ekstrudowanego materiału jest mnożona
 #: fdmprinter.def.json
 msgctxt "material_flow_layer_0 label"
 msgid "Initial Layer Flow"
-msgstr ""
+msgstr "Przepływ Pierwszej Warstwy"
 
 #: fdmprinter.def.json
 msgctxt "material_flow_layer_0 description"
 msgid "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value."
-msgstr ""
+msgstr "Kompensacja przepływu dla pierwszej warstwy: ilość materiału ekstrudowanego na pierwszej warstwie jest mnożona przez tę wartość."
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable label"
@@ -3084,12 +3088,12 @@ msgstr "Krzyż"
 #: fdmprinter.def.json
 msgctxt "zig_zaggify_support label"
 msgid "Connect Support Lines"
-msgstr ""
+msgstr "Łącz Linie Podpory"
 
 #: fdmprinter.def.json
 msgctxt "zig_zaggify_support description"
 msgid "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material."
-msgstr ""
+msgstr "Łącz końce linii podpory razem. Włączenie tej opcji może tworzyć bardziej sztywne podpory i redukować podekstruzje, ale będzie to wymagało więcej materiału."
 
 #: fdmprinter.def.json
 msgctxt "support_connect_zigzags label"
@@ -4018,12 +4022,12 @@ msgstr "Wydrukuj wieżę obok wydruku, która służy do zmiany materiału po ka
 #: fdmprinter.def.json
 msgctxt "prime_tower_circular label"
 msgid "Circular Prime Tower"
-msgstr ""
+msgstr "Okrągła Wieża Czyszcząca"
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_circular description"
 msgid "Make the prime tower as a circular shape."
-msgstr ""
+msgstr "Twórz wieżę czyszczącą o okrągłym kształcie."
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_size label"
@@ -4193,7 +4197,7 @@ msgstr "Zachowaj Rozłączone Pow."
 #: fdmprinter.def.json
 msgctxt "meshfix_keep_open_polygons description"
 msgid "Normally Cura tries to stitch up small holes in the mesh and remove parts of a layer with big holes. Enabling this option keeps those parts which cannot be stitched. This option should be used as a last resort option when everything else fails to produce proper g-code."
-msgstr ""
+msgstr "Zwykle Cura próbuje zszywać małe dziury w siatce i usunąć części warstwy z dużymi otworami. Włączenie tej opcji powoduje zostawienie tych części, których nie da się zszyć. Ta opcja powinna być używana jako ostatnia deska ratunku, gdy wszystko inne nie dostarczy właściwego G-code."
 
 #: fdmprinter.def.json
 msgctxt "multiple_mesh_overlap label"
@@ -4408,7 +4412,7 @@ msgstr "Ekstruzja Względna"
 #: fdmprinter.def.json
 msgctxt "relative_extrusion description"
 msgid "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the g-code. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any g-code script is output."
-msgstr ""
+msgstr "Używaj ekstruzji względnej zamiast ekstruzji bezwzględnej. Używanie względnych kroków E umożliwia łatwiejszy post-processing g-code'u. Jednakże nie jest to wspierane przez wszystkie drukarki i może to powodować delikatne wahania w ilości podawanego materiału w porównaniu z bezwzględnymi krokami E. Niezależnie od tego ustawienia, tryb ekstruzji będzie zawsze ustawiony na bezwględny zanim skrypt g-code będzie na wyjściu."
 
 #: fdmprinter.def.json
 msgctxt "experimental label"
@@ -5252,202 +5256,202 @@ msgstr "Opóźnienie w wyborze, czy użyć mniejszej warstwy, czy nie. Ta liczba
 #: fdmprinter.def.json
 msgctxt "bridge_settings_enabled label"
 msgid "Enable Bridge Settings"
-msgstr ""
+msgstr "Włącz Ustawienia Mostów"
 
 #: fdmprinter.def.json
 msgctxt "bridge_settings_enabled description"
 msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed."
-msgstr ""
+msgstr "Wykryj mosty i modyfikuj prędkość drukowania, przepływ i ustawienia wentylatora podczas drukowania mostó."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_min_length label"
 msgid "Minimum Bridge Wall Length"
-msgstr ""
+msgstr "Min. Długość Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_min_length description"
 msgid "Unsupported walls shorter than this will be printed using the normal wall settings. Longer unsupported walls will be printed using the bridge wall settings."
-msgstr ""
+msgstr "Niepodparte ściany krótsze niż to będą drukowane z normalnymi ustawieniami ściany. Dłuższe niepodparte ściany będą drukowane z ustawieniami mostów."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_support_threshold label"
 msgid "Bridge Skin Support Threshold"
-msgstr ""
+msgstr "Próg Podpory Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_support_threshold description"
 msgid "If a skin region is supported for less than this percentage of its area, print it using the bridge settings. Otherwise it is printed using the normal skin settings."
-msgstr ""
+msgstr "Jeśli obszar skóry jest podpierany w mniejszym procencie jego powierzchni, drukuj to według ustawień mostu. W przeciwnym wypadku użyj normalnych ustawień skóry."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_max_overhang label"
 msgid "Bridge Wall Max Overhang"
-msgstr ""
+msgstr "Maks. Nachylenie Ściany Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_max_overhang description"
 msgid "The maximum allowed width of the region of air below a wall line before the wall is printed using bridge settings. Expressed as a percentage of the wall line width. When the air gap is wider than this, the wall line is printed using the bridge settings. Otherwise, the wall line is printed using the normal settings. The lower the value, the more likely it is that overhung wall lines will be printed using bridge settings."
-msgstr ""
+msgstr "Maksymalna dozwolona szerokość obszaru powietrza pod linią ściany zanim zostanie wydrukowana ściana używająca ustawień mostu. Wyrażona w procentach szerokości linii ściany. Kiedy przestrzeń powietrza jest szersza od tego, linia ściany jest drukowana używając ustawień mostu. W przeciwnym wypadku linia ściany jest drukowana z normalnymi ustawieniami. Tym niższa wartość, tym większa szansa, że linie ściany na nawisach będą drukowane z ustawieniami mostu."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
 msgid "Bridge Wall Coasting"
-msgstr ""
+msgstr "Rozbieg Ściany Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast description"
 msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge."
-msgstr ""
+msgstr "Określa odległość, na jakiej ekstruder powinien wykonać rozbieg natychmiast przed rozpoczęciem ściany mostu. Rozbieg przed rozpoczęciem mostu może zredukować ciśnienie w dyszy i może stworzyć bardziej płaski most."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_speed label"
 msgid "Bridge Wall Speed"
-msgstr ""
+msgstr "Prędkość Ścian Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_speed description"
 msgid "The speed at which the bridge walls are printed."
-msgstr ""
+msgstr "Prędkość z jaką są drukowane ściany mostu."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_material_flow label"
 msgid "Bridge Wall Flow"
-msgstr ""
+msgstr "Przepływ Mostów"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_material_flow description"
 msgid "When printing bridge walls, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Kiedy drukowane są ściany mostu, ilość ekstrudowanego materiału jest mnożona prze tę wartość."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed label"
 msgid "Bridge Skin Speed"
-msgstr ""
+msgstr "Prędk. Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed description"
 msgid "The speed at which bridge skin regions are printed."
-msgstr ""
+msgstr "Prędkość z jaką drukowane są obszary skóry mostu."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow label"
 msgid "Bridge Skin Flow"
-msgstr ""
+msgstr "Przepływ Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow description"
 msgid "When printing bridge skin regions, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Kiedy drukowane są obszary skóry mostu, ilość ekstrudowanego materiału jest mnożona przez tę wartość."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density label"
 msgid "Bridge Skin Density"
-msgstr ""
+msgstr "Gęstość Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density description"
 msgid "The density of the bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "Gęstość warstwy skóry mostu. Wartości mniejsze od 100 będą zwiększać przerwy pomiędzy liniami skóry."
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed label"
 msgid "Bridge Fan Speed"
-msgstr ""
+msgstr "Prędk. Wentylatora - Mosty"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed description"
 msgid "Percentage fan speed to use when printing bridge walls and skin."
-msgstr ""
+msgstr "Procent prędkości wentylatora używany podczas drukowania ścian i skóry mostów."
 
 #: fdmprinter.def.json
 msgctxt "bridge_enable_more_layers label"
 msgid "Bridge Has Multiple Layers"
-msgstr ""
+msgstr "Most Ma Wiele Warstw"
 
 #: fdmprinter.def.json
 msgctxt "bridge_enable_more_layers description"
 msgid "If enabled, the second and third layers above the air are printed using the following settings. Otherwise, those layers are printed using the normal settings."
-msgstr ""
+msgstr "Jeśli włączone, druga i trzecia warstwa ponad powietrzem są drukowane używając następujących ustawień. W przeciwnym wypadku te warstwy są drukowane z normalnymi ustawieniami."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_2 label"
 msgid "Bridge Second Skin Speed"
-msgstr ""
+msgstr "Prędk. Drugiej Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_2 description"
 msgid "Print speed to use when printing the second bridge skin layer."
-msgstr ""
+msgstr "Prędkość używana podczas drukowania drugiej warstwy skóry mostu."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_2 label"
 msgid "Bridge Second Skin Flow"
-msgstr ""
+msgstr "Przepływ Drugiej Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_2 description"
 msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Kiedy drukowana jest druga warstwa skóry mostu, ilość ekstrudowanego materiału jest mnożona przez tę wartość."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_2 label"
 msgid "Bridge Second Skin Density"
-msgstr ""
+msgstr "Gęstość Drugiej Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_2 description"
 msgid "The density of the second bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "Gęstość drugiej warstwy skóry mostu. Wartości mniejsze od 100 będą zwiększać przerwy pomiędzy liniami skóry."
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_2 label"
 msgid "Bridge Second Skin Fan Speed"
-msgstr ""
+msgstr "Prędk. Wentylatora - Druga Skóra Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_2 description"
 msgid "Percentage fan speed to use when printing the second bridge skin layer."
-msgstr ""
+msgstr "Procent prędkości wentylatora używany podczas drukowania drugiej warstwy skóry most."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_3 label"
 msgid "Bridge Third Skin Speed"
-msgstr ""
+msgstr "Prędkość Trzeciej Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_3 description"
 msgid "Print speed to use when printing the third bridge skin layer."
-msgstr ""
+msgstr "Prędkość używana podczas drukowania trzeciej warstwy skóry mostu."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_3 label"
 msgid "Bridge Third Skin Flow"
-msgstr ""
+msgstr "Przepływ Trzeciej Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_3 description"
 msgid "When printing the third bridge skin layer, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Kiedy drukowana jest trzecia warstwa skóry mostu, ilość ekstrudowanego materiału jest mnożona przez tę wartość."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_3 label"
 msgid "Bridge Third Skin Density"
-msgstr ""
+msgstr "Gęstość Trzeciej Skóry Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_3 description"
 msgid "The density of the third bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "Gęstość trzeciej warstwy skóry mostu. Wartości mniejsze od 100 będą zwiększać przerwy pomiędzy liniami skóry."
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_3 label"
 msgid "Bridge Third Skin Fan Speed"
-msgstr ""
+msgstr "Prędk. Wentylatora - Trzecia Skóra Mostu"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_3 description"
 msgid "Percentage fan speed to use when printing the third bridge skin layer."
-msgstr ""
+msgstr "Procent prędkości wentylatora używany podczas drukowania trzeciej warstwy skóry most."
 
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"

resources/i18n/pt_BR/cura.po

@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.2\n"
+"Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-02-12 10:20-0300\n"
+"PO-Revision-Date: 2018-04-21 12:20-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
-"Language-Team: Cláudio Sampaio <patola@makerlinux.com.br> and CoderSquirrel <jasaneschio@gmail.com>\n"
+"Language-Team: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Arquivo G-Code"
 #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30
 msgctxt "@info:title"
 msgid "Model Checker Warning"
-msgstr ""
+msgstr "Alerta de Verificador de Modelo"
 
 #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:66
 #, python-brace-format
@@ -54,6 +54,11 @@ msgid ""
 "2) Turn the fan off (only if there are no tiny details on the model).\n"
 "3) Use a different material."
 msgstr ""
+"Alguns modelos podem não ser impressos otimamente devido ao tamanho do objeto e material escolhido para os modelos: {model_names}.\n"
+"Dicas que podem ser úteis para melhorar a qualidade de impressão:\n"
+"1) Use cantos arredondados.\n"
+"2) Desligue a ventoinha (somente no caso de não haver detalhes pequenos no modelo).\n"
+"3) Use material diferente."
 
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/Doodle3D/D3DCloudPrintOutputDevicePlugin.py:65
 msgctxt "@action:button"
@@ -160,12 +165,12 @@ msgstr "Arquivo X3G"
 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:14
 msgctxt "@item:inlistbox"
 msgid "Compressed G-code File"
-msgstr ""
+msgstr "Arquivo de G-Code Comprimido"
 
 #: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28
 msgctxt "@item:inlistbox"
 msgid "Ultimaker Format Package"
-msgstr ""
+msgstr "Pacote de Formato da Ultimaker"
 
 #: /home/ruben/Projects/Cura/plugins/PrepareStage/__init__.py:12
 msgctxt "@item:inmenu"
@@ -187,7 +192,7 @@ msgstr "Salvar em Unidade Removível {0}"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:110
 msgctxt "@info:status"
 msgid "There are no file formats available to write with!"
-msgstr ""
+msgstr "Há formatos de arquivo disponíveis com os quais escrever!"
 
 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:94
 #, python-brace-format
@@ -315,7 +320,7 @@ msgstr "Acesso à impressora solicitado. Por favor aprove a requisição na impr
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:97
 msgctxt "@info:title"
 msgid "Authentication status"
-msgstr ""
+msgstr "Status da autenticação"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:99
 msgctxt "@info:status"
@@ -327,7 +332,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:110
 msgctxt "@info:title"
 msgid "Authentication Status"
-msgstr ""
+msgstr "Status da Autenticação"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:101
 msgctxt "@action:button"
@@ -366,12 +371,12 @@ msgstr "Envia pedido de acesso à impressora"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:198
 msgctxt "@label"
 msgid "Unable to start a new print job."
-msgstr ""
+msgstr "Incapaz de iniciar novo trabalho de impressão."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:200
 msgctxt "@label"
 msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing."
-msgstr ""
+msgstr "Há um problema com a configuração de sua Ultimaker que torna impossível iniciar a impressão. Por favor resolva este problema antes de continuar."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:206
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:228
@@ -411,19 +416,19 @@ msgstr "Enviando Dados"
 #, python-brace-format
 msgctxt "@info:status"
 msgid "No Printcore loaded in slot {slot_number}"
-msgstr ""
+msgstr "Printcore não carregado no slot {slot_number}"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:327
 #, python-brace-format
 msgctxt "@info:status"
 msgid "No material loaded in slot {slot_number}"
-msgstr ""
+msgstr "Nenhum material carregado no slot {slot_number}"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:350
 #, python-brace-format
 msgctxt "@label"
 msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}"
-msgstr ""
+msgstr "PrintCore Diferente (Cura: {cure_printcore_name}, Impressora: {remote_printcore_name}) selecionado para o extrusor {extruder_id}"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py:359
 #, python-brace-format
@@ -449,22 +454,22 @@ msgstr "Os PrintCores e/ou materiais da sua impressora diferem dos que estão de
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:78
 msgctxt "@info:status"
 msgid "Connected over the network"
-msgstr ""
+msgstr "Conectado pela rede"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:247
 msgctxt "@info:status"
 msgid "Print job was successfully sent to the printer."
-msgstr ""
+msgstr "Trabalho de impressão enviado à impressora com sucesso."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:249
 msgctxt "@info:title"
 msgid "Data Sent"
-msgstr ""
+msgstr "Dados Enviados"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:250
 msgctxt "@action:button"
 msgid "View in Monitor"
-msgstr ""
+msgstr "Ver no Monitor"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:338
 #, python-brace-format
@@ -476,7 +481,7 @@ msgstr "{printer_name} acabou de imprimir '{job_name}'."
 #, python-brace-format
 msgctxt "@info:status"
 msgid "The print job '{job_name}' was finished."
-msgstr ""
+msgstr "O trabalho de impressão '{job_name}' terminou."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py:341
 msgctxt "@info:status"
@@ -518,7 +523,7 @@ msgstr "Não foi possível acessar informação de atualização."
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:579
 msgctxt "@info:status"
 msgid "SolidWorks reported errors while opening your file. We recommend to solve these issues inside SolidWorks itself."
-msgstr ""
+msgstr "O SolidWorks relatou erros ao abrir o arquivo. Recomenda-se resolver tais erros dentro do próprio SolidWorks."
 
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:591
 msgctxt "@info:status"
@@ -527,6 +532,9 @@ msgid ""
 "\n"
 "Thanks!"
 msgstr ""
+"Não foram encontrados modelos dentro do seu desenho. Poderia por favor verificar seu conteúdo novamente e assegurar-se que pelo menos uma parte ou montagem está inclusa?\n"
+"\n"
+"Obrigado!"
 
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:595
 msgctxt "@info:status"
@@ -535,6 +543,9 @@ msgid ""
 "\n"
 "Sorry!"
 msgstr ""
+"Foi encontrada mais de uma parte ou montagem dentro do seu desenho. Atualmente somente desenhos com exatamente uma parte ou montagem dentro são suportados.\n"
+"\n"
+"Desculpe!"
 
 #: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/__init__.py:25
 msgctxt "@item:inlistbox"
@@ -611,12 +622,12 @@ msgstr "Modificar G-Code"
 #: /home/ruben/Projects/Cura/plugins/SupportEraser/__init__.py:12
 msgctxt "@label"
 msgid "Support Blocker"
-msgstr ""
+msgstr "Bloqueador de Suporte"
 
 #: /home/ruben/Projects/Cura/plugins/SupportEraser/__init__.py:13
 msgctxt "@info:tooltip"
 msgid "Create a volume in which supports are not printed."
-msgstr ""
+msgstr "Cria um volume em que suportes não são impressos."
 
 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43
 msgctxt "@info"
@@ -755,7 +766,7 @@ msgstr "Instalar"
 
 #: /home/ruben/Projects/Cura/plugins/cura-siemensnx-plugin/Installer.py:43
 msgid "Failed to copy Siemens NX plugins files. Please check your UGII_USER_DIR. It is not set to a directory."
-msgstr "Erro ao copiar arquivos de plugins Siemens NX. Por favor verifique seu UGII_USER_DIR. Ele não está configurado para um diretório."
+msgstr "Erro ao copiar arquivos de complementos Siemens NX. Por favor verifique seu UGII_USER_DIR. Ele não está configurado para um diretório."
 
 #: /home/ruben/Projects/Cura/plugins/cura-siemensnx-plugin/Installer.py:50
 #: /home/ruben/Projects/Cura/plugins/cura-siemensnx-plugin/Installer.py:59
@@ -765,11 +776,11 @@ msgstr "Plugin Siemens NX do Cura instalado com sucesso."
 
 #: /home/ruben/Projects/Cura/plugins/cura-siemensnx-plugin/Installer.py:65
 msgid "Failed to copy Siemens NX plugins files. Please check your UGII_USER_DIR."
-msgstr "Erro ao copiar arquivos de plugins Siemens NX. Por favor, verifique seu UGII_USER_DIR."
+msgstr "Erro ao copiar arquivos de complementos Siemens NX. Por favor, verifique seu UGII_USER_DIR."
 
 #: /home/ruben/Projects/Cura/plugins/cura-siemensnx-plugin/Installer.py:85
 msgid "Failed to install Siemens NX plugin. Could not set environment variable UGII_USER_DIR for Siemens NX."
-msgstr "Erro ao instalar arquivos de plugins Siemens NX. Não foi possível ajustar a variável de ambiente UGII_USER_DIR para o Simenes NX."
+msgstr "Erro ao instalar arquivos de complementos Siemens NX. Não foi possível ajustar a variável de ambiente UGII_USER_DIR para o Simenes NX."
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175
 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:627
@@ -972,12 +983,12 @@ msgstr "Material Incompatível"
 #, python-format
 msgctxt "@info:generic"
 msgid "Settings have been changed to match the current availability of extruders: [%s]"
-msgstr ""
+msgstr "Os ajustes foram mudados para atender à atual disponibilidade de extrusores: [%s]"
 
 #: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:805
 msgctxt "@info:title"
 msgid "Settings updated"
-msgstr ""
+msgstr "Ajustes atualizados"
 
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132
 #, python-brace-format
@@ -1014,7 +1025,7 @@ msgstr "Falha ao importa perfil de <filename>{0}</filename>: <message>{1}</messa
 #, python-brace-format
 msgctxt "@info:status Don't translate the XML tags <filename> or <message>!"
 msgid "No custom profile to import in file <filename>{0}</filename>"
-msgstr ""
+msgstr "Não há perfil personalizado para importar no arquivo <filename>{0}</filename>"
 
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:219
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:229
@@ -1027,7 +1038,7 @@ msgstr "Este perfil <filename>{0}</filename> contém dados incorretos, não foi
 #, python-brace-format
 msgctxt "@info:status Don't translate the XML tags <filename> or <message>!"
 msgid "The machine defined in profile <filename>{0}</filename> ({1}) doesn't match with your current machine ({2}), could not import it."
-msgstr ""
+msgstr "A máquina definida no perfil <filename>{0}</filename> ({1}) não corresponde à sua máquina atual ({2}), não foi possível importá-la."
 
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:317
 #, python-brace-format
@@ -1072,23 +1083,23 @@ msgstr "Grupo #{group_nr}"
 #: /home/ruben/Projects/Cura/cura/Machines/Models/MachineManagementModel.py:65
 msgctxt "@info:title"
 msgid "Network enabled printers"
-msgstr ""
+msgstr "Impressoras habilitadas em rede"
 
 #: /home/ruben/Projects/Cura/cura/Machines/Models/MachineManagementModel.py:80
 msgctxt "@info:title"
 msgid "Local printers"
-msgstr ""
+msgstr "Impressoras locais"
 
 #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:108
 #, python-brace-format
 msgctxt "@item:inlistbox"
 msgid "All Supported Types ({0})"
-msgstr ""
+msgstr "Todos Os Tipos Suportados ({0})"
 
 #: /home/ruben/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:109
 msgctxt "@item:inlistbox"
 msgid "All Files (*)"
-msgstr ""
+msgstr "Todos Os Arquivos (*)"
 
 #: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:511
 msgctxt "@label"
@@ -1149,7 +1160,7 @@ msgstr "Não Foi Encontrada Localização"
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:88
 msgctxt "@title:window"
 msgid "Cura can't start"
-msgstr ""
+msgstr "O Cura não consegue iniciar"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:94
 msgctxt "@label crash message"
@@ -1160,26 +1171,30 @@ msgid ""
 "                    <p>Please send us this Crash Report to fix the problem.</p>\n"
 "                "
 msgstr ""
-
+"<p><b>Oops, o Ultimaker Cura encontrou algo que não parece estar correto.</p></b>\n"
+"                    <p>Encontramos um erro irrecuperável durante a inicialização. Ele foi possivelmente causa por arquivos de configuração incorretos. Sugerimos salvar e restabelecer sua configuração.</p>\n"
+"                    <p>Cópias salvas podem ser encontradas na pasta de configuração.</p>\n"
+"                    <p>Por favor nos envie este Relatório de Falha para consertar o problema.</p>\n"
+"                "
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:103
 msgctxt "@action:button"
 msgid "Send crash report to Ultimaker"
-msgstr ""
+msgstr "Enviar relatório de falha à Ultimaker"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:106
 msgctxt "@action:button"
 msgid "Show detailed crash report"
-msgstr ""
+msgstr "Exibir relatório de falha detalhado"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:110
 msgctxt "@action:button"
 msgid "Show configuration folder"
-msgstr ""
+msgstr "Mostrar a pasta de configuração"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:121
 msgctxt "@action:button"
 msgid "Backup and Reset Configuration"
-msgstr ""
+msgstr "Salvar e Restabelecer Configuração"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:203
 msgctxt "@title:window"
@@ -1193,6 +1208,9 @@ msgid ""
 "            <p>Please use the \"Send report\" button to post a bug report automatically to our servers</p>\n"
 "        "
 msgstr ""
+"<p><b>Um erro fatal ocorreu no Cura. Por favor nos envie este Relatório de Falha para consertar o problema</p></b>\n"
+"            <p>Por favor use o botão \"Enviar relatório\" para publicar um relatório de erro automaticamente em nossos servidores</p>\n"
+"        "
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:231
 msgctxt "@title:groupbox"
@@ -1232,7 +1250,7 @@ msgstr "OpenGL"
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:262
 msgctxt "@label"
 msgid "Not yet initialized<br/>"
-msgstr ""
+msgstr "Ainda não inicializado<br/>"
 
 #: /home/ruben/Projects/Cura/cura/CrashHandler.py:265
 #, python-brace-format
@@ -1371,7 +1389,7 @@ msgstr "Mesa aquecida"
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:168
 msgctxt "@label"
 msgid "G-code flavor"
-msgstr ""
+msgstr "Sabor de G-Code"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:181
 msgctxt "@label"
@@ -1436,22 +1454,22 @@ msgstr "Número de Extrusores"
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:311
 msgctxt "@label"
 msgid "Start G-code"
-msgstr ""
+msgstr "G-Code Inicial"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:321
 msgctxt "@tooltip"
 msgid "G-code commands to be executed at the very start."
-msgstr ""
+msgstr "Comandos de G-Code a serem executados no início da impressão."
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:330
 msgctxt "@label"
 msgid "End G-code"
-msgstr ""
+msgstr "G-Code Final"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:340
 msgctxt "@tooltip"
 msgid "G-code commands to be executed at the very end."
-msgstr ""
+msgstr "Comandos de G-Code a serem executados no final da impressão."
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:371
 msgctxt "@label"
@@ -1486,17 +1504,17 @@ msgstr "Deslocamento Y do Bico"
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:450
 msgctxt "@label"
 msgid "Extruder Start G-code"
-msgstr ""
+msgstr "G-Code Inicial do Extrusor"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:468
 msgctxt "@label"
 msgid "Extruder End G-code"
-msgstr ""
+msgstr "G-Code Final do Extrusor"
 
 #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.qml:22
 msgctxt "@info:tooltip"
 msgid "Some things could be problematic in this print. Click to see tips for adjustment."
-msgstr ""
+msgstr "Algumas coisas podem ser problemáticas nesta impressão. Clique para ver dicas de correção."
 
 #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:18
 msgctxt "@label"
@@ -1555,12 +1573,12 @@ msgstr "A atualização de firmware falhou devido a firmware não encontrado."
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:57
 msgctxt "@window:title"
 msgid "Existing Connection"
-msgstr ""
+msgstr "Conexão Existente"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:59
 msgctxt "@message:text"
 msgid "This printer/group is already added to Cura. Please select another printer/group."
-msgstr ""
+msgstr "Esta impressora ou grupo já foi adicionada ao Cura. Por favor selecione outra impressora ou grupo."
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:76
 msgctxt "@title:window"
@@ -1682,7 +1700,7 @@ msgstr "Imprimir pela rede"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrintWindow.qml:61
 msgctxt "@label"
 msgid "Printer selection"
-msgstr ""
+msgstr "Seleção de impressora"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrintWindow.qml:100
 msgctxt "@action:button"
@@ -1713,7 +1731,7 @@ msgstr "Visualizar trabalhos de impressão"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:37
 msgctxt "@label:status"
 msgid "Preparing to print"
-msgstr ""
+msgstr "Preparando para imprimir"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:39
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:263
@@ -1729,17 +1747,17 @@ msgstr "Disponível"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:43
 msgctxt "@label:status"
 msgid "Lost connection with the printer"
-msgstr ""
+msgstr "Conexão à impressora perdida"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:45
 msgctxt "@label:status"
 msgid "Unavailable"
-msgstr ""
+msgstr "Indisponível"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:47
 msgctxt "@label:status"
 msgid "Unknown"
-msgstr ""
+msgstr "Desconhecido"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:249
 msgctxt "@label:status"
@@ -2276,7 +2294,7 @@ msgstr "Como o conflito na máquina deve ser resolvido?"
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:124
 msgctxt "@action:ComboBox option"
 msgid "Update"
-msgstr ""
+msgstr "Atualizar"
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:99
@@ -2287,7 +2305,7 @@ msgstr "Tipo"
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159
 msgctxt "@action:label"
 msgid "Printer Group"
-msgstr ""
+msgstr "Grupo de Impressora"
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:191
@@ -2379,17 +2397,17 @@ msgstr "Abrir"
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginEntry.qml:127
 msgctxt "@action:button"
 msgid "Update"
-msgstr ""
+msgstr "Atualizar"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginEntry.qml:129
 msgctxt "@action:button"
 msgid "Install"
-msgstr ""
+msgstr "Instalar"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:17
 msgctxt "@title:tab"
 msgid "Plugins"
-msgstr ""
+msgstr "Complementos"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:216
 msgctxt "@title:window"
@@ -2404,7 +2422,7 @@ msgid ""
 "Do you agree with the terms below?"
 msgstr ""
 "Este plugin contém uma licença.\n"
-"Você precisa aceitar esta licença para instalar este plugin.\n"
+"Você precisa aceitar esta licença para instalar este complemento.\n"
 "Você concorda com os termos abaixo?"
 
 #: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:259
@@ -2736,12 +2754,12 @@ msgstr "Informação"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:94
 msgctxt "@title:window"
 msgid "Confirm Diameter Change"
-msgstr ""
+msgstr "Confirmar Mudança de Diâmetro"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:95
 msgctxt "@label (%1 is object name)"
 msgid "The new material diameter is set to %1 mm, which is not compatible to the current machine. Do you wish to continue?"
-msgstr ""
+msgstr "O novo diâmetro do material é %1 mm, o que não é compatível com a máquina atual. Deseja continuar?"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:128
 msgctxt "@label"
@@ -2967,12 +2985,12 @@ msgstr "Automaticamente fazer os modelos caírem na mesa de impressão."
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416
 msgctxt "@info:tooltip"
 msgid "Show caution message in g-code reader."
-msgstr ""
+msgstr "Exibir mensagem de alerta no leitor de G-Code."
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:425
 msgctxt "@option:check"
 msgid "Caution message in g-code reader"
-msgstr ""
+msgstr "Mensagem de alera no leitor de G-Code"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432
 msgctxt "@info:tooltip"
@@ -3211,13 +3229,13 @@ msgstr "Duplicar Perfil"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:221
 msgctxt "@title:window"
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Confirmar Remoção"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:240
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:222
 msgctxt "@label (%1 is object name)"
 msgid "Are you sure you wish to remove %1? This cannot be undone!"
-msgstr ""
+msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:256
 msgctxt "@title:window"
@@ -3325,7 +3343,7 @@ msgstr "Material exportado para <filename>%1</filename> com sucesso"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:337
 msgctxt "@action:label"
 msgid "Printer"
-msgstr ""
+msgstr "Impressora"
 
 #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:891
@@ -3380,7 +3398,7 @@ msgstr "Framework de Aplicações"
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120
 msgctxt "@label"
 msgid "G-code generator"
-msgstr ""
+msgstr "Gerador de G-Code"
 
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121
 msgctxt "@label"
@@ -3465,7 +3483,7 @@ msgstr "Ícones SVG"
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139
 msgctxt "@label"
 msgid "Linux cross-distribution application deployment"
-msgstr ""
+msgstr "Implementação de aplicação multidistribuição em Linux"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:42
 msgctxt "@label"
@@ -3496,7 +3514,7 @@ msgstr "Copiar valor para todos os extrusores"
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:539
 msgctxt "@action:menu"
 msgid "Copy all changed values to all extruders"
-msgstr ""
+msgstr "Copiar todos os valores alterados para todos os extrusores"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554
 msgctxt "@action:menu"
@@ -3558,6 +3576,7 @@ msgid ""
 "Click to restore the value of the profile."
 msgstr ""
 "Este ajuste tem um valor que é diferente do perfil.\n"
+"\n"
 "Clique para restaurar o valor do perfil."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286
@@ -3568,6 +3587,7 @@ msgid ""
 "Click to restore the calculated value."
 msgstr ""
 "Este ajuste é normalmente calculado, mas atualmente tem um conjunto absoluto de valores.\n"
+"\n"
 "Clique para restaurar o valor calculado."
 
 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:152
@@ -3654,12 +3674,12 @@ msgstr "Distância de Trote"
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:443
 msgctxt "@label"
 msgid "Send G-code"
-msgstr ""
+msgstr "Enviar G-Code"
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:506
 msgctxt "@tooltip of G-code command input"
 msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command."
-msgstr ""
+msgstr "Enviar comando G-Code personalizado para a impressora conectada. Pressione 'enter' para enviar o comando."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:36
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:256
@@ -3675,12 +3695,12 @@ msgstr "A temperatura-alvo do hotend. O hotend vai aquecer ou esfriar na direç
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:98
 msgctxt "@tooltip"
 msgid "The current temperature of this hotend."
-msgstr ""
+msgstr "A temperatura atual deste hotend"
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:172
 msgctxt "@tooltip of temperature input"
 msgid "The temperature to pre-heat the hotend to."
-msgstr ""
+msgstr "A temperatura com a qual pré-aquecer o hotend."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:336
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:331
@@ -3697,7 +3717,7 @@ msgstr "Pré-aquecer"
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:365
 msgctxt "@tooltip of pre-heat"
 msgid "Heat the hotend in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the hotend to heat up when you're ready to print."
-msgstr ""
+msgstr "Aquece o hotend com antecedência antes de imprimir. Você pode continuar ajustando sua impressão enquanto está aquecendo e não terá que esperar que o hotend termine o aquecimento quando estiver pronto para imprimir."
 
 #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:401
 msgctxt "@tooltip"
@@ -3743,12 +3763,12 @@ msgstr "Aquecer a mesa antes de imprimir. Você pode continuar ajustando sua imp
 #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25
 msgctxt "@label:category menu label"
 msgid "Network enabled printers"
-msgstr ""
+msgstr "Impressoras habilitadas pela rede"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:42
 msgctxt "@label:category menu label"
 msgid "Local printers"
-msgstr ""
+msgstr "Impressoras locais"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12
 msgctxt "@title:menu menubar:toplevel"
@@ -3768,17 +3788,17 @@ msgstr "Plataforma de Impressão (&B)"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13
 msgctxt "@action:inmenu"
 msgid "Visible Settings"
-msgstr ""
+msgstr "Ajustes Visíveis"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43
 msgctxt "@action:inmenu"
 msgid "Show All Settings"
-msgstr ""
+msgstr "Mostrar Todos Os Ajustes"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54
 msgctxt "@action:inmenu"
 msgid "Manage Setting Visibility..."
-msgstr ""
+msgstr "Gerenciar Visibilidade dos Ajustes..."
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:27
 msgctxt "@label"
@@ -3802,12 +3822,12 @@ msgstr "Número de Cópias"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml:33
 msgctxt "@label:header configurations"
 msgid "Available configurations"
-msgstr ""
+msgstr "Configurações disponíveis"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml:28
 msgctxt "@label:extruder label"
 msgid "Extruder"
-msgstr ""
+msgstr "Extrusor"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/RecentFilesMenu.qml:13
 msgctxt "@title:menu menubar:file"
@@ -4186,18 +4206,18 @@ msgstr "Definir Como Extrusor Ativo"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:172
 msgctxt "@action:inmenu"
 msgid "Enable Extruder"
-msgstr ""
+msgstr "Habilitar Extrusor"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:217
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:178
 msgctxt "@action:inmenu"
 msgid "Disable Extruder"
-msgstr ""
+msgstr "Desabilitar Extrusor"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:228
 msgctxt "@title:menu"
 msgid "&Build plate"
-msgstr ""
+msgstr "Plataforma de Impressão (&B)"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229
 msgctxt "@title:menu"
@@ -4212,7 +4232,7 @@ msgstr "E&xtensões"
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:273
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&lugins"
-msgstr "&Complementos"
+msgstr "Comp&lementos"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280
 msgctxt "@title:menu menubar:toplevel"
@@ -4222,7 +4242,7 @@ msgstr "P&referências"
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:288
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
-msgstr "A&juda"
+msgstr "Ajuda (&H)"
 
 #: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370
 msgctxt "@action:button"
@@ -4272,7 +4292,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:138
 msgctxt "@action:label"
 msgid "Build plate"
-msgstr ""
+msgstr "Plataforma de Impressão"
 
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:161
 msgctxt "@action:label"
@@ -4297,7 +4317,7 @@ msgstr "Altura de Camada"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:251
 msgctxt "@tooltip"
 msgid "This quality profile is not available for you current material and nozzle configuration. Please change these to enable this quality profile"
-msgstr ""
+msgstr "Este perfil de qualidade não está disponível para seu material e sua configuração de bicos atuais. Por favor altere-os para abilitar este perfil de qualidade"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:412
 msgctxt "@tooltip"
@@ -4409,7 +4429,7 @@ msgstr "Registro do Motor de Fatiamento"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr ""
+msgstr "Tipo de impressora"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"
@@ -4474,22 +4494,22 @@ msgstr "Leitor de X3D"
 #: GCodeWriter/plugin.json
 msgctxt "description"
 msgid "Writes g-code to a file."
-msgstr ""
+msgstr "Escreve G-Code em um arquivo."
 
 #: GCodeWriter/plugin.json
 msgctxt "name"
 msgid "G-code Writer"
-msgstr ""
+msgstr "Gerador de G-Code"
 
 #: ModelChecker/plugin.json
 msgctxt "description"
 msgid "Checks models and print configuration for possible printing issues and give suggestions."
-msgstr ""
+msgstr "Verifica modelos e configurações de impressão por possíveis problema e dá sugestões."
 
 #: ModelChecker/plugin.json
 msgctxt "name"
 msgid "Model Checker"
-msgstr ""
+msgstr "Verificador de Modelo"
 
 #: cura-god-mode-plugin/src/GodMode/plugin.json
 msgctxt "description"
@@ -4544,22 +4564,22 @@ msgstr "Impressão USB"
 #: GCodeGzWriter/plugin.json
 msgctxt "description"
 msgid "Writes g-code to a compressed archive."
-msgstr ""
+msgstr "Escreve G-Code em um arquivo comprimido."
 
 #: GCodeGzWriter/plugin.json
 msgctxt "name"
 msgid "Compressed G-code Writer"
-msgstr ""
+msgstr "Gerador de G-Code Comprimido"
 
 #: UFPWriter/plugin.json
 msgctxt "description"
 msgid "Provides support for writing Ultimaker Format Packages."
-msgstr ""
+msgstr "Provê suporte para a escrita de Ultimaker Format Packages (Pacotes de Formato da Ultimaker)."
 
 #: UFPWriter/plugin.json
 msgctxt "name"
 msgid "UFP Writer"
-msgstr ""
+msgstr "Gerador de UFP"
 
 #: PrepareStage/plugin.json
 msgctxt "description"
@@ -4624,7 +4644,7 @@ msgstr "Verificador de Atualizações de Firmware"
 #: CuraSolidWorksPlugin/plugin.json
 msgctxt "description"
 msgid "Gives you the possibility to open certain files using SolidWorks itself. Conversion is done by this plugin and additional optimizations."
-msgstr "Te dá a possibilidade de abrir certos arquivos usando o SolidWorks. A conversão é feita por este plugin junto com personalizações adicionais."
+msgstr "Te dá a possibilidade de abrir certos arquivos usando o SolidWorks. A conversão é feita por este complemento junto a personalizações adicionais."
 
 #: CuraSolidWorksPlugin/plugin.json
 msgctxt "name"
@@ -4644,12 +4664,12 @@ msgstr "Visão Simulada"
 #: GCodeGzReader/plugin.json
 msgctxt "description"
 msgid "Reads g-code from a compressed archive."
-msgstr ""
+msgstr "Lê G-Code de um arquivo comprimido."
 
 #: GCodeGzReader/plugin.json
 msgctxt "name"
 msgid "Compressed G-code Reader"
-msgstr ""
+msgstr "Leitor de G-Code Comprimido"
 
 #: PostProcessingPlugin/plugin.json
 msgctxt "description"
@@ -4664,12 +4684,12 @@ msgstr "Pós-processamento"
 #: SupportEraser/plugin.json
 msgctxt "description"
 msgid "Creates an eraser mesh to block the printing of support in certain places"
-msgstr ""
+msgstr "Cria uma malha apagadora para bloquear a impressão de suporte em certos lugares"
 
 #: SupportEraser/plugin.json
 msgctxt "name"
 msgid "Support Eraser"
-msgstr ""
+msgstr "Apagador de Suporte"
 
 #: AutoSave/plugin.json
 msgctxt "description"
@@ -4729,17 +4749,17 @@ msgstr "Provê suporte a importar perfis de arquivos G-Code."
 #: GCodeProfileReader/plugin.json
 msgctxt "name"
 msgid "G-code Profile Reader"
-msgstr ""
+msgstr "Leitor de Perfil de G-Code"
 
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "description"
 msgid "Upgrades configurations from Cura 3.2 to Cura 3.3."
-msgstr ""
+msgstr "Atualiza configurações do Cura 3.2 para o Cura 3.3."
 
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "name"
 msgid "Version Upgrade 3.2 to 3.3"
-msgstr ""
+msgstr "Atualização de Versão de 3.2 para 3.3"
 
 #: VersionUpgrade/VersionUpgrade25to26/plugin.json
 msgctxt "description"

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

@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.2\n"
+"Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2017-12-04 09:00-0300\n"
+"PO-Revision-Date: 2018-04-21 09:00-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
-"Language-Team: Cláudio Sampaio <patola@makerlinux.com.br> and CoderSquirrel <jasaneschio@gmail.com>\n"
+"Language-Team: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -200,19 +200,19 @@ msgstr "A coordenada Y da posição onde o bico faz a purga no início da impres
 #: fdmextruder.def.json
 msgctxt "material label"
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
 #: fdmextruder.def.json
 msgctxt "material description"
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
 #: fdmextruder.def.json
 msgctxt "material_diameter label"
 msgid "Diameter"
-msgstr ""
+msgstr "Diâmetro"
 
 #: 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 ""
+msgstr "Ajusta o diâmetro do filamento usado. Acerte este valor com o diâmetro do filamento atual."

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

@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 3.2\n"
+"Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-02-13 02:20-0300\n"
+"PO-Revision-Date: 2018-04-21 14:20-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
-"Language-Team: Cláudio Sampaio <patola@makerlinux.com.br> and CoderSquirrel <jasaneschio@gmail.com>\n"
+"Language-Team: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +50,7 @@ msgstr "Indique se deseja exibir as variantes desta máquina, que são descrita
 #: fdmprinter.def.json
 msgctxt "machine_start_gcode label"
 msgid "Start G-code"
-msgstr ""
+msgstr "G-Code Inicial"
 
 #: fdmprinter.def.json
 msgctxt "machine_start_gcode description"
@@ -58,18 +58,21 @@ msgid ""
 "G-code commands to be executed at the very start - separated by \n"
 "."
 msgstr ""
+"Comandos G-Code a serem executados no início da impressão - separados por \n"
+"."
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode label"
 msgid "End G-code"
-msgstr ""
+msgstr "G-Code Final"
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode description"
 msgid ""
 "G-code commands to be executed at the very end - separated by \n"
 "."
-msgstr ""
+msgstr "Comandos G-Code a serem executados no final da impressão - separados por \n"
+"."
 
 #: fdmprinter.def.json
 msgctxt "material_guid label"
@@ -164,22 +167,22 @@ msgstr "Elíptica"
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type label"
 msgid "Build Plate Material"
-msgstr ""
+msgstr "Material da Plataforma de Impressão"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type description"
 msgid "The material of the build plate installed on the printer."
-msgstr ""
+msgstr "O material da plataforma de impressão presente na impressora."
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type option glass"
 msgid "Glass"
-msgstr ""
+msgstr "Vidro"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type option aluminum"
 msgid "Aluminum"
-msgstr ""
+msgstr "Alumínio"
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
@@ -224,12 +227,12 @@ msgstr "Número de extrusores. Um extrusor é a combinação de um alimentador/t
 #: fdmprinter.def.json
 msgctxt "extruders_enabled_count label"
 msgid "Number of Extruders that are enabled"
-msgstr ""
+msgstr "Número de Extrusores habilitados"
 
 #: fdmprinter.def.json
 msgctxt "extruders_enabled_count description"
 msgid "Number of extruder trains that are enabled; automatically set in software"
-msgstr ""
+msgstr "O número de carros extrusores que estão habilitados; automaticamente ajustado em software"
 
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_tip_outer_diameter label"
@@ -324,12 +327,12 @@ msgstr "Tempo mínimo em que um extrusor precisará estar inativo antes que o bi
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor label"
 msgid "G-code flavour"
-msgstr ""
+msgstr "Sabor de G-Code"
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor description"
 msgid "The type of g-code to be generated."
-msgstr ""
+msgstr "O tipo de G-Code a ser gerado."
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
@@ -609,72 +612,72 @@ msgstr "O valor default de jerk para movimentação do filamento."
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_x label"
 msgid "Steps per Millimeter (X)"
-msgstr ""
+msgstr "Passos por Milímetro (X)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_x description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the X direction."
-msgstr ""
+msgstr "Quantos passos do motor de passo resultarão em um milímetro de movimento na direção X."
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_y label"
 msgid "Steps per Millimeter (Y)"
-msgstr ""
+msgstr "Passos por Milímetro (Y)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_y description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the Y direction."
-msgstr ""
+msgstr "Quantos passos do motor de passo resultarão em um milímetro de movimento na direção Y."
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_z label"
 msgid "Steps per Millimeter (Z)"
-msgstr ""
+msgstr "Passos por Milímetro (Z)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_z description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the Z direction."
-msgstr ""
+msgstr "Quantos passos do motor de passo resultarão em um milímetro de movimento na direção Z."
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_e label"
 msgid "Steps per Millimeter (E)"
-msgstr ""
+msgstr "Passos por Milímetro (E)"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_e description"
 msgid "How many steps of the stepper motors will result in one millimeter of extrusion."
-msgstr ""
+msgstr "Quantos passos do motor de passo resultarão em um milímetro de extrusão."
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_x label"
 msgid "X Endstop in Positive Direction"
-msgstr ""
+msgstr "Endstop X na Direção Positiva"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_x description"
 msgid "Whether the endstop of the X axis is in the positive direction (high X coordinate) or negative (low X coordinate)."
-msgstr ""
+msgstr "Se o endstop do eixo X está na direção positiva (coordenada X alta) ou negativa (coordenada X baixa)."
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_y label"
 msgid "Y Endstop in Positive Direction"
-msgstr ""
+msgstr "Endstop Y na Direção Positiva"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_y description"
 msgid "Whether the endstop of the Y axis is in the positive direction (high Y coordinate) or negative (low Y coordinate)."
-msgstr ""
+msgstr "Se o endstop do eixo Y está na direção positiva (coordenada Y alta) ou negativa (coordenada Y baixa)."
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_z label"
 msgid "Z Endstop in Positive Direction"
-msgstr ""
+msgstr "Endstop Z na Direção Positiva"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_z description"
 msgid "Whether the endstop of the Z axis is in the positive direction (high Z coordinate) or negative (low Z coordinate)."
-msgstr ""
+msgstr "Se o endstop do eixo Z está na direção positiva (coordenada Z alta) ou negativa (coordenada Z baixa)."
 
 #: fdmprinter.def.json
 msgctxt "machine_minimum_feedrate label"
@@ -689,12 +692,12 @@ msgstr "Velocidade mínima de entrada de filamento no hotend."
 #: fdmprinter.def.json
 msgctxt "machine_feeder_wheel_diameter label"
 msgid "Feeder Wheel Diameter"
-msgstr ""
+msgstr "Diâmetro da Engrenagem de Alimentação"
 
 #: fdmprinter.def.json
 msgctxt "machine_feeder_wheel_diameter description"
 msgid "The diameter of the wheel that drives the material in the feeder."
-msgstr ""
+msgstr "O diâmetro da engrenagem que traciona o material no alimentador."
 
 #: fdmprinter.def.json
 msgctxt "resolution label"
@@ -1824,12 +1827,12 @@ msgstr "Velocidade adicional pela qual o bico resfria enquanto extruda. O mesmo
 #: fdmprinter.def.json
 msgctxt "default_material_bed_temperature label"
 msgid "Default Build Plate Temperature"
-msgstr ""
+msgstr "Temperatura Default da Plataforma de Impressão"
 
 #: fdmprinter.def.json
 msgctxt "default_material_bed_temperature description"
 msgid "The default temperature used for the heated build plate. This should be the \"base\" temperature of a build plate. All other print temperatures should use offsets based on this value"
-msgstr ""
+msgstr "A temperatura default usada para a plataforma aquecida de impressão. Este valor deve ser a temperatura \"base\" da plataforma. Todas as outras temperaturas de impressão devem usar diferenças baseadas neste valor"
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temperature label"
@@ -1884,12 +1887,12 @@ msgstr "Energia de superfície."
 #: fdmprinter.def.json
 msgctxt "material_shrinkage_percentage label"
 msgid "Shrinkage Ratio"
-msgstr ""
+msgstr "Raio de Contração"
 
 #: fdmprinter.def.json
 msgctxt "material_shrinkage_percentage description"
 msgid "Shrinkage ratio in percentage."
-msgstr ""
+msgstr "Raio de contração do material em porcentagem."
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -1904,12 +1907,12 @@ msgstr "Compensação de fluxo: a quantidade de material extrudado é multiplica
 #: fdmprinter.def.json
 msgctxt "material_flow_layer_0 label"
 msgid "Initial Layer Flow"
-msgstr ""
+msgstr "Fluxo Inicial de Camada"
 
 #: fdmprinter.def.json
 msgctxt "material_flow_layer_0 description"
 msgid "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value."
-msgstr ""
+msgstr "Compensação de fluxo para a primeira camada; a quantidade de material extrudado na camada inicial é multiplicada por este valor."
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable label"
@@ -3084,12 +3087,12 @@ msgstr "Cruzado"
 #: fdmprinter.def.json
 msgctxt "zig_zaggify_support label"
 msgid "Connect Support Lines"
-msgstr ""
+msgstr "Conectar Linhas de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "zig_zaggify_support description"
 msgid "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material."
-msgstr ""
+msgstr "Conecta os extremos das linhas de suporte juntos. Habilitar este ajuste pode tornar seu suporte mais robusto e reduzir subextrusão, mas gastará mais material."
 
 #: fdmprinter.def.json
 msgctxt "support_connect_zigzags label"
@@ -3718,7 +3721,7 @@ msgstr "Este ajuste controla quanto os cantos internos do contorno do raft são
 #: fdmprinter.def.json
 msgctxt "raft_airgap label"
 msgid "Raft Air Gap"
-msgstr "Vão de Ar do Raft"
+msgstr "Vão Aéreo do Raft"
 
 #: fdmprinter.def.json
 msgctxt "raft_airgap description"
@@ -3733,7 +3736,7 @@ msgstr "Sobreposição em Z das Camadas Iniciais"
 #: fdmprinter.def.json
 msgctxt "layer_0_z_overlap description"
 msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount."
-msgstr "Faz a primeira e segunda camadas do modelo se sobreporem na direção Z para compensar pelo filamento perdido no vão de ar. Todos os modelos acima da primeira camada de modelo serão deslocados para baixo por essa distância."
+msgstr "Faz a primeira e segunda camadas do modelo se sobreporem na direção Z para compensar pelo filamento perdido no vão aéreo. Todos os modelos acima da primeira camada de modelo serão deslocados para baixo por essa distância."
 
 #: fdmprinter.def.json
 msgctxt "raft_surface_layers label"
@@ -4018,12 +4021,12 @@ msgstr "Imprimir uma torre próxima à impressão que serve para purgar o materi
 #: fdmprinter.def.json
 msgctxt "prime_tower_circular label"
 msgid "Circular Prime Tower"
-msgstr ""
+msgstr "Torre de Prime Circular"
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_circular description"
 msgid "Make the prime tower as a circular shape."
-msgstr ""
+msgstr "Faz a torre de prime na forma circular."
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_size label"
@@ -4193,7 +4196,7 @@ msgstr "Manter Faces Desconectadas"
 #: fdmprinter.def.json
 msgctxt "meshfix_keep_open_polygons description"
 msgid "Normally Cura tries to stitch up small holes in the mesh and remove parts of a layer with big holes. Enabling this option keeps those parts which cannot be stitched. This option should be used as a last resort option when everything else fails to produce proper g-code."
-msgstr ""
+msgstr "Normalmente o Cura tenta costurar pequenos furos na malha e remover partes de uma camada com grandes buracos. Habilitar esta opção mantém as partes que ele não consegue costurar. Esta opção deve ser usada como última alternativa quando tudo o mais falhar para produzir G-Code apropriado."
 
 #: fdmprinter.def.json
 msgctxt "multiple_mesh_overlap label"
@@ -4408,7 +4411,7 @@ msgstr "Extrusão Relativa"
 #: fdmprinter.def.json
 msgctxt "relative_extrusion description"
 msgid "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the g-code. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any g-code script is output."
-msgstr ""
+msgstr "Usar extrusão relativa ao invés de extrusão absoluta. Passos de extrusão relativos no G-Code tornam o pós-processamento mais fácil. No entanto, isso não é suportado por todas as impressoras e pode produzir pequenos desvios na quantidade de material depositado comparado a passos de extrusão absolutos. Independente deste ajuste, o modo de extrusão sempre será ajustado para absoluto antes que qualquer script G-Code seja processado."
 
 #: fdmprinter.def.json
 msgctxt "experimental label"
@@ -5252,202 +5255,202 @@ msgstr "Limite até onde se usa uma camada menor ou não. Este número é compar
 #: fdmprinter.def.json
 msgctxt "bridge_settings_enabled label"
 msgid "Enable Bridge Settings"
-msgstr ""
+msgstr "Habilitar Ajustes de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_settings_enabled description"
 msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed."
-msgstr ""
+msgstr "Detectar pontes e modificar a velocidade de impressão, de fluxo e ajustes de fan onde elas forem detectadas."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_min_length label"
 msgid "Minimum Bridge Wall Length"
-msgstr ""
+msgstr "Comprimento de Parede de Ponte Mínimo"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_min_length description"
 msgid "Unsupported walls shorter than this will be printed using the normal wall settings. Longer unsupported walls will be printed using the bridge wall settings."
-msgstr ""
+msgstr "Paredes não-suportadas mais curtas que esta quantia serão impressas usando ajustes normais de paredes. Paredes mais longas serão impressas com os ajustes de parede de ponte."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_support_threshold label"
 msgid "Bridge Skin Support Threshold"
-msgstr ""
+msgstr "Limiar de Suporte de Contorno de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_support_threshold description"
 msgid "If a skin region is supported for less than this percentage of its area, print it using the bridge settings. Otherwise it is printed using the normal skin settings."
-msgstr ""
+msgstr "Se uma região do contorno for suportada por menos do que esta porcentagem de sua área, imprimi-la com os ajustes de ponte. Senão, imprimir usando os ajustes normais de contorno."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_max_overhang label"
 msgid "Bridge Wall Max Overhang"
-msgstr ""
+msgstr "Seção Pendente Máxima da Parede de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_max_overhang description"
 msgid "The maximum allowed width of the region of air below a wall line before the wall is printed using bridge settings. Expressed as a percentage of the wall line width. When the air gap is wider than this, the wall line is printed using the bridge settings. Otherwise, the wall line is printed using the normal settings. The lower the value, the more likely it is that overhung wall lines will be printed using bridge settings."
-msgstr ""
+msgstr "O comprimento máximo permitido da região de ar abaixo da linha da parede antes que a parede seja impressa usando ajustes de ponte. Expressado como uma porcentagem da espessura de filete de parede. Quando o vão for mais largo que esta quantia, a parede é impressa usando os ajustes de ponte. Senão, a parede é impressa com os ajustes normais. Quanto menor o valor, mais provável que os filetes da parede sejam impressos com os ajustes de ponte."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
 msgid "Bridge Wall Coasting"
-msgstr ""
+msgstr "Desengrenagem de Parede de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast description"
 msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge."
-msgstr ""
+msgstr "Este ajuste controla a distância que o extrusor deve parar de extrudar antes que a parede de ponte comece. Desengrenar antes da ponte iniciar pode reduzir a pressão no bico e produzir em uma ponte mais horizontal."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_speed label"
 msgid "Bridge Wall Speed"
-msgstr ""
+msgstr "Velocidade da Parede de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_speed description"
 msgid "The speed at which the bridge walls are printed."
-msgstr ""
+msgstr "A velocidade com a qual as paredes de ponte são impressas."
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_material_flow label"
 msgid "Bridge Wall Flow"
-msgstr ""
+msgstr "Fluxo da Parede de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_material_flow description"
 msgid "When printing bridge walls, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Ao se imprimir paredes de ponte, a quantidade de material extrudado é multiplicada por este valor."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed label"
 msgid "Bridge Skin Speed"
-msgstr ""
+msgstr "Velocidade do Contorno de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed description"
 msgid "The speed at which bridge skin regions are printed."
-msgstr ""
+msgstr "A velocidade com a qual regiões de contorno de ponte são impressas."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow label"
 msgid "Bridge Skin Flow"
-msgstr ""
+msgstr "Fluxo do Contorno de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow description"
 msgid "When printing bridge skin regions, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Ao imprimir regiões de contorno de ponte, a quantidade de material extrudado é multiplicada por este valor."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density label"
 msgid "Bridge Skin Density"
-msgstr ""
+msgstr "Densidade do Contorno de Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density description"
 msgid "The density of the bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "A densidade da camada de contorno de ponte. Valores menores que 100 aumentarão a lacuna entre as linhas de contorno."
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed label"
 msgid "Bridge Fan Speed"
-msgstr ""
+msgstr "Velocidade de Ventoinha da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed description"
 msgid "Percentage fan speed to use when printing bridge walls and skin."
-msgstr ""
+msgstr "Porcentagem da velocidade de ventoinha a usar quando imprimir paredes e contornos em pontes."
 
 #: fdmprinter.def.json
 msgctxt "bridge_enable_more_layers label"
 msgid "Bridge Has Multiple Layers"
-msgstr ""
+msgstr "Ponte Tem Camadas Múltiplas"
 
 #: fdmprinter.def.json
 msgctxt "bridge_enable_more_layers description"
 msgid "If enabled, the second and third layers above the air are printed using the following settings. Otherwise, those layers are printed using the normal settings."
-msgstr ""
+msgstr "Se habilitado, a segunda e terceira camadas sobre o ar serão impressas usando os ajustes seguintes. Senão, estas camadas serão impressas com ajustes normais."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_2 label"
 msgid "Bridge Second Skin Speed"
-msgstr ""
+msgstr "Velocidade de Segundo Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_2 description"
 msgid "Print speed to use when printing the second bridge skin layer."
-msgstr ""
+msgstr "Velocidade de impressão a usar quando imprimir a segunda camada de ponte."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_2 label"
 msgid "Bridge Second Skin Flow"
-msgstr ""
+msgstr "Fluxo de Segundo Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_2 description"
 msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Ao imprimir a segunda camada de contorno de ponte, a quantidade de material é multiplicada por este valor."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_2 label"
 msgid "Bridge Second Skin Density"
-msgstr ""
+msgstr "Densidade de Segundo Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_2 description"
 msgid "The density of the second bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "A densidade da segunda camada de contorno da ponte. Valores menores que 100 aumentarão a lacuna entre as linhas de contorno."
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_2 label"
 msgid "Bridge Second Skin Fan Speed"
-msgstr ""
+msgstr "Velocidade da Ventoinha no Segundo Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_2 description"
 msgid "Percentage fan speed to use when printing the second bridge skin layer."
-msgstr ""
+msgstr "Porcentagem da velocidade da ventoinha a usar quando se imprimir a segunda camada de contorno da ponte."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_3 label"
 msgid "Bridge Third Skin Speed"
-msgstr ""
+msgstr "Velocidade de Terceiro Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_3 description"
 msgid "Print speed to use when printing the third bridge skin layer."
-msgstr ""
+msgstr "Velocidade de impressão a usar quando imprimir a terceira camada de ponte."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_3 label"
 msgid "Bridge Third Skin Flow"
-msgstr ""
+msgstr "Fluxo de Terceiro Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_3 description"
 msgid "When printing the third bridge skin layer, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "Ao imprimir a terceira de contorno da ponte, a quantidade de material é multiplicada por este valor."
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_3 label"
 msgid "Bridge Third Skin Density"
-msgstr ""
+msgstr "Densidade de Terceiro Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_3 description"
 msgid "The density of the third bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "A densidade da terceira camada de contorno da ponte. Valores menores que 100 aumentarão a lacuna entre as linhas de contorno."
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_3 label"
 msgid "Bridge Third Skin Fan Speed"
-msgstr ""
+msgstr "Velocidade da Ventoinha no Terceiro Contorno da Ponte"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_3 description"
 msgid "Percentage fan speed to use when printing the third bridge skin layer."
-msgstr ""
+msgstr "Porcentagem da velocidade da ventoinha a usar quando se imprimir a terceira camada de contorno da ponte."
 
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"

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

@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Cura 3.3\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-04-11 14:40+0100\n"
+"PO-Revision-Date: 2018-04-16 02:14+0100\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
+"Last-Translator: Paulo Miranda <av@utopica3d.com>\n"
-"Language-Team: Portuguese <info@bothof.nl>, Paulo Miranda <av@utopica3d.com>\n"
+"Language-Team: Paulo Miranda <av@utopica3d.com>, Portuguese <info@bothof.nl>\n"
 "Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +96,7 @@ msgstr "Posição Inicial Absoluta do Extrusor"
 #: 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 "Define a posição inicial do extrusor, absoluta em vez de relativa à última posição conhecida da cabeça de impressão."
+msgstr "Define a posição inicial do extrusor, de forma absoluta em vez, de relativa à última posição conhecida da cabeça de impressão."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_x label"
@@ -161,42 +161,42 @@ msgstr "A coordenada Y da posição final ao desligar o extrusor."
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z label"
 msgid "Extruder Prime Z Position"
-msgstr "Posição Z para Preparação Extrusor"
+msgstr "Posição Z para Preparação do Extrusor"
 
 #: 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."
-msgstr "A coordenada Z da posição onde fazer a preparação do nozzle no inicio da impressão."
+msgstr "A coordenada Z da posição onde o nozzle é preparado ao iniciar a impressão."
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
-msgstr "Aderência"
+msgstr "Aderência à Base Construção"
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion description"
 msgid "Adhesion"
-msgstr "Aderência à Base de Construção"
+msgstr "Aderência"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
-msgstr "Posição X Preparação Extrusor"
+msgstr "Posição X Preparação do Extrusor"
 
 #: 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."
-msgstr "A coordenada X da posição onde o é feita a preparação do nozzle no inicio da impressão."
+msgstr "A coordenada X da posição onde o nozzle é preparado ao iniciar a impressão."
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y label"
 msgid "Extruder Prime Y Position"
-msgstr "Posição Y Preparação Extrusor"
+msgstr "Posição Y Preparação do Extrusor"
 
 #: 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."
-msgstr "A coordenada Y da posição onde o é feita a preparação do nozzle no inicio da impressão."
+msgstr "A coordenada Y da posição onde o nozzle é preparado ao iniciar a impressão."
 
 #: fdmextruder.def.json
 msgctxt "material label"

resources/i18n/zh_CN/cura.po

@@ -28,6 +28,11 @@ msgctxt "@item:inlistbox"
 msgid "X-Ray view"
 msgstr "透视视图"
 
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
+msgctxt "@label"
+msgid "Use adhesion sheet or glue with this material combination"
+msgstr "在此材料组合的情况下，请使用附着垫片或者胶水"
+
 #: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:13
 msgctxt "@item:inlistbox"
 msgid "X3D File"

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

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: Cura 3.1\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2017-11-22 23:36+0800\n"
+"PO-Revision-Date: 2018-03-31 15:18+0800\n"
 "Last-Translator: Zhang Heh Ji <dinowchang@gmail.com>\n"
 "Language-Team: TEAM\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
@@ -200,19 +200,19 @@ msgstr "列印開始時，噴頭在 Y 軸座標上初始位置。"
 #: fdmextruder.def.json
 msgctxt "material label"
 msgid "Material"
-msgstr ""
+msgstr "耗材"
 
 #: fdmextruder.def.json
 msgctxt "material description"
 msgid "Material"
-msgstr ""
+msgstr "耗材"
 
 #: fdmextruder.def.json
 msgctxt "material_diameter label"
 msgid "Diameter"
-msgstr ""
+msgstr "直徑"
 
 #: 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 ""
+msgstr "調整所用耗材的直徑。調整此值與所用耗材的直徑相匹配。"

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Cura 3.2\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
 "POT-Creation-Date: 2018-03-29 08:36+0200\n"
-"PO-Revision-Date: 2018-02-01 20:58+0800\n"
+"PO-Revision-Date: 2018-04-05 20:45+0800\n"
 "Last-Translator: Zhang Heh Ji <dinowchang@gmail.com>\n"
 "Language-Team: Zhang Heh Ji <dinowchang@gmail.com>\n"
 "Language: zh_TW\n"
@@ -50,7 +50,7 @@ msgstr "是否顯示這台印表機在不同的 JSON 檔案中所描述的型號
 #: fdmprinter.def.json
 msgctxt "machine_start_gcode label"
 msgid "Start G-code"
-msgstr ""
+msgstr "起始 G-code"
 
 #: fdmprinter.def.json
 msgctxt "machine_start_gcode description"
@@ -58,11 +58,13 @@ msgid ""
 "G-code commands to be executed at the very start - separated by \n"
 "."
 msgstr ""
+"開始時最先執行的 G-code 命令 - 使用 \n"
+". 隔開"
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode label"
 msgid "End G-code"
-msgstr ""
+msgstr "結束 G-code"
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode description"
@@ -70,6 +72,8 @@ msgid ""
 "G-code commands to be executed at the very end - separated by \n"
 "."
 msgstr ""
+"結束前最後執行的 G-code 命令 - 使用 \n"
+". 隔開"
 
 #: fdmprinter.def.json
 msgctxt "material_guid label"
@@ -164,22 +168,22 @@ msgstr "類圓形"
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type label"
 msgid "Build Plate Material"
-msgstr ""
+msgstr "列印平台材質"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type description"
 msgid "The material of the build plate installed on the printer."
-msgstr ""
+msgstr "印表機上列印平台的材質。"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type option glass"
 msgid "Glass"
-msgstr ""
+msgstr "玻璃"
 
 #: fdmprinter.def.json
 msgctxt "machine_buildplate_type option aluminum"
 msgid "Aluminum"
-msgstr ""
+msgstr "鋁"
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
@@ -224,12 +228,12 @@ msgstr "擠出機組數目。擠出機組是指進料裝置、喉管和噴頭的
 #: fdmprinter.def.json
 msgctxt "extruders_enabled_count label"
 msgid "Number of Extruders that are enabled"
-msgstr ""
+msgstr "已啟用擠出機的數量"
 
 #: fdmprinter.def.json
 msgctxt "extruders_enabled_count description"
 msgid "Number of extruder trains that are enabled; automatically set in software"
-msgstr ""
+msgstr "啟用擠出機的數量；軟體自動設定"
 
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_tip_outer_diameter label"
@@ -324,12 +328,12 @@ msgstr "擠出機必須保持不活動以便噴頭冷卻的最短時間。擠出
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor label"
 msgid "G-code flavour"
-msgstr ""
+msgstr "G-code 類型"
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor description"
 msgid "The type of g-code to be generated."
-msgstr ""
+msgstr "產生 G-code 的類型。"
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
@@ -609,72 +613,72 @@ msgstr "擠出馬達的預設加加速度。"
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_x label"
 msgid "Steps per Millimeter (X)"
-msgstr ""
+msgstr "每毫米的步數（X）"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_x description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the X direction."
-msgstr ""
+msgstr "在 X 方向移動一毫米時，步進馬達所需移動的步數。"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_y label"
 msgid "Steps per Millimeter (Y)"
-msgstr ""
+msgstr "每毫米的步數（Y）"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_y description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the Y direction."
-msgstr ""
+msgstr "在 Y 方向移動一毫米時，步進馬達所需移動的步數。"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_z label"
 msgid "Steps per Millimeter (Z)"
-msgstr ""
+msgstr "每毫米的步數（Z）"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_z description"
 msgid "How many steps of the stepper motor will result in one millimeter of movement in the Z direction."
-msgstr ""
+msgstr "在 Z 方向移動一毫米時，步進馬達所需移動的步數。"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_e label"
 msgid "Steps per Millimeter (E)"
-msgstr ""
+msgstr "每毫米的步數（E）"
 
 #: fdmprinter.def.json
 msgctxt "machine_steps_per_mm_e description"
 msgid "How many steps of the stepper motors will result in one millimeter of extrusion."
-msgstr ""
+msgstr "擠出機移動一毫米時，步進馬達所需移動的步數。"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_x label"
 msgid "X Endstop in Positive Direction"
-msgstr ""
+msgstr "X 限位開關位於正向"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_x description"
 msgid "Whether the endstop of the X axis is in the positive direction (high X coordinate) or negative (low X coordinate)."
-msgstr ""
+msgstr "X 軸的限位開關位於正向（X 座標值大）還是負向（X 座標值小）。"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_y label"
 msgid "Y Endstop in Positive Direction"
-msgstr ""
+msgstr "Y 限位開關位於正向"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_y description"
 msgid "Whether the endstop of the Y axis is in the positive direction (high Y coordinate) or negative (low Y coordinate)."
-msgstr ""
+msgstr "Y 軸的限位開關位於正向（Y 座標值大）還是負向（Y 座標值小）。"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_z label"
 msgid "Z Endstop in Positive Direction"
-msgstr ""
+msgstr "Z 限位開關位於正向"
 
 #: fdmprinter.def.json
 msgctxt "machine_endstop_positive_direction_z description"
 msgid "Whether the endstop of the Z axis is in the positive direction (high Z coordinate) or negative (low Z coordinate)."
-msgstr ""
+msgstr "Z 軸的限位開關位於正向（Z 座標值大）還是負向（Z 座標值小）。"
 
 #: fdmprinter.def.json
 msgctxt "machine_minimum_feedrate label"
@@ -689,12 +693,12 @@ msgstr "列印頭的最低移動速度。"
 #: fdmprinter.def.json
 msgctxt "machine_feeder_wheel_diameter label"
 msgid "Feeder Wheel Diameter"
-msgstr ""
+msgstr "進料輪直徑"
 
 #: fdmprinter.def.json
 msgctxt "machine_feeder_wheel_diameter description"
 msgid "The diameter of the wheel that drives the material in the feeder."
-msgstr ""
+msgstr "帶動進料器中耗材的輪子的直徑。"
 
 #: fdmprinter.def.json
 msgctxt "resolution label"
@@ -1034,7 +1038,7 @@ msgstr "鋸齒狀"
 #: fdmprinter.def.json
 msgctxt "top_bottom_pattern_0 label"
 msgid "Bottom Pattern Initial Layer"
-msgstr "初始層列印樣式"
+msgstr "起始層列印樣式"
 
 #: fdmprinter.def.json
 msgctxt "top_bottom_pattern_0 description"
@@ -1094,7 +1098,7 @@ msgstr "先印外壁後印內壁"
 #: fdmprinter.def.json
 msgctxt "outer_inset_first description"
 msgid "Prints walls in order of outside to inside when enabled. This can help improve dimensional accuracy in X and Y when using a high viscosity plastic like ABS; however it can decrease outer surface print quality, especially on overhangs."
-msgstr "啟用時以從外向內的順序列印壁。當使用高黏度塑料如 ABS 時，這有助於提高 X 和 Y 的尺寸精度；但是，它可能會降低外表面列印品質，特别是在懸垂部分。"
+msgstr "啟用時以從外向內的順序列印牆壁。當使用高黏度塑料如 ABS 時，這有助於提高 X 和 Y 的尺寸精度；但是，它可能會降低表面列印品質，尤其是在突出部分。"
 
 #: fdmprinter.def.json
 msgctxt "alternate_extra_perimeter label"
@@ -1659,7 +1663,7 @@ msgstr "先印填充再印牆壁"
 #: fdmprinter.def.json
 msgctxt "infill_before_walls description"
 msgid "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface."
-msgstr "列印牆壁前先列印填充。先列印牆壁可以產生更精確的牆壁，但懸垂列印品質會較差。先列印填充會產生更牢固的牆壁，但有時候填充的列印樣式會透過表面顯現出來。"
+msgstr "列印牆壁前先列印填充。先列印牆壁可以產生更精確的牆壁，但突出部分列印品質會較差。先列印填充會產生更牢固的牆壁，但有時候填充的列印樣式會透過表面顯現出來。"
 
 #: fdmprinter.def.json
 msgctxt "min_infill_area label"
@@ -1769,7 +1773,7 @@ msgstr "預設列印溫度"
 #: fdmprinter.def.json
 msgctxt "default_material_print_temperature description"
 msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value"
-msgstr "用於列印的預設溫度。應為耗材的\"基本\"溫度。所有其他列印溫度均應使用基於此值的偏移量"
+msgstr "用於列印的預設溫度。應為耗材的溫度\"基礎值\"。其他列印溫度將以此值為基準計算偏移"
 
 #: fdmprinter.def.json
 msgctxt "material_print_temperature label"
@@ -1824,12 +1828,12 @@ msgstr "解決在擠料的同時因為噴頭冷卻所造成的影響的額外速
 #: fdmprinter.def.json
 msgctxt "default_material_bed_temperature label"
 msgid "Default Build Plate Temperature"
-msgstr ""
+msgstr "列印平台預設溫度"
 
 #: fdmprinter.def.json
 msgctxt "default_material_bed_temperature description"
 msgid "The default temperature used for the heated build plate. This should be the \"base\" temperature of a build plate. All other print temperatures should use offsets based on this value"
-msgstr ""
+msgstr "列印平台加熱的預設溫度。這會是列印平台的溫度\"基礎值\"。其他列印溫度將以此值為基準計算偏移"
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temperature label"
@@ -1884,12 +1888,12 @@ msgstr "表面能量。"
 #: fdmprinter.def.json
 msgctxt "material_shrinkage_percentage label"
 msgid "Shrinkage Ratio"
-msgstr ""
+msgstr "收縮率"
 
 #: fdmprinter.def.json
 msgctxt "material_shrinkage_percentage description"
 msgid "Shrinkage ratio in percentage."
-msgstr ""
+msgstr "收縮率百分比。"
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -1904,12 +1908,12 @@ msgstr "流量補償：擠出的耗材量乘以此值。"
 #: fdmprinter.def.json
 msgctxt "material_flow_layer_0 label"
 msgid "Initial Layer Flow"
-msgstr ""
+msgstr "起始層流量"
 
 #: fdmprinter.def.json
 msgctxt "material_flow_layer_0 description"
 msgid "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value."
-msgstr ""
+msgstr "第一層的流量補償：在起始層上擠出的耗材量會乘以此值。"
 
 #: fdmprinter.def.json
 msgctxt "retraction_enable label"
@@ -2169,7 +2173,7 @@ msgstr "支撐介面速度"
 #: fdmprinter.def.json
 msgctxt "speed_support_interface description"
 msgid "The speed at which the roofs and floors of support are printed. Printing them at lower speeds can improve overhang quality."
-msgstr "列印支撐頂板和底板的速度。以較低的速度列印可以改善懸垂品質。"
+msgstr "列印支撐頂板和底板的速度。以較低的速度列印可以改善突出部分的品質。"
 
 #: fdmprinter.def.json
 msgctxt "speed_support_roof label"
@@ -2179,7 +2183,7 @@ msgstr "支撐頂板速度"
 #: fdmprinter.def.json
 msgctxt "speed_support_roof description"
 msgid "The speed at which the roofs of support are printed. Printing them at lower speeds can improve overhang quality."
-msgstr "列印支撐頂板的速度。以較低的速度列印可以改善懸垂品質。"
+msgstr "列印支撐頂板的速度。以較低的速度列印可以改善突出部分的品質。"
 
 #: fdmprinter.def.json
 msgctxt "speed_support_bottom label"
@@ -2399,7 +2403,7 @@ msgstr "支撐介面加速度"
 #: fdmprinter.def.json
 msgctxt "acceleration_support_interface description"
 msgid "The acceleration with which the roofs and floors of support are printed. Printing them at lower acceleration can improve overhang quality."
-msgstr "列印支撐頂板和底板的加速度。以較低的加速度列印可以改善懸垂品質。"
+msgstr "列印支撐頂板和底板的加速度。以較低的加速度列印可以改善突出部分的品質。"
 
 #: fdmprinter.def.json
 msgctxt "acceleration_support_roof label"
@@ -2409,7 +2413,7 @@ msgstr "支撐頂板加速度"
 #: fdmprinter.def.json
 msgctxt "acceleration_support_roof description"
 msgid "The acceleration with which the roofs of support are printed. Printing them at lower acceleration can improve overhang quality."
-msgstr "列印支撐頂板的加速度。以較低的加速度列印可以改善懸垂品質。"
+msgstr "列印支撐頂板的加速度。以較低的加速度列印可以改善突出部分的品質。"
 
 #: fdmprinter.def.json
 msgctxt "acceleration_support_bottom label"
@@ -2744,7 +2748,7 @@ msgstr "在相同的位置列印新層"
 #: fdmprinter.def.json
 msgctxt "start_layers_at_same_position description"
 msgid "In each layer start with printing the object near the same point, so that we don't start a new layer with printing the piece which the previous layer ended with. This makes for better overhangs and small parts, but increases printing time."
-msgstr "每一層都在相同點附近開始列印，這樣在列印新的一層時，就不需要列印前一層結束時的那一小段區域。在懸垂部分和小零件有良好的效果，但會增加列印時間。"
+msgstr "每一層都在相同點附近開始列印，這樣在列印新的一層時，就不需要列印前一層結束時的那一小段區域。在突出部分和小零件有良好的效果，但會增加列印時間。"
 
 #: fdmprinter.def.json
 msgctxt "layer_start_x label"
@@ -2784,7 +2788,7 @@ msgstr "僅在已列印部分上 Z 抬升"
 #: fdmprinter.def.json
 msgctxt "retraction_hop_only_when_collides description"
 msgid "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling."
-msgstr "僅在移動到無法通過“空跑時避開已列印部分”選項的水平操作避開的已列印部分上方時執行 Z 抬升。"
+msgstr "僅在移動到無法通過“空跑時避開已列印部分”選項避開的已列印部分上方時執行 Z 抬升。"
 
 #: fdmprinter.def.json
 msgctxt "retraction_hop label"
@@ -2824,7 +2828,7 @@ msgstr "開啟列印冷卻"
 #: fdmprinter.def.json
 msgctxt "cool_fan_enabled description"
 msgid "Enables the print cooling fans while printing. The fans improve print quality on layers with short layer times and bridging / overhangs."
-msgstr "列印時啟用列印冷卻風扇。風扇可以在列印時間較短的層和橋接/懸垂結構提高列印品質。"
+msgstr "列印時啟用列印冷卻風扇。風扇可以在列印時間較短的層和橋接/突出部分提高列印品質。"
 
 #: fdmprinter.def.json
 msgctxt "cool_fan_speed label"
@@ -2944,7 +2948,7 @@ msgstr "產生支撐"
 #: fdmprinter.def.json
 msgctxt "support_enable description"
 msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."
-msgstr "在模型的懸垂（Overhangs）部分產生支撐結構。若不這樣做，這些部分在列印時將倒塌。"
+msgstr "在模型的突出部分產生支撐結構。若不這樣做，這些部分在列印時會倒塌。"
 
 #: fdmprinter.def.json
 msgctxt "support_extruder_nr label"
@@ -3029,12 +3033,12 @@ msgstr "每個地方"
 #: fdmprinter.def.json
 msgctxt "support_angle label"
 msgid "Support Overhang Angle"
-msgstr "支撐懸垂角度"
+msgstr "支撐突出角度"
 
 #: fdmprinter.def.json
 msgctxt "support_angle description"
 msgid "The minimum angle of overhangs for which support is added. At a value of 0° all overhangs are supported, 90° will not provide any support."
-msgstr "添加支撐的最小懸垂角度。當角度為 0° 時，將支撐所有懸垂，當角度為 90° 時，不提供任何支撐。"
+msgstr "添加支撐的最小突出角度。當角度為 0° 時，將支撐所有突出部分，當角度為 90° 時，不提供任何支撐。"
 
 #: fdmprinter.def.json
 msgctxt "support_pattern label"
@@ -3084,12 +3088,12 @@ msgstr "十字形"
 #: fdmprinter.def.json
 msgctxt "zig_zaggify_support label"
 msgid "Connect Support Lines"
-msgstr ""
+msgstr "連接支撐線條"
 
 #: fdmprinter.def.json
 msgctxt "zig_zaggify_support description"
 msgid "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material."
-msgstr ""
+msgstr "將支撐線條的末端連接在一起。啟用此設定能讓支撐更堅固並減少擠出不足的問題，但會花費更多的耗材。"
 
 #: fdmprinter.def.json
 msgctxt "support_connect_zigzags label"
@@ -3109,7 +3113,7 @@ msgstr "支撐密度"
 #: fdmprinter.def.json
 msgctxt "support_infill_rate description"
 msgid "Adjusts the density of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
-msgstr "調整支撐結構的密度。較高的值會實現更好的懸垂，但支撐將更加難以移除。"
+msgstr "調整支撐結構的密度。較高的值會實現更好的突出部分，但支撐將更加難以移除。"
 
 #: fdmprinter.def.json
 msgctxt "support_line_distance label"
@@ -3169,7 +3173,7 @@ msgstr "支撐間距優先權"
 #: fdmprinter.def.json
 msgctxt "support_xy_overrides_z description"
 msgid "Whether the Support X/Y Distance overrides the Support Z Distance or vice versa. When X/Y overrides Z the X/Y distance can push away the support from the model, influencing the actual Z distance to the overhang. We can disable this by not applying the X/Y distance around overhangs."
-msgstr "支撐 X/Y 間距是否優先於支撐 Z 間距的設定。當 X/Y 間距優先於 Z 時，X/Y 間距可將支撐從模型上推離，同時影響與懸垂之間的實際 Z 間距。我們可以通過不在懸垂周圍套用 X/Y 間距來關閉此選項。"
+msgstr "支撐 X/Y 間距是否優先於支撐 Z 間距的設定。當 X/Y 間距優先於 Z 時，X/Y 間距可將支撐從模型上推離，同時影響與突出部分之間的實際 Z 間距。我們可以通過不在突出部分周圍套用 X/Y 間距來關閉此選項。"
 
 #: fdmprinter.def.json
 msgctxt "support_xy_overrides_z option xy_overrides_z"
@@ -3189,7 +3193,7 @@ 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 方向與懸垂的間距。"
+msgstr "支撐結構在 X/Y 方向與突出部分的間距。"
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height label"
@@ -3339,7 +3343,7 @@ msgstr "支撐介面密度"
 #: fdmprinter.def.json
 msgctxt "support_interface_density description"
 msgid "Adjusts the density of the roofs and floors of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
-msgstr "調整支撐結構頂板和底板的密度。較高的值會實現更好的懸垂，但支撐將更加難以移除。"
+msgstr "調整支撐結構頂板和底板的密度。較高的值會實現更好的突出部分，但支撐將更加難以移除。"
 
 #: fdmprinter.def.json
 msgctxt "support_roof_density label"
@@ -3349,7 +3353,7 @@ msgstr "支撐頂板密度"
 #: fdmprinter.def.json
 msgctxt "support_roof_density description"
 msgid "The density of the roofs of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
-msgstr "支撐結構頂板的密度。較高的值會讓懸垂印得更好，但支撐將更加難以移除。"
+msgstr "支撐結構頂板的密度。較高的值會讓突出部分印得更好，但支撐將更加難以移除。"
 
 #: fdmprinter.def.json
 msgctxt "support_roof_line_distance label"
@@ -3509,7 +3513,7 @@ msgstr "使用塔型支撐"
 #: fdmprinter.def.json
 msgctxt "support_use_towers description"
 msgid "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof."
-msgstr "使用專門的塔來支撐較小的懸垂區域。這些塔的直徑比它們所支撐的區域要大。在靠近懸垂物時，塔的直徑減小，形成頂板。"
+msgstr "使用專門的塔來支撐較小的突出區域。這些塔的直徑比它們所支撐的區域要大。在靠近突出部分時，塔的直徑減小，形成頂板。"
 
 #: fdmprinter.def.json
 msgctxt "support_tower_diameter label"
@@ -3549,7 +3553,7 @@ msgstr "下拉式支撐網格"
 #: fdmprinter.def.json
 msgctxt "support_mesh_drop_down description"
 msgid "Make support everywhere below the support mesh, so that there's no overhang in the support mesh."
-msgstr "在支撐網格下方的所有位置進行支撐，讓支撐網格中没有懸垂。"
+msgstr "在支撐網格下方的所有位置進行支撐，讓支撐網格中没有突出部分。"
 
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
@@ -4018,12 +4022,12 @@ msgstr "在列印件旁邊印一個塔，用在每次切換噴頭後填充耗材
 #: fdmprinter.def.json
 msgctxt "prime_tower_circular label"
 msgid "Circular Prime Tower"
-msgstr ""
+msgstr "圓型換料塔"
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_circular description"
 msgid "Make the prime tower as a circular shape."
-msgstr ""
+msgstr "將換料塔印成圓型。"
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_size label"
@@ -4143,7 +4147,7 @@ msgstr "擦拭牆距離"
 #: fdmprinter.def.json
 msgctxt "ooze_shield_dist description"
 msgid "Distance of the ooze shield from the print, in the X/Y directions."
-msgstr "擦拭牆與模型間的水平 ( X/Y 方向 ) 距離。"
+msgstr "擦拭牆與模型間的水平（X/Y 方向）距離。"
 
 #: fdmprinter.def.json
 msgctxt "meshfix label"
@@ -4163,7 +4167,7 @@ msgstr "合併重疊體積"
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all description"
 msgid "Ignore the internal geometry arising from overlapping volumes within a mesh and print the volumes as one. This may cause unintended internal cavities to disappear."
-msgstr "忽略由網格內的重疊體積產生的內部幾何，並將多個部分作為一個列印。這可能會導致意外的內部孔洞消失。"
+msgstr "忽略因網格內部重疊產生的幾何空間，並將多個重疊體積作為一個列印。這可能會導致意外的內部孔洞消失。"
 
 #: fdmprinter.def.json
 msgctxt "meshfix_union_all_remove_holes label"
@@ -4193,7 +4197,7 @@ msgstr "保持斷開表面"
 #: fdmprinter.def.json
 msgctxt "meshfix_keep_open_polygons description"
 msgid "Normally Cura tries to stitch up small holes in the mesh and remove parts of a layer with big holes. Enabling this option keeps those parts which cannot be stitched. This option should be used as a last resort option when everything else fails to produce proper g-code."
-msgstr ""
+msgstr "通常 Cura 會嘗試縫合網格中的小孔，並移除大的孔洞部分。啟用此選項可保留那些無法縫合的部分。此選項應該做為其他方法都無法產生適當 g-code 時的最後選擇。"
 
 #: fdmprinter.def.json
 msgctxt "multiple_mesh_overlap label"
@@ -4333,7 +4337,7 @@ msgstr "模具角度"
 #: fdmprinter.def.json
 msgctxt "mold_angle description"
 msgid "The angle of overhang of the outer walls created for the mold. 0° will make the outer shell of the mold vertical, while 90° will make the outside of the model follow the contour of the model."
-msgstr "為模具創建的外壁的懸垂角度。0° 將使模具的外殼垂直，而 90° 將使模型的外部遵循模型的輪廓。"
+msgstr "為模具創建的外壁的突出角度。0° 將使模具的外殼垂直，而 90° 將使模型的外部遵循模型的輪廓。"
 
 #: fdmprinter.def.json
 msgctxt "support_mesh label"
@@ -4348,12 +4352,12 @@ msgstr "使用此網格指定支撐區域。可用於產生支撐結構。"
 #: fdmprinter.def.json
 msgctxt "anti_overhang_mesh label"
 msgid "Anti Overhang Mesh"
-msgstr "防懸網格"
+msgstr "防突出網格"
 
 #: fdmprinter.def.json
 msgctxt "anti_overhang_mesh description"
 msgid "Use this mesh to specify where no part of the model should be detected as overhang. This can be used to remove unwanted support structure."
-msgstr "使用此網格指定模型的任何部分不應被檢測為懸垂的區域。可用於移除不需要的支撐結構。"
+msgstr "使用此網格指定模型的任何部分不應被檢測為突出的區域。可用於移除不需要的支撐結構。"
 
 #: fdmprinter.def.json
 msgctxt "magic_mesh_surface_mode label"
@@ -4408,7 +4412,7 @@ msgstr "相對模式擠出"
 #: fdmprinter.def.json
 msgctxt "relative_extrusion description"
 msgid "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the g-code. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any g-code script is output."
-msgstr ""
+msgstr "使用相對模式擠出而非絕對模式擠出。使用相對 E 步數在進行 g-code 後處理時可以更加輕鬆。不過並不是所有的印表機都支援此功能，而且與絕對 E 步數相比，它可能在耗材的使用量上產生輕微的誤差。不管設定為何，在產生 g-code 之前都是使用絕對模式。"
 
 #: fdmprinter.def.json
 msgctxt "experimental label"
@@ -4448,7 +4452,7 @@ msgstr "樹狀支撐樹枝距離"
 #: fdmprinter.def.json
 msgctxt "support_tree_branch_distance description"
 msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "樹支與模型接觸的點與點之間的間隔距離。較小的距離會讓支撐和模型有較多的接觸點，會有較佳的懸垂但支撐也較難移除。"
+msgstr "樹支與模型接觸的點與點之間的間隔距離。較小的距離會讓支撐和模型有較多的接觸點，會有較佳的突出部分但支撐也較難移除。"
 
 #: fdmprinter.def.json
 msgctxt "support_tree_branch_diameter label"
@@ -4693,12 +4697,12 @@ msgstr "防風罩的高度限制。超過這個高度就不再列印防風罩。
 #: fdmprinter.def.json
 msgctxt "conical_overhang_enabled label"
 msgid "Make Overhang Printable"
-msgstr "使懸垂可列印"
+msgstr "使突出可列印"
 
 #: fdmprinter.def.json
 msgctxt "conical_overhang_enabled description"
 msgid "Change the geometry of the printed model such that minimal support is required. Steep overhangs will become shallow overhangs. Overhanging areas will drop down to become more vertical."
-msgstr "更改列印模型的幾何形狀，以最大程度減少需要的支撐。陡峭的懸垂物將變淺。懸垂區域將下降變得更垂直。"
+msgstr "更改列印模型的幾何形狀，以最大程度減少需要的支撐。陡峭的突出部分將變淺。突出區域將下降變得更垂直。"
 
 #: fdmprinter.def.json
 msgctxt "conical_overhang_angle label"
@@ -4708,7 +4712,7 @@ msgstr "最大模型角度"
 #: fdmprinter.def.json
 msgctxt "conical_overhang_angle description"
 msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way."
-msgstr "在懸垂變得可列印後懸垂的最大角度。當該值為 0° 時，所有懸垂將被與列印平台連接的模型的一個部分替代，如果為 90° 時，不會以任何方式更改模型。"
+msgstr "在突出部分變得可列印後突出的最大角度。當該值為 0° 時，所有突出部分將被與列印平台連接的模型的一個部分替代，如果為 90° 時，不會以任何方式更改模型。"
 
 #: fdmprinter.def.json
 msgctxt "coasting_enable label"
@@ -4858,7 +4862,7 @@ msgstr "啟用錐形支撐"
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled description"
 msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang."
-msgstr "實驗性功能： 讓底部的支撐區域小於懸垂處的支撐區域。"
+msgstr "實驗性功能： 讓底部的支撐區域小於突出部分的支撐區域。"
 
 #: fdmprinter.def.json
 msgctxt "support_conical_angle label"
@@ -5252,202 +5256,202 @@ msgstr "決定是否使用較小層高的門檻值。此值會與一層中最陡
 #: fdmprinter.def.json
 msgctxt "bridge_settings_enabled label"
 msgid "Enable Bridge Settings"
-msgstr ""
+msgstr "啟用橋樑設定"
 
 #: fdmprinter.def.json
 msgctxt "bridge_settings_enabled description"
 msgid "Detect bridges and modify print speed, flow and fan settings while bridges are printed."
-msgstr ""
+msgstr "偵測橋樑，並在列印橋樑時改變列印速度，流量和風扇轉速。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_min_length label"
 msgid "Minimum Bridge Wall Length"
-msgstr ""
+msgstr "最小橋樑牆壁長度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_min_length description"
 msgid "Unsupported walls shorter than this will be printed using the normal wall settings. Longer unsupported walls will be printed using the bridge wall settings."
-msgstr ""
+msgstr "比此長度短的無支撐牆壁將以一般牆壁設定列印。較長的無支撐牆壁則以橋樑牆壁的設定列印。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_support_threshold label"
 msgid "Bridge Skin Support Threshold"
-msgstr ""
+msgstr "橋樑表層支撐門檻值"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_support_threshold description"
 msgid "If a skin region is supported for less than this percentage of its area, print it using the bridge settings. Otherwise it is printed using the normal skin settings."
-msgstr ""
+msgstr "假如表層區域受支撐的面積小於此百分比，使用橋樑設定列印。否則用一般的表層設定列印。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_max_overhang label"
 msgid "Bridge Wall Max Overhang"
-msgstr ""
+msgstr "最大橋樑牆壁突出"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_max_overhang description"
 msgid "The maximum allowed width of the region of air below a wall line before the wall is printed using bridge settings. Expressed as a percentage of the wall line width. When the air gap is wider than this, the wall line is printed using the bridge settings. Otherwise, the wall line is printed using the normal settings. The lower the value, the more likely it is that overhung wall lines will be printed using bridge settings."
-msgstr ""
+msgstr "使用一般設定列印牆壁線條允許最大的突出寬度。以牆壁線寬的百分比表示。當間隙比此寬時，使用橋樑設定列印牆壁線條。否則就使用一般設定列印牆壁線條。數值越低，越有可能使用橋樑設定列印牆壁線條。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
 msgid "Bridge Wall Coasting"
-msgstr ""
+msgstr "橋樑牆壁滑行"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast description"
 msgid "This controls the distance the extruder should coast immediately before a bridge wall begins. Coasting before the bridge starts can reduce the pressure in the nozzle and may produce a flatter bridge."
-msgstr ""
+msgstr "這可以控制擠出機在開始列印橋樑牆壁前滑行的距離。在橋樑開始之前進行滑行可以減小噴頭中的壓力並可能產生更平坦的橋樑。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_speed label"
 msgid "Bridge Wall Speed"
-msgstr ""
+msgstr "橋樑牆壁速度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_speed description"
 msgid "The speed at which the bridge walls are printed."
-msgstr ""
+msgstr "列印橋樑牆壁時的速度。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_material_flow label"
 msgid "Bridge Wall Flow"
-msgstr ""
+msgstr "橋樑牆壁流量"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_material_flow description"
 msgid "When printing bridge walls, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "列印橋樑牆壁時，擠出的耗材量乘以此值。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed label"
 msgid "Bridge Skin Speed"
-msgstr ""
+msgstr "橋樑表層速度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed description"
 msgid "The speed at which bridge skin regions are printed."
-msgstr ""
+msgstr "列印橋樑表層區域時的速度。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow label"
 msgid "Bridge Skin Flow"
-msgstr ""
+msgstr "橋樑表層流量"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow description"
 msgid "When printing bridge skin regions, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "列印橋樑表層區域時，擠出的耗材量乘以此值。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density label"
 msgid "Bridge Skin Density"
-msgstr ""
+msgstr "橋樑表層密度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density description"
 msgid "The density of the bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "橋樑表層的密度。當值小於 100 時會增加表層線條的間隙。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed label"
 msgid "Bridge Fan Speed"
-msgstr ""
+msgstr "橋樑風扇轉速"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed description"
 msgid "Percentage fan speed to use when printing bridge walls and skin."
-msgstr ""
+msgstr "列印橋樑牆壁和表層時，風扇轉速的百分比。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_enable_more_layers label"
 msgid "Bridge Has Multiple Layers"
-msgstr ""
+msgstr "多層橋樑"
 
 #: fdmprinter.def.json
 msgctxt "bridge_enable_more_layers description"
 msgid "If enabled, the second and third layers above the air are printed using the following settings. Otherwise, those layers are printed using the normal settings."
-msgstr ""
+msgstr "假如啟用此功能，橋樑上的第二層和第三層使用下列的設定列印。否則這些層以一般設定列印。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_2 label"
 msgid "Bridge Second Skin Speed"
-msgstr ""
+msgstr "橋樑第二表層速度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_2 description"
 msgid "Print speed to use when printing the second bridge skin layer."
-msgstr ""
+msgstr "列印橋樑表層區域第二層時的速度。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_2 label"
 msgid "Bridge Second Skin Flow"
-msgstr ""
+msgstr "橋樑第二表層流量"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_2 description"
 msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "列印橋樑表層區域第二層時，擠出的耗材量乘以此值。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_2 label"
 msgid "Bridge Second Skin Density"
-msgstr ""
+msgstr "橋樑第二表層密度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_2 description"
 msgid "The density of the second bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "橋樑表層第二層的密度。當值小於 100 時會增加表層線條的間隙。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_2 label"
 msgid "Bridge Second Skin Fan Speed"
-msgstr ""
+msgstr "橋樑第二表層風扇轉速"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_2 description"
 msgid "Percentage fan speed to use when printing the second bridge skin layer."
-msgstr ""
+msgstr "列印橋樑表層第二層時，風扇轉速的百分比。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_3 label"
 msgid "Bridge Third Skin Speed"
-msgstr ""
+msgstr "橋樑第三表層速度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_speed_3 description"
 msgid "Print speed to use when printing the third bridge skin layer."
-msgstr ""
+msgstr "列印橋樑表層區域第三層時的速度。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_3 label"
 msgid "Bridge Third Skin Flow"
-msgstr ""
+msgstr "橋樑第三表層流量"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_material_flow_3 description"
 msgid "When printing the third bridge skin layer, the amount of material extruded is multiplied by this value."
-msgstr ""
+msgstr "列印橋樑表層區域第三層時，擠出的耗材量乘以此值。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_3 label"
 msgid "Bridge Third Skin Density"
-msgstr ""
+msgstr "橋樑第三表層密度"
 
 #: fdmprinter.def.json
 msgctxt "bridge_skin_density_3 description"
 msgid "The density of the third bridge skin layer. Values less than 100 will increase the gaps between the skin lines."
-msgstr ""
+msgstr "橋樑表層第三層的密度。當值小於 100 時會增加表層線條的間隙。"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_3 label"
 msgid "Bridge Third Skin Fan Speed"
-msgstr ""
+msgstr "橋樑第三表層風扇轉速"
 
 #: fdmprinter.def.json
 msgctxt "bridge_fan_speed_3 description"
 msgid "Percentage fan speed to use when printing the third bridge skin layer."
-msgstr ""
+msgstr "列印橋樑表層第三層時，風扇轉速的百分比。"
 
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"

resources/qml/Cura.qml

@@ -225,7 +225,8 @@ UM.MainWindow
                     onObjectRemoved: settingsMenu.removeItem(object)
                 }
 
-                BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: Cura.MachineManager.hasVariantBuildplates }
+                // TODO Temporary hidden, add back again when feature ready
+//                BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: Cura.MachineManager.hasVariantBuildplates }
                 ProfileMenu { title: catalog.i18nc("@title:menu", "&Profile"); }
 
                 MenuSeparator { }

resources/qml/Menus/ProfileMenu.qml

@@ -51,8 +51,7 @@ Menu
         MenuItem
         {
             text: model.name
-            checkable: model.available
+            checkable: true
-            enabled: model.available
             checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name
             exclusiveGroup: group
             onTriggered: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group)

resources/qml/Preferences/GeneralPage.qml

@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.1
 
 import UM 1.1 as UM
+import Cura 1.0 as Cura
 
 UM.PreferencesPage
 {
@@ -97,16 +98,26 @@ UM.PreferencesPage
         UM.Preferences.resetPreference("cura/choice_on_open_project")
         setDefaultOpenProjectOption(UM.Preferences.getValue("cura/choice_on_open_project"))
 
-        if (plugins.find("id", "SliceInfoPlugin") > -1) {
+        if (pluginExistsAndEnabled("SliceInfoPlugin")) {
             UM.Preferences.resetPreference("info/send_slice_info")
             sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
         }
-        if (plugins.find("id", "UpdateChecker") > -1) {
+        if (pluginExistsAndEnabled("UpdateChecker")) {
             UM.Preferences.resetPreference("info/automatic_update_check")
             checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
         }
     }
 
+    function pluginExistsAndEnabled(pluginName)
+    {
+        var pluginItem = plugins.find("id", pluginName)
+        if (pluginItem > -1)
+        {
+            return plugins.getItem(pluginItem).enabled
+        }
+        return false
+    }
+
     ScrollView
     {
         width: parent.width
@@ -366,7 +377,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width;
                 height: childrenRect.height;
                 text: catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?")
@@ -380,7 +392,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Should models on the platform be moved so that they no longer intersect?")
@@ -393,7 +406,8 @@ UM.PreferencesPage
                     onCheckedChanged: UM.Preferences.setValue("physics/automatic_push_free", checked)
                 }
             }
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Should models on the platform be moved down to touch the build plate?")
@@ -426,7 +440,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Should layer be forced into compatibility mode?")
@@ -453,7 +468,8 @@ UM.PreferencesPage
                 text: catalog.i18nc("@label","Opening and saving files")
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip","Should models be scaled to the build volume if they are too large?")
@@ -467,7 +483,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip","An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?")
@@ -481,7 +498,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Should a prefix based on the printer name be added to the print job name automatically?")
@@ -495,7 +513,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Should a summary be shown when saving a project file?")
@@ -508,7 +527,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Default behavior when opening a project file")
@@ -531,7 +551,8 @@ UM.PreferencesPage
                         {
                             id: openProjectOptionModel
 
-                            Component.onCompleted: {
+                            Component.onCompleted:
+                            {
                                 append({ text: catalog.i18nc("@option:openProject", "Always ask"), code: "always_ask" })
                                 append({ text: catalog.i18nc("@option:openProject", "Always open as a project"), code: "open_as_project" })
                                 append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" })
@@ -591,7 +612,8 @@ UM.PreferencesPage
                         {
                             id: discardOrKeepProfileListModel
 
-                            Component.onCompleted: {
+                            Component.onCompleted:
+                            {
                                 append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" })
                                 append({ text: catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"), code: "always_discard" })
                                 append({ text: catalog.i18nc("@option:discardOrKeep", "Keep and never ask again"), code: "always_keep" })
@@ -631,8 +653,9 @@ UM.PreferencesPage
                 text: catalog.i18nc("@label","Privacy")
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
-                visible: plugins.find("id", "UpdateChecker") > -1
+            {
+                visible: pluginExistsAndEnabled("UpdateChecker")
                 width: childrenRect.width
                 height: visible ? childrenRect.height : 0
                 text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?")
@@ -646,8 +669,9 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
-                visible: plugins.find("id", "SliceInfoPlugin") > -1
+            {
+                visible: pluginExistsAndEnabled("SliceInfoPlugin")
                 width: childrenRect.width
                 height: visible ? childrenRect.height : 0
                 text: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
@@ -659,6 +683,17 @@ UM.PreferencesPage
                     checked: boolCheck(UM.Preferences.getValue("info/send_slice_info"))
                     onCheckedChanged: UM.Preferences.setValue("info/send_slice_info", checked)
                 }
+
+                Button
+                {
+                    id: showMoreInfo
+                    anchors.top: sendDataCheckbox.bottom
+                    text: catalog.i18nc("@action:button", "More information")
+                    onClicked:
+                    {
+                        CuraApplication.showMoreInformationDialogForAnonymousDataCollection();
+                    }
+                }
             }
 
             Item
@@ -674,7 +709,8 @@ UM.PreferencesPage
                 text: catalog.i18nc("@label","Experimental")
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip","Use multi build plate functionality")
@@ -688,7 +724,8 @@ UM.PreferencesPage
                 }
             }
 
-            UM.TooltipArea {
+            UM.TooltipArea
+            {
                 width: childrenRect.width
                 height: childrenRect.height
                 text: catalog.i18nc("@info:tooltip", "Should newly loaded models be arranged on the build plate? Used in conjunction with multi build plate (EXPERIMENTAL)")
@@ -702,7 +739,14 @@ UM.PreferencesPage
                 }
             }
 
-
+            Connections
+            {
+                target: UM.Preferences
+                onPreferenceChanged:
+                {
+                    sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
+                }
+            }
         }
     }
 }

resources/qml/Preferences/MaterialView.qml

@@ -92,7 +92,7 @@ TabView
 
                     icon: StandardIcon.Question;
                     title: catalog.i18nc("@title:window", "Confirm Diameter Change")
-                    text: catalog.i18nc("@label (%1 is object name)", "The new material diameter is set to %1 mm, which is not compatible to the current machine. Do you wish to continue?".arg(new_diameter_value))
+                    text: catalog.i18nc("@label (%1 is a number)", "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?".arg(new_diameter_value))
                     standardButtons: StandardButton.Yes | StandardButton.No
                     modality: Qt.ApplicationModal
 

resources/qml/SidebarHeader.qml

@@ -18,6 +18,8 @@ Column
     property bool currentExtruderVisible: extrudersList.visible;
     property bool printerConnected: Cura.MachineManager.printerConnected
     property bool hasManyPrinterTypes: printerConnected ? Cura.MachineManager.printerOutputDevices[0].connectedPrintersTypeCount.length > 1 : false
+    property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable
+    property bool buildplateCompatibilityWarning: Cura.MachineManager.variantBuildplateUsable
 
     spacing: Math.round(UM.Theme.getSize("sidebar_margin").width * 0.9)
 
@@ -382,14 +384,16 @@ Column
             anchors.right: parent.right
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
-            menu: MaterialMenu {
+            menu: MaterialMenu
+            {
                 extruderIndex: base.currentExtruderIndex
             }
 
             property var valueError: !isMaterialSupported()
             property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported
 
-            function isMaterialSupported () {
+            function isMaterialSupported ()
+            {
                 if (!hasActiveExtruder)
                 {
                     return false;
@@ -425,7 +429,8 @@ Column
             color: UM.Theme.getColor("text");
         }
 
-        ToolButton {
+        ToolButton
+        {
             id: variantSelection
             text: Cura.MachineManager.activeVariantName
             tooltip: Cura.MachineManager.activeVariantName;
@@ -441,7 +446,8 @@ Column
         }
     }
 
-    Rectangle {
+    Rectangle
+    {
         id: buildplateSeparator
         anchors.left: parent.left
         anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
@@ -456,7 +462,8 @@ Column
     {
         id: buildplateRow
         height: UM.Theme.getSize("sidebar_setup").height
-        visible: Cura.MachineManager.hasVariantBuildplates && !sidebar.monitoringPrint && !sidebar.hideSettings
+        // TODO Temporary hidden, add back again when feature ready
+        visible: false //Cura.MachineManager.hasVariantBuildplates && !sidebar.monitoringPrint && !sidebar.hideSettings
 
         anchors
         {
@@ -477,7 +484,8 @@ Column
             color: UM.Theme.getColor("text");
         }
 
-        ToolButton {
+        ToolButton
+        {
             id: buildplateSelection
             text: Cura.MachineManager.activeVariantBuildplateName
             tooltip: Cura.MachineManager.activeVariantBuildplateName
@@ -501,7 +509,7 @@ Column
     {
         id: materialInfoRow
         height: Math.round(UM.Theme.getSize("sidebar_setup").height / 2)
-        visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings
+        visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials || Cura.MachineManager.hasVariantBuildplates) && !sidebar.monitoringPrint && !sidebar.hideSettings
 
         anchors
         {
@@ -511,10 +519,26 @@ Column
             rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
-        Item {
+        Label
+        {
+            id: materialCompatibilityLabel
+            y: -Math.round(UM.Theme.getSize("sidebar_margin").height / 3)
+            anchors.left: parent.left
+            width: parent.width - materialCompatibilityLink.width
+            text: catalog.i18nc("@label", "Use adhesion sheet or glue with this material combination")
+            font: UM.Theme.getFont("very_small")
+            color: UM.Theme.getColor("text")
+            visible: buildplateCompatibilityError || buildplateCompatibilityWarning
+            wrapMode: Text.WordWrap
+            opacity: 0.5
+        }
+
+        Item
+        {
+            id: materialCompatibilityLink
             height: UM.Theme.getSize("sidebar_setup").height
             anchors.right: parent.right
-            width: Math.round(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
+            width: childrenRect.width + UM.Theme.getSize("default_margin").width
 
             UM.RecolorImage {
                 id: warningImage
@@ -527,7 +551,7 @@ Column
                 sourceSize.width: width
                 sourceSize.height: height
                 color: UM.Theme.getColor("material_compatibility_warning")
-                visible: !Cura.MachineManager.isCurrentSetupSupported
+                visible: !Cura.MachineManager.isCurrentSetupSupported || buildplateCompatibilityError || buildplateCompatibilityWarning
             }
 
             Label {

resources/qml/Topbar.qml

@@ -201,7 +201,11 @@ Rectangle
             // the connection to UM.ActiveView will trigger update so there is no reason to call it manually here
         }
 
-        onCurrentIndexChanged: viewModeButton.setActiveIndex(model.getItem(currentIndex).id)
+        onCurrentIndexChanged:
+        {
+            if (model.getItem(currentIndex).id != undefined)
+                viewModeButton.setActiveIndex(model.getItem(currentIndex).id)
+        }
         currentIndex: getActiveIndex()
 
         // watch the active view proxy for changes made from the menu item

resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg

@@ -12,6 +12,7 @@ material = generic_cpe
 variant = AA 0.25
 
 [values]
+prime_tower_purge_volume = 1
 prime_tower_size = 12
 prime_tower_wall_thickness = 0.9
 retraction_extrusion_window = 0.5

resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg

@@ -0,0 +1,39 @@
+[general]
+version = 3
+name = Fine
+definition = ultimaker3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = normal
+weight = 0
+material = generic_tough_pla
+variant = AA 0.25
+
+[values]
+brim_width = 8
+cool_fan_full_at_height = =layer_height_0
+cool_min_speed = 7
+infill_line_width = =line_width
+infill_overlap = 10
+infill_pattern = grid
+line_width = =machine_nozzle_size * 0.92
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
+material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
+material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
+material_print_temperature = =default_material_print_temperature - 15
+skin_overlap = 5
+speed_layer_0 = =math.ceil(speed_print * 30 / 30)
+speed_print = 30
+speed_topbottom = =math.ceil(speed_print * 20 / 30)
+speed_travel_layer_0 = 120
+speed_wall = =math.ceil(speed_print * 25 / 30)
+speed_wall_0 = =math.ceil(speed_print * 20 / 30)
+top_bottom_thickness = 0.72
+wall_0_inset = 0.015
+wall_0_wipe_dist = 0.25
+wall_line_width = =line_width
+wall_line_width_x= =line_width
+wall_thickness = 0.7

resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg

@@ -16,6 +16,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = 20

resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg

@@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 speed_print = 60
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 60)

resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg

@@ -19,6 +19,7 @@ material_print_temperature = =default_material_print_temperature - 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 speed_print = 50
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 50)

resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg

@@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
+prime_tower_purge_volume = 1
 speed_print = 55
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)

resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg

@@ -50,7 +50,7 @@ retraction_prime_speed = 15
 skin_overlap = 30
 speed_layer_0 = 25
 speed_print = 50
-speed_topbottom = 25
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)

resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg

@@ -49,7 +49,7 @@ retraction_prime_speed = 15
 skin_overlap = 30
 speed_layer_0 = 25
 speed_print = 50
-speed_topbottom = 25
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)

resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg

@@ -50,7 +50,7 @@ retraction_prime_speed = 15
 skin_overlap = 30
 speed_layer_0 = 25
 speed_print = 50
-speed_topbottom = 25
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)

resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg

@@ -47,7 +47,7 @@ retraction_prime_speed = 15
 skin_overlap = 30
 speed_layer_0 = 25
 speed_print = 50
-speed_topbottom = 25
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)

resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg

@@ -0,0 +1,38 @@
+[general]
+version = 3
+name = Fast
+definition = ultimaker3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = draft
+weight = -2
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+cool_min_speed = 7
+infill_line_width = =round(line_width * 0.45/0.35,2)
+jerk_print = 25
+jerk_roofing = 1
+layer_height_0 = 0.2
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature -10
+material_standby_temperature = 100
+prime_tower_enable = False
+roofing_layer_count = 2
+skin_outline_count = 0
+skin_overlap = 20
+speed_layer_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall * 20 / 24)
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
+speed_wall = =math.ceil(speed_print * 36 / 50)
+speed_wall_0 = =math.ceil(speed_print * 26 / 50)
+top_bottom_thickness = 1.2
+wall_line_width_x = =round(line_width * 0.35/0.35,2)
+wall_thickness = 1.2

resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg

@@ -0,0 +1,32 @@
+[general]
+version = 3
+name = Normal
+definition = ultimaker3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = fast
+weight = -1
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+infill_line_width = =round(line_width * 1.285, 2)
+layer_height_0 = 0.2
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature -10
+material_standby_temperature = 100
+prime_tower_enable = False
+speed_layer_0 = 20
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+top_bottom_thickness = 1.2
+wall_line_width_x = =round(line_width * 0.35/0.35,2)
+wall_thickness = 1.23
+

resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg

@@ -0,0 +1,33 @@
+[general]
+version = 3
+name = Fine
+definition = ultimaker3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = normal
+weight = 0
+material = generic_tough_pla
+variant = AA 0.4
+
+[values]
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+cool_min_speed = 7
+infill_line_width = =round(line_width * 1.285, 2)
+layer_height_0 = 0.2
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature - 15
+material_standby_temperature = 100
+prime_tower_enable = False
+skin_overlap = 10
+speed_layer_0 = 20
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+top_bottom_thickness = 1.2
+wall_thickness = 1.23
+

resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg

@@ -17,6 +17,7 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 15
 material_standby_temperature = 100
 prime_tower_enable = True
+prime_tower_purge_volume = 1
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)