Merge branch 'master' into cr_fix_ironing_settings

Jenkinsfile

@@ -15,13 +15,13 @@ parallel_nodes(['linux && cura', 'windows && cura']) {
             // Perform the "build". Since Uranium is Python code, this basically only ensures CMake is setup.
             stage('Build') {
                 def branch = env.BRANCH_NAME
-                if(!(branch =~ /^2.\d+$/)) {
+                if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) {
                     branch = "master"
                 }
 
                 // Ensure CMake is setup. Note that since this is Python code we do not really "build" it.
                 def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}")
-                cmake("..", "-DCMAKE_PREFIX_PATH=${env.CURA_ENVIRONMENT_PATH}/${branch} -DCMAKE_BUILD_TYPE=Release -DURANIUM_DIR=${uranium_dir}")
+                cmake("..", "-DCMAKE_PREFIX_PATH=\"${env.CURA_ENVIRONMENT_PATH}/${branch}\" -DCMAKE_BUILD_TYPE=Release -DURANIUM_DIR=\"${uranium_dir}\"")
             }
 
             // Try and run the unit tests. If this stage fails, we consider the build to be "unstable".

README.md

@@ -68,3 +68,25 @@ There are two ways of doing it. You can either use the generator [here](http://q
 * If your printer has a heated bed, set visible to true under material_bed_temperature
 
 Once you are done, put the profile you have made into resources/definitions, or in definitions in your cura profile folder.
+
+Translating Cura
+----------------
+If you'd like to contribute a translation of Cura, please first look for [any existing translation](https://github.com/Ultimaker/Cura/tree/master/resources/i18n). If your language is already there in the source code but not in Cura's interface, it may be partially translated.
+
+There are four files that need to be translated for Cura:
+1. https://github.com/Ultimaker/Cura/blob/master/resources/i18n/cura.pot
+2. https://github.com/Ultimaker/Cura/blob/master/resources/i18n/fdmextruder.def.json.pot
+3. https://github.com/Ultimaker/Cura/blob/master/resources/i18n/fdmprinter.def.json.pot (This one is the most work.)
+4. https://github.com/Ultimaker/Uranium/blob/master/resources/i18n/uranium.pot
+
+Copy these files and rename them to `*.po` (remove the `t`). Then create the actual translations by filling in the empty `msgstr` entries. These are gettext files, which are plain text so you can open them with any text editor such as Notepad or GEdit, but it is probably easier with a specialised tool such as [POEdit](https://poedit.net/) or [Virtaal](http://virtaal.translatehouse.org/).
+
+Do not hestiate to ask us about a translation or the meaning of some text via Github Issues.
+
+Once the translation is complete, it's probably best to test them in Cura. Use your favourite software to convert the .po file to a .mo file (such as [GetText](https://www.gnu.org/software/gettext/)). Then put the .mo files in the `.../resources/i18n/<language code>/LC_MESSAGES` folder in your Cura installation. Then find your Cura configuration file (next to the log as described above, except on Linux where it is located in `~/.config/cura`) and change the language preference to the name of the folder you just created. Then start Cura. If working correctly, your Cura should now be translated.
+
+To submit your translation, ideally you would make two pull requests where all `*.po` files are located in that same `<language code>` folder in the resources of both the Cura and Uranium repositories. Put `cura.po`, `fdmprinter.def.json.po` and `fdmextruder.def.json.po` in the Cura repository, and put `uranium.po` in the Uranium repository. Then submit the pull requests to Github. For people with less experience with Git, you can also e-mail the translations to the e-mail address listed at the top of the [cura.pot](https://github.com/Ultimaker/Cura/blob/master/resources/i18n/cura.pot) file as the `Report-Msgid-Bugs-To` entry and we'll make sure it gets checked and included.
+
+After the translation is submitted, the Cura maintainers will check for its completeness and check whether it is consistent. We will take special care to look for common mistakes, such as translating mark-up `<message>` code and such. We are often not fluent in every language, so we expect the translator and the international users to make corrections where necessary. Of course, there will always be some mistakes in every translation.
+
+When the next Cura release comes around, some of the texts will have changed and some new texts will have been added. Around the time when the beta is released we will invoke a string freeze, meaning that no developer is allowed to make changes to the texts. Then we will update the translation template `.pot` files and ask all our translators to update their translations. If you are unable to update the translation in time for the actual release, we will remove the language from the drop-down menu in the Preferences window. The translation stays in Cura however, so that someone might pick it up again later and update it with the newest texts. Also, users who had previously selected the language can still continue Cura in their language but English text will appear among the original text.

cura/BuildVolume.py

@@ -527,6 +527,10 @@ class BuildVolume(SceneNode):
             self._updateExtraZClearance()
             rebuild_me = True
 
+        if setting_key in self._limit_to_extruder_settings:
+            self._updateDisallowedAreas()
+            rebuild_me = True
+
         if rebuild_me:
             self.rebuild()
 
@@ -746,7 +750,12 @@ class BuildVolume(SceneNode):
                 #The build volume is defined as the union of the area that all extruders can reach, so we need to know the relative offset to all extruders.
                 for other_extruder in ExtruderManager.getInstance().getActiveExtruderStacks():
                     other_offset_x = other_extruder.getProperty("machine_nozzle_offset_x", "value")
-                    other_offset_y = -other_extruder.getProperty("machine_nozzle_offset_y", "value")
+                    if other_offset_x is None:
+                        other_offset_x = 0
+                    other_offset_y = other_extruder.getProperty("machine_nozzle_offset_y", "value")
+                    if other_offset_y is None:
+                        other_offset_y = 0
+                    other_offset_y = -other_offset_y
                     left_unreachable_border = min(left_unreachable_border, other_offset_x - offset_x)
                     right_unreachable_border = max(right_unreachable_border, other_offset_x - offset_x)
                     top_unreachable_border = min(top_unreachable_border, other_offset_y - offset_y)
@@ -899,6 +908,7 @@ class BuildVolume(SceneNode):
         if not self._global_container_stack:
             return 0
         container_stack = self._global_container_stack
+        used_extruders = ExtruderManager.getInstance().getUsedExtruderStacks()
 
         # If we are printing one at a time, we need to add the bed adhesion size to the disallowed areas of the objects
         if container_stack.getProperty("print_sequence", "value") == "one_at_a_time":
@@ -909,24 +919,18 @@ class BuildVolume(SceneNode):
             skirt_distance = self._getSettingFromAdhesionExtruder("skirt_gap")
             skirt_line_count = self._getSettingFromAdhesionExtruder("skirt_line_count")
             bed_adhesion_size = skirt_distance + (skirt_line_count * self._getSettingFromAdhesionExtruder("skirt_brim_line_width")) * self._getSettingFromAdhesionExtruder("initial_layer_line_width_factor") / 100.0
-            if len(ExtruderManager.getInstance().getUsedExtruderStacks()) > 1:
-                adhesion_extruder_nr = int(self._global_container_stack.getProperty("adhesion_extruder_nr", "value"))
-                extruder_values = ExtruderManager.getInstance().getAllExtruderValues("skirt_brim_line_width")
-                line_width_factors = ExtruderManager.getInstance().getAllExtruderValues("initial_layer_line_width_factor")
-                del extruder_values[adhesion_extruder_nr]  # Remove the value of the adhesion extruder nr.
-                del line_width_factors[adhesion_extruder_nr]
-                for i in range(min(len(extruder_values), len(line_width_factors))):
-                    bed_adhesion_size += extruder_values[i] * line_width_factors[i] / 100.0
+            if len(used_extruders) > 1:
+                for extruder_stack in used_extruders:
+                    bed_adhesion_size += extruder_stack.getProperty("skirt_brim_line_width", "value") * extruder_stack.getProperty("initial_layer_line_width_factor", "value") / 100.0
+                #We don't create an additional line for the extruder we're printing the skirt with.
+                bed_adhesion_size -= self._getSettingFromAdhesionExtruder("skirt_brim_line_width", "value") * self._getSettingFromAdhesionExtruder("initial_layer_line_width_factor", "value") / 100.0
         elif adhesion_type == "brim":
             bed_adhesion_size = self._getSettingFromAdhesionExtruder("brim_line_count") * self._getSettingFromAdhesionExtruder("skirt_brim_line_width") * self._getSettingFromAdhesionExtruder("initial_layer_line_width_factor") / 100.0
             if self._global_container_stack.getProperty("machine_extruder_count", "value") > 1:
-                adhesion_extruder_nr = int(self._global_container_stack.getProperty("adhesion_extruder_nr", "value"))
-                extruder_values = ExtruderManager.getInstance().getAllExtruderValues("skirt_brim_line_width")
-                line_width_factors = ExtruderManager.getInstance().getAllExtruderValues("initial_layer_line_width_factor")
-                del extruder_values[adhesion_extruder_nr]  # Remove the value of the adhesion extruder nr.
-                del line_width_factors[adhesion_extruder_nr]
-                for i in range(min(len(extruder_values), len(line_width_factors))):
-                    bed_adhesion_size += extruder_values[i] * line_width_factors[i] / 100.0
+                for extruder_stack in used_extruders:
+                    bed_adhesion_size += extruder_stack.getProperty("skirt_brim_line_width", "value") * extruder_stack.getProperty("initial_layer_line_width_factor", "value") / 100.0
+                #We don't create an additional line for the extruder we're printing the brim with.
+                bed_adhesion_size -= self._getSettingFromAdhesionExtruder("skirt_brim_line_width", "value") * self._getSettingFromAdhesionExtruder("initial_layer_line_width_factor", "value") / 100.0
         elif adhesion_type == "raft":
             bed_adhesion_size = self._getSettingFromAdhesionExtruder("raft_margin")
         elif adhesion_type == "none":
@@ -946,7 +950,6 @@ class BuildVolume(SceneNode):
 
         move_from_wall_radius = 0  # Moves that start from outer wall.
         move_from_wall_radius = max(move_from_wall_radius, max(self._getSettingFromAllExtruders("infill_wipe_dist")))
-        used_extruders = ExtruderManager.getInstance().getUsedExtruderStacks()
         avoid_enabled_per_extruder = [stack.getProperty("travel_avoid_other_parts","value") for stack in used_extruders]
         travel_avoid_distance_per_extruder = [stack.getProperty("travel_avoid_distance", "value") for stack in used_extruders]
         for avoid_other_parts_enabled, avoid_distance in zip(avoid_enabled_per_extruder, travel_avoid_distance_per_extruder): #For each extruder (or just global).
@@ -970,3 +973,4 @@ class BuildVolume(SceneNode):
     _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"]
     _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts"]
     _extruder_settings = ["support_enable", "support_bottom_enable", "support_roof_enable", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "brim_line_count", "adhesion_extruder_nr", "adhesion_type"] #Settings that can affect which extruders are used.
+    _limit_to_extruder_settings = ["wall_extruder_nr", "wall_0_extruder_nr", "wall_x_extruder_nr", "top_bottom_extruder_nr", "infill_extruder_nr", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "adhesion_extruder_nr"]

cura/CuraApplication.py

@@ -119,6 +119,12 @@ class CuraApplication(QtApplication):
 
     Q_ENUMS(ResourceTypes)
 
+    # FIXME: This signal belongs to the MachineManager, but the CuraEngineBackend plugin requires on it.
+    #        Because plugins are initialized before the ContainerRegistry, putting this signal in MachineManager
+    #        will make it initialized before ContainerRegistry does, and it won't find the active machine, thus
+    #        Cura will always show the Add Machine Dialog upon start.
+    stacksValidationFinished = pyqtSignal()  # Emitted whenever a validation is finished
+
     def __init__(self):
         # this list of dir names will be used by UM to detect an old cura directory
         for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]:
@@ -276,7 +282,7 @@ class CuraApplication(QtApplication):
 
         preferences.addPreference("cura/categories_expanded", "")
         preferences.addPreference("cura/jobname_prefix", True)
-        preferences.addPreference("view/center_on_select", True)
+        preferences.addPreference("view/center_on_select", False)
         preferences.addPreference("mesh/scale_to_fit", False)
         preferences.addPreference("mesh/scale_tiny_meshes", True)
         preferences.addPreference("cura/dialog_on_project_save", True)
@@ -361,6 +367,12 @@ class CuraApplication(QtApplication):
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
+    ## The "Quit" button click event handler.
+    @pyqtSlot()
+    def closeApplication(self):
+        Logger.log("i", "Close application")
+        self._main_window.close()
+
     ## A reusable dialogbox
     #
     showMessageBox = pyqtSignal(str, str, str, str, int, int, arguments = ["title", "text", "informativeText", "detailedText", "buttons", "icon"])
@@ -806,7 +818,7 @@ class CuraApplication(QtApplication):
 
     @pyqtProperty(str, notify = sceneBoundingBoxChanged)
     def getSceneBoundingBoxString(self):
-        return self._i18n_catalog.i18nc("@info", "%(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()}
+        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 updatePlatformActivity(self, node = None):
         count = 0

cura/PrinterOutputDevice.py

@@ -65,6 +65,11 @@ class PrinterOutputDevice(QObject, OutputDevice):
         self._monitor_view_qml_path = ""
         self._monitor_component = None
         self._monitor_item = None
+
+        self._control_view_qml_path = ""
+        self._control_component = None
+        self._control_item = None
+
         self._qml_context = None
 
     def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None):
@@ -131,6 +136,29 @@ class PrinterOutputDevice(QObject, OutputDevice):
 
         return self._monitor_item
 
+    @pyqtProperty(QObject, constant=True)
+    def controlItem(self):
+        if not self._control_component:
+            self._createControlViewFromQML()
+
+        return self._control_item
+
+    def _createControlViewFromQML(self):
+        path = QUrl.fromLocalFile(self._control_view_qml_path)
+
+        # Because of garbage collection we need to keep this referenced by python.
+        self._control_component = QQmlComponent(Application.getInstance()._engine, path)
+
+        # Check if the context was already requested before (Printer output device might have multiple items in the future)
+        if self._qml_context is None:
+            self._qml_context = QQmlContext(Application.getInstance()._engine.rootContext())
+            self._qml_context.setContextProperty("OutputDevice", self)
+
+        self._control_item = self._control_component.create(self._qml_context)
+        if self._control_item is None:
+            Logger.log("e", "QQmlComponent status %s", self._control_component.status())
+            Logger.log("e", "QQmlComponent error string %s", self._control_component.errorString())
+
     def _createMonitorViewFromQML(self):
         path = QUrl.fromLocalFile(self._monitor_view_qml_path)
 

cura/Settings/CuraContainerRegistry.py

@@ -282,7 +282,7 @@ class CuraContainerRegistry(ContainerRegistry):
             profile.setDefinition(self._activeQualityDefinition())
             if self._machineHasOwnMaterials():
                 active_material_id = self._activeMaterialId()
-                if active_material_id:  # only update if there is an active material
+                if active_material_id and active_material_id != "empty":  # only update if there is an active material
                     profile.addMetaDataEntry("material", active_material_id)
                     quality_type_criteria["material"] = active_material_id
 

cura/Settings/CuraStackBuilder.py

@@ -76,6 +76,8 @@ class CuraStackBuilder:
         stack.setName(definition.getName())
         stack.setDefinition(definition)
         stack.addMetaDataEntry("position", definition.getMetaDataEntry("position"))
+        if "next_stack" in kwargs: #Add stacks before containers are added, since they may trigger a setting update.
+            stack.setNextStack(kwargs["next_stack"])
 
         user_container = InstanceContainer(new_stack_id + "_user")
         user_container.addMetaDataEntry("type", "user")
@@ -86,13 +88,12 @@ class CuraStackBuilder:
 
         stack.setUserChanges(user_container)
 
-        if "next_stack" in kwargs:
-            stack.setNextStack(kwargs["next_stack"])
-
         # Important! The order here matters, because that allows the stack to
         # assume the material and variant have already been set.
         if "definition_changes" in kwargs:
             stack.setDefinitionChangesById(kwargs["definition_changes"])
+        else:
+            stack.setDefinitionChanges(cls.createDefinitionChangesContainer(stack, new_stack_id + "_settings"))
 
         if "variant" in kwargs:
             stack.setVariantById(kwargs["variant"])
@@ -140,6 +141,8 @@ class CuraStackBuilder:
         # assume the material and variant have already been set.
         if "definition_changes" in kwargs:
             stack.setDefinitionChangesById(kwargs["definition_changes"])
+        else:
+            stack.setDefinitionChanges(cls.createDefinitionChangesContainer(stack, new_stack_id + "_settings"))
 
         if "variant" in kwargs:
             stack.setVariantById(kwargs["variant"])
@@ -158,3 +161,20 @@ class CuraStackBuilder:
         registry.addContainer(user_container)
 
         return stack
+
+    @classmethod
+    def createDefinitionChangesContainer(cls, container_stack, container_name, container_index = None):
+        from cura.CuraApplication import CuraApplication
+
+        unique_container_name = ContainerRegistry.getInstance().uniqueName(container_name)
+
+        definition_changes_container = InstanceContainer(unique_container_name)
+        definition = container_stack.getBottom()
+        definition_changes_container.setDefinition(definition)
+        definition_changes_container.addMetaDataEntry("type", "definition_changes")
+        definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
+
+        ContainerRegistry.getInstance().addContainer(definition_changes_container)
+        container_stack.definitionChanges = definition_changes_container
+
+        return definition_changes_container

cura/Settings/ExtruderManager.py

@@ -434,19 +434,40 @@ class ExtruderManager(QObject):
                 extruder_stack_id = self.extruderIds["0"]
             used_extruder_stack_ids.add(extruder_stack_id)
 
-            #Get whether any of them use support.
-            per_mesh_stack = mesh.callDecoration("getStack")
-            if per_mesh_stack:
-                support_enabled |= per_mesh_stack.getProperty("support_enable", "value")
-                support_bottom_enabled |= per_mesh_stack.getProperty("support_bottom_enable", "value")
-                support_roof_enabled |= per_mesh_stack.getProperty("support_roof_enable", "value")
-            else: #Take the setting from the build extruder stack.
-                extruder_stack = container_registry.findContainerStacks(id = extruder_stack_id)[0]
-                support_enabled |= extruder_stack.getProperty("support_enable", "value")
-                support_bottom_enabled |= extruder_stack.getProperty("support_bottom_enable", "value")
-                support_roof_enabled |= extruder_stack.getProperty("support_roof_enable", "value")
+            # Get whether any of them use support.
+            stack_to_use = mesh.callDecoration("getStack")  # if there is a per-mesh stack, we use it
+            if not stack_to_use:
+                # if there is no per-mesh stack, we use the build extruder for this mesh
+                stack_to_use = container_registry.findContainerStacks(id = extruder_stack_id)[0]
 
-        #The support extruders.
+            support_enabled |= stack_to_use.getProperty("support_enable", "value")
+            support_bottom_enabled |= stack_to_use.getProperty("support_bottom_enable", "value")
+            support_roof_enabled |= stack_to_use.getProperty("support_roof_enable", "value")
+
+            # Check limit to extruders
+            limit_to_extruder_feature_list = ["wall_extruder_nr",
+                                              "wall_0_extruder_nr",
+                                              "wall_x_extruder_nr",
+                                              "roofing_extruder_nr",
+                                              "top_bottom_extruder_nr",
+                                              "infill_extruder_nr",
+                                              ]
+            wall_extruder_nr = None
+            for extruder_nr_feature_name in limit_to_extruder_feature_list:
+                extruder_nr = int(global_stack.getProperty(extruder_nr_feature_name, "value"))
+                if extruder_nr == -1:
+                    # outer and inner wall extruder numbers should first inherit from the wall extruder number
+                    if extruder_nr_feature_name in ["wall_0_extruder_nr", "wall_x_extruder_nr"]:
+                        extruder_nr = wall_extruder_nr
+                    else:
+                        extruder_nr = 0
+
+                used_extruder_stack_ids.add(self.extruderIds[str(extruder_nr)])
+
+                if extruder_nr_feature_name == "wall_extruder_nr":
+                    wall_extruder_nr = extruder_nr
+
+        # Check support extruders
         if support_enabled:
             used_extruder_stack_ids.add(self.extruderIds[str(global_stack.getProperty("support_infill_extruder_nr", "value"))])
             used_extruder_stack_ids.add(self.extruderIds[str(global_stack.getProperty("support_extruder_nr_layer_0", "value"))])

cura/Settings/ExtruderStack.py

@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 #
 #
 class ExtruderStack(CuraContainerStack):
-    def __init__(self, container_id, *args, **kwargs):
+    def __init__(self, container_id: str, *args, **kwargs):
         super().__init__(container_id, *args, **kwargs)
 
         self.addMetaDataEntry("type", "extruder_train") # For backward compatibility
@@ -91,6 +91,8 @@ class ExtruderStack(CuraContainerStack):
         # When there is a setting that is not settable per extruder that depends on a value from a setting that is,
         # we do not always get properly informed that we should re-evaluate the setting. So make sure to indicate
         # something changed for those settings.
+        if not self.getNextStack():
+            return #There are no global settings to depend on.
         definitions = self.getNextStack().definition.findDefinitions(key = key)
         if definitions:
             has_global_dependencies = False

cura/Settings/MachineManager.py

@@ -91,6 +91,8 @@ class MachineManager(QObject):
 
         self._printer_output_devices = []
         Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged)
+        # There might already be some output devices by the time the signal is connected
+        self._onOutputDevicesChanged()
 
         if active_machine_id != "" and ContainerRegistry.getInstance().findContainerStacks(id = active_machine_id):
             # An active machine was saved, so restore it.
@@ -305,6 +307,7 @@ class MachineManager(QObject):
         self._stacks_have_errors = self._checkStacksHaveErrors()
         if old_stacks_have_errors != self._stacks_have_errors:
             self.stacksValidationChanged.emit()
+        Application.getInstance().stacksValidationFinished.emit()
 
     def _onActiveExtruderStackChanged(self):
         self.blurSettings.emit()  # Ensure no-one has focus.

cura/Settings/SettingOverrideDecorator.py

@@ -26,8 +26,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
         super().__init__()
         self._stack = ContainerStack(stack_id = id(self))
         self._stack.setDirty(False)  # This stack does not need to be saved.
-        self._instance = InstanceContainer(container_id = "SettingOverrideInstanceContainer")
-        self._stack.addContainer(self._instance)
+        self._stack.addContainer(InstanceContainer(container_id = "SettingOverrideInstanceContainer"))
 
         if ExtruderManager.getInstance().extruderCount > 1:
             self._extruder_stack = ExtruderManager.getInstance().getExtruderStack(0).getId()
@@ -46,13 +45,14 @@ class SettingOverrideDecorator(SceneNodeDecorator):
         ## Create a fresh decorator object
         deep_copy = SettingOverrideDecorator()
         ## Copy the instance
-        deep_copy._instance = copy.deepcopy(self._instance, memo)
+        instance_container = copy.deepcopy(self._stack.getContainer(0), memo)
+
+        ## Set the copied instance as the first (and only) instance container of the stack.
+        deep_copy._stack.replaceContainer(0, instance_container)
 
         # Properly set the right extruder on the copy
         deep_copy.setActiveExtruder(self._extruder_stack)
 
-        ## Set the copied instance as the first (and only) instance container of the stack.
-        deep_copy._stack.replaceContainer(0, deep_copy._instance)
         return deep_copy
 
     ##  Gets the currently active extruder to print this object with.

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -56,6 +56,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
         self._id_mapping = {}
 
+        # In Cura 2.5 and 2.6, the empty profiles used to have those long names
+        self._old_empty_profile_id_dict = {"empty_%s" % k: "empty" for k in ["material", "variant"]}
+
     ##  Get a unique name based on the old_id. This is different from directly calling the registry in that it caches results.
     #   This has nothing to do with speed, but with getting consistent new naming for instances & objects.
     def getNewId(self, old_id):
@@ -129,6 +132,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         instance_container_list = []
         material_container_list = []
 
+        resolve_strategy_keys = ["machine", "material", "quality_changes"]
+        self._resolve_strategies = {k: None for k in resolve_strategy_keys}
+        containers_found_dict = {k: False for k in resolve_strategy_keys}
+
         #
         # Read definition containers
         #
@@ -176,8 +183,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 container_id = self._stripFileToId(material_container_file)
                 materials = self._container_registry.findInstanceContainers(id=container_id)
                 material_labels.append(self._getMaterialLabelFromSerialized(archive.open(material_container_file).read().decode("utf-8")))
-                if materials and not materials[0].isReadOnly():  # Only non readonly materials can be in conflict
-                    material_conflict = True
+                if materials:
+                    containers_found_dict["material"] = True
+                    if not materials[0].isReadOnly():  # Only non readonly materials can be in conflict
+                        material_conflict = True
                 Job.yieldThread()
 
         # Check if any quality_changes instance container is in conflict.
@@ -205,6 +214,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 # Check if quality changes already exists.
                 quality_changes = self._container_registry.findInstanceContainers(id = container_id)
                 if quality_changes:
+                    containers_found_dict["quality_changes"] = True
                     # Check if there really is a conflict by comparing the values
                     if quality_changes[0] != instance_container:
                         quality_changes_conflict = True
@@ -227,21 +237,61 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         # Load ContainerStack files and ExtruderStack files
         global_stack_file, extruder_stack_files = self._determineGlobalAndExtruderStackFiles(
             file_name, cura_file_names)
-        self._resolve_strategies = {"machine": None, "quality_changes": None, "material": None}
         machine_conflict = False
-        for container_stack_file in [global_stack_file] + extruder_stack_files:
-            container_id = self._stripFileToId(container_stack_file)
-            serialized = archive.open(container_stack_file).read().decode("utf-8")
-            if machine_name == "":
-                machine_name = self._getMachineNameFromSerializedStack(serialized)
-            stacks = self._container_registry.findContainerStacks(id = container_id)
-            if stacks:
-                # Check if there are any changes at all in any of the container stacks.
+        # Because there can be cases as follows:
+        #  - the global stack exists but some/all of the extruder stacks DON'T exist
+        #  - the global stack DOESN'T exist but some/all of the extruder stacks exist
+        # To simplify this, only check if the global stack exists or not
+        container_id = self._stripFileToId(global_stack_file)
+        serialized = archive.open(global_stack_file).read().decode("utf-8")
+        machine_name = self._getMachineNameFromSerializedStack(serialized)
+        stacks = self._container_registry.findContainerStacks(id = container_id)
+        if stacks:
+            global_stack = stacks[0]
+            containers_found_dict["machine"] = True
+            # Check if there are any changes at all in any of the container stacks.
+            id_list = self._getContainerIdListFromSerialized(serialized)
+            for index, container_id in enumerate(id_list):
+                # take into account the old empty container IDs
+                container_id = self._old_empty_profile_id_dict.get(container_id, container_id)
+                if global_stack.getContainer(index).getId() != container_id:
+                    machine_conflict = True
+                    break
+        Job.yieldThread()
+
+        # if the global stack is found, we check if there are conflicts in the extruder stacks
+        if containers_found_dict["machine"] and not machine_conflict:
+            for extruder_stack_file in extruder_stack_files:
+                container_id = self._stripFileToId(extruder_stack_file)
+                serialized = archive.open(extruder_stack_file).read().decode("utf-8")
+                parser = configparser.ConfigParser()
+                parser.read_string(serialized)
+
+                # The check should be done for the extruder stack that's associated with the existing global stack,
+                # and those extruder stacks may have different IDs.
+                # So we check according to the positions
+
+                position = str(parser["metadata"]["position"])
+                if position not in global_stack.extruders:
+                    # The extruder position defined in the project doesn't exist in this global stack.
+                    # We can say that it is a machine conflict, but it is very hard to override the machine in this
+                    # case because we need to override the existing extruders and add the non-existing extruders.
+                    #
+                    # HACK:
+                    # To make this simple, we simply say that there is no machine conflict and create a new machine
+                    # by default.
+                    machine_conflict = False
+                    break
+
+                existing_extruder_stack = global_stack.extruders[position]
+                # check if there are any changes at all in any of the container stacks.
                 id_list = self._getContainerIdListFromSerialized(serialized)
                 for index, container_id in enumerate(id_list):
-                    if stacks[0].getContainer(index).getId() != container_id:
+                    # take into account the old empty container IDs
+                    container_id = self._old_empty_profile_id_dict.get(container_id, container_id)
+                    if existing_extruder_stack.getContainer(index).getId() != container_id:
                         machine_conflict = True
-            Job.yieldThread()
+                        break
 
         num_visible_settings = 0
         try:
@@ -301,13 +351,14 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         #  - new:       create a new container
         #  - override:  override the existing container
         #  - None:      There is no conflict, which means containers with the same IDs may or may not be there already.
-        #               If they are there, there is no conflict between the them.
-        #               In this case, you can either create a new one, or safely override the existing one.
+        #               If there is an existing container, there is no conflict between the them, and default to "override"
+        #               If there is no existing container, default to "new"
         #
         # Default values
-        for k, v in self._resolve_strategies.items():
-            if v is None:
-                self._resolve_strategies[k] = "new"
+        for key, strategy in self._resolve_strategies.items():
+            if key not in containers_found_dict or strategy is not None:
+                continue
+            self._resolve_strategies[key] = "override" if containers_found_dict[key] else "new"
 
         return WorkspaceReader.PreReadResult.accepted
 
@@ -571,47 +622,43 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         # --
         # load global stack file
         try:
-            # Check if a stack by this ID already exists;
-            container_stacks = self._container_registry.findContainerStacks(id = global_stack_id_original)
-            if container_stacks:
+            if self._resolve_strategies["machine"] == "override":
+                container_stacks = self._container_registry.findContainerStacks(id = global_stack_id_original)
                 stack = container_stacks[0]
 
-                if self._resolve_strategies["machine"] == "override":
-                    # TODO: HACK
-                    # There is a machine, check if it has authentication data. If so, keep that data.
-                    network_authentication_id = container_stacks[0].getMetaDataEntry("network_authentication_id")
-                    network_authentication_key = container_stacks[0].getMetaDataEntry("network_authentication_key")
-                    container_stacks[0].deserialize(archive.open(global_stack_file).read().decode("utf-8"))
-                    if network_authentication_id:
-                        container_stacks[0].addMetaDataEntry("network_authentication_id", network_authentication_id)
-                    if network_authentication_key:
-                        container_stacks[0].addMetaDataEntry("network_authentication_key", network_authentication_key)
-                elif self._resolve_strategies["machine"] == "new":
-                    stack = GlobalStack(global_stack_id_new)
-                    stack.deserialize(archive.open(global_stack_file).read().decode("utf-8"))
+                # HACK
+                # There is a machine, check if it has authentication data. If so, keep that data.
+                network_authentication_id = container_stacks[0].getMetaDataEntry("network_authentication_id")
+                network_authentication_key = container_stacks[0].getMetaDataEntry("network_authentication_key")
+                container_stacks[0].deserialize(archive.open(global_stack_file).read().decode("utf-8"))
+                if network_authentication_id:
+                    container_stacks[0].addMetaDataEntry("network_authentication_id", network_authentication_id)
+                if network_authentication_key:
+                    container_stacks[0].addMetaDataEntry("network_authentication_key", network_authentication_key)
 
-                    # Ensure a unique ID and name
-                    stack._id = global_stack_id_new
-
-                    # Extruder stacks are "bound" to a machine. If we add the machine as a new one, the id of the
-                    # bound machine also needs to change.
-                    if stack.getMetaDataEntry("machine", None):
-                        stack.setMetaDataEntry("machine", global_stack_id_new)
-
-                    # Only machines need a new name, stacks may be non-unique
-                    stack.setName(self._container_registry.uniqueName(stack.getName()))
-                    container_stacks_added.append(stack)
-                    self._container_registry.addContainer(stack)
-                else:
-                    Logger.log("w", "Resolve strategy of %s for machine is not supported", self._resolve_strategies["machine"])
-            else:
-                # no existing container stack, so we create a new one
+            elif self._resolve_strategies["machine"] == "new":
+                # create a new global stack
                 stack = GlobalStack(global_stack_id_new)
                 # Deserialize stack by converting read data from bytes to string
                 stack.deserialize(archive.open(global_stack_file).read().decode("utf-8"))
+
+                # Ensure a unique ID and name
+                stack._id = global_stack_id_new
+
+                # Extruder stacks are "bound" to a machine. If we add the machine as a new one, the id of the
+                # bound machine also needs to change.
+                if stack.getMetaDataEntry("machine", None):
+                    stack.setMetaDataEntry("machine", global_stack_id_new)
+
+                # Only machines need a new name, stacks may be non-unique
+                stack.setName(global_stack_id_new)
+
                 container_stacks_added.append(stack)
                 self._container_registry.addContainer(stack)
                 containers_added.append(stack)
+            else:
+                Logger.log("e", "Resolve strategy of %s for machine is not supported",
+                           self._resolve_strategies["machine"])
 
             global_stack = stack
             Job.yieldThread()
@@ -625,73 +672,40 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         # --
         # load extruder stack files
         try:
-            for index, extruder_stack_file in enumerate(extruder_stack_files):
+            for extruder_stack_file in extruder_stack_files:
                 container_id = self._stripFileToId(extruder_stack_file)
                 extruder_file_content = archive.open(extruder_stack_file, "r").read().decode("utf-8")
 
-                container_stacks = self._container_registry.findContainerStacks(id = container_id)
-                if container_stacks:
-                    # this container stack already exists, try to resolve
-                    stack = container_stacks[0]
+                if self._resolve_strategies["machine"] == "override":
+                    # deserialize new extruder stack over the current ones
+                    stack = self._overrideExtruderStack(global_stack, extruder_file_content)
 
-                    if self._resolve_strategies["machine"] == "override":
-                        # NOTE: This is the same code as those in the lower part
-                        # deserialize new extruder stack over the current ones
-                        stack = self._overrideExtruderStack(global_stack, extruder_file_content)
+                elif self._resolve_strategies["machine"] == "new":
+                    new_id = extruder_stack_id_map[container_id]
+                    stack = ExtruderStack(new_id)
 
-                    elif self._resolve_strategies["machine"] == "new":
-                        # create a new extruder stack from this one
-                        new_id = extruder_stack_id_map[container_id]
-                        stack = ExtruderStack(new_id)
+                    # HACK: the global stack can have a new name, so we need to make sure that this extruder stack
+                    #       references to the new name instead of the old one. Normally, this can be done after
+                    #       deserialize() by setting the metadata, but in the case of ExtruderStack, deserialize()
+                    #       also does addExtruder() to its machine stack, so we have to make sure that it's pointing
+                    #       to the right machine BEFORE deserialization.
+                    extruder_config = configparser.ConfigParser()
+                    extruder_config.read_string(extruder_file_content)
+                    extruder_config.set("metadata", "machine", global_stack_id_new)
+                    tmp_string_io = io.StringIO()
+                    extruder_config.write(tmp_string_io)
+                    extruder_file_content = tmp_string_io.getvalue()
 
-                        # HACK: the global stack can have a new name, so we need to make sure that this extruder stack
-                        #       references to the new name instead of the old one. Normally, this can be done after
-                        #       deserialize() by setting the metadata, but in the case of ExtruderStack, deserialize()
-                        #       also does addExtruder() to its machine stack, so we have to make sure that it's pointing
-                        #       to the right machine BEFORE deserialization.
-                        extruder_config = configparser.ConfigParser()
-                        extruder_config.read_string(extruder_file_content)
-                        extruder_config.set("metadata", "machine", global_stack_id_new)
-                        tmp_string_io = io.StringIO()
-                        extruder_config.write(tmp_string_io)
-                        extruder_file_content = tmp_string_io.getvalue()
+                    stack.deserialize(extruder_file_content)
 
-                        stack.deserialize(extruder_file_content)
+                    # Ensure a unique ID and name
+                    stack._id = new_id
 
-                        # Ensure a unique ID and name
-                        stack._id = new_id
-
-                        self._container_registry.addContainer(stack)
-                        extruder_stacks_added.append(stack)
-                        containers_added.append(stack)
+                    self._container_registry.addContainer(stack)
+                    extruder_stacks_added.append(stack)
+                    containers_added.append(stack)
                 else:
-                    # No extruder stack with the same ID can be found
-                    if self._resolve_strategies["machine"] == "override":
-                        # deserialize new extruder stack over the current ones
-                        stack = self._overrideExtruderStack(global_stack, extruder_file_content)
-
-                    elif self._resolve_strategies["machine"] == "new":
-                        # container not found, create a new one
-                        stack = ExtruderStack(container_id)
-
-                        # HACK: the global stack can have a new name, so we need to make sure that this extruder stack
-                        #       references to the new name instead of the old one. Normally, this can be done after
-                        #       deserialize() by setting the metadata, but in the case of ExtruderStack, deserialize()
-                        #       also does addExtruder() to its machine stack, so we have to make sure that it's pointing
-                        #       to the right machine BEFORE deserialization.
-                        extruder_config = configparser.ConfigParser()
-                        extruder_config.read_string(extruder_file_content)
-                        extruder_config.set("metadata", "machine", global_stack_id_new)
-                        tmp_string_io = io.StringIO()
-                        extruder_config.write(tmp_string_io)
-                        extruder_file_content = tmp_string_io.getvalue()
-
-                        stack.deserialize(extruder_file_content)
-                        self._container_registry.addContainer(stack)
-                        extruder_stacks_added.append(stack)
-                        containers_added.append(stack)
-                    else:
-                        Logger.log("w", "Unknown resolve strategy: %s" % str(self._resolve_strategies["machine"]))
+                    Logger.log("w", "Unknown resolve strategy: %s", self._resolve_strategies["machine"])
 
                 extruder_stacks.append(stack)
         except:
@@ -849,6 +863,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
             container_list = container_string.split(",")
             container_ids = [container_id for container_id in container_list if container_id != ""]
 
+        # HACK: there used to be 6 containers numbering from 0 to 5 in a stack,
+        #       now we have 7: index 5 becomes "definition_changes"
+        if len(container_ids) == 6:
+            # Hack; We used to not save the definition changes. Fix this.
+            container_ids.insert(5, "empty")
+
         return container_ids
 
     def _getMachineNameFromSerializedStack(self, serialized):
@@ -861,5 +881,3 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         metadata = data.iterfind("./um:metadata/um:name/um:label", {"um": "http://www.ultimaker.com/material"})
         for entry in metadata:
             return entry.text
-        pass
-

plugins/3MFReader/WorkspaceDialog.qml

@@ -87,18 +87,18 @@ UM.Dialog
                 {
                     text: catalog.i18nc("@action:label", "Printer settings")
                     font.bold: true
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Item
                 {
                     // spacer
                     height: spacerHeight
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 UM.TooltipArea
                 {
                     id: machineResolveTooltip
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                     height: visible ? comboboxHeight : 0
                     visible: manager.machineConflict
                     text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
@@ -122,12 +122,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Type")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: manager.machineType
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
 
@@ -138,12 +138,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Name")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: manager.machineName
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
 
@@ -160,18 +160,18 @@ UM.Dialog
                 {
                     text: catalog.i18nc("@action:label", "Profile settings")
                     font.bold: true
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Item
                 {
                     // spacer
                     height: spacerHeight
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 UM.TooltipArea
                 {
                     id: qualityChangesResolveTooltip
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                     height: visible ? comboboxHeight : 0
                     visible: manager.qualityChangesConflict
                     text: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?")
@@ -195,12 +195,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Name")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: manager.qualityName
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
             Row
@@ -210,12 +210,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Not in profile")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.numUserSettings).arg(manager.numUserSettings)
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 visible: manager.numUserSettings != 0
             }
@@ -226,12 +226,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Derivative from")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: catalog.i18ncp("@action:label", "%1, %2 override", "%1, %2 overrides", manager.numSettingsOverridenByQualityChanges).arg(manager.qualityType).arg(manager.numSettingsOverridenByQualityChanges)
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 visible: manager.numSettingsOverridenByQualityChanges != 0
             }
@@ -248,18 +248,18 @@ UM.Dialog
                 {
                     text: catalog.i18nc("@action:label", "Material settings")
                     font.bold: true
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Item
                 {
                     // spacer
                     height: spacerHeight
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 UM.TooltipArea
                 {
                     id: materialResolveTooltip
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                     height: visible ? comboboxHeight : 0
                     visible: manager.materialConflict
                     text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
@@ -287,12 +287,12 @@ UM.Dialog
                     Label
                     {
                         text: catalog.i18nc("@action:label", "Name")
-                        width: parent.width / 3
+                        width: (parent.width / 3) | 0
                     }
                     Label
                     {
                         text: modelData
-                        width: parent.width / 3
+                        width: (parent.width / 3) | 0
                     }
                 }
             }
@@ -315,12 +315,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Mode")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: manager.activeMode
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
             Row
@@ -330,12 +330,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Visible settings:")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: catalog.i18nc("@action:label", "%1 out of %2" ).arg(manager.numVisibleSettings).arg(manager.totalNumberOfSettings)
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
             Item // Spacer

plugins/3MFWriter/ThreeMFWorkspaceWriter.py

@@ -69,7 +69,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
     #   \param archive The archive to write to.
     @staticmethod
     def _writeContainerToArchive(container, archive):
-        if type(container) == type(ContainerRegistry.getInstance().getEmptyInstanceContainer()):
+        if isinstance(container, type(ContainerRegistry.getInstance().getEmptyInstanceContainer())):
             return  # Empty file, do nothing.
 
         file_suffix = ContainerRegistry.getMimeTypeForContainer(type(container)).preferredSuffix
@@ -87,14 +87,9 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
         file_in_archive = zipfile.ZipInfo(file_name)
         # For some reason we have to set the compress type of each file as well (it doesn't keep the type of the entire archive)
         file_in_archive.compress_type = zipfile.ZIP_DEFLATED
-        if type(container) == ContainerStack and (container.getMetaDataEntry("network_authentication_id") or container.getMetaDataEntry("network_authentication_key")):
-            # TODO: Hack
-            # Create a shallow copy of the container, so we can filter out the network auth (if any)
-            container_copy = copy.deepcopy(container)
-            container_copy.removeMetaDataEntry("network_authentication_id")
-            container_copy.removeMetaDataEntry("network_authentication_key")
-            serialized_data = container_copy.serialize()
-        else:
-            serialized_data = container.serialize()
+
+        # Do not include the network authentication keys
+        ignore_keys = ["network_authentication_id", "network_authentication_key"]
+        serialized_data = container.serialize(ignored_metadata_keys = ignore_keys)
 
         archive.writestr(file_in_archive, serialized_data)

plugins/ChangeLogPlugin/ChangeLog.qml

@@ -11,8 +11,8 @@ import UM 1.1 as UM
 UM.Dialog
 {
     id: base
-    minimumWidth: UM.Theme.getSize("modal_window_minimum").width * 0.75
-    minimumHeight: UM.Theme.getSize("modal_window_minimum").height * 0.75
+    minimumWidth: (UM.Theme.getSize("modal_window_minimum").width * 0.75) | 0
+    minimumHeight: (UM.Theme.getSize("modal_window_minimum").height * 0.75) | 0
     width: minimumWidth
     height: minimumHeight
     title: catalog.i18nc("@label", "Changelog")

plugins/ChangeLogPlugin/ChangeLog.txt

@@ -1,3 +1,83 @@
+[2.7.0]
+*Top surface skin
+Specify print settings of the top-most layers separately in order to improve print duration and achieve higher quality top surfaces.
+
+*Print thin walls
+An experimental function that enables features to be printed up to two times smaller than the nozzle size.
+
+*Ironing (a.k.a. Neosanding)
+An experimental function that enables the heated nozzle to travel over printed top layers without extrusion to create a smooth finish. Made after an idea by Neotko.
+
+*Gradual support infill
+Supports will print faster and with less material while improving overhang quality.
+
+*Support infill layer thickness
+Users are able to configure “Support infill layer thickness” for thicker support layers.
+
+*Relative Z seam
+A function that positions the Z seam relative to the bounding box of the model, so that the seam stays at the same location no matter what the position of the object is.
+
+*Prime tower purge
+In order to prevent under extrusion when printing a prime tower, and to prevent a prime tower failing half way through a job, a feature has been added to wipe off oozed/purged material in the middle of a hollow prime tower before starting to print the next layer of it. The amount of material to purge can be specified in the “Prime Tower Purge Volume” setting.
+
+*First layer line width
+A multiplier setting for the line width of the first layer of a print. Multiplying line width gives fewer lines but with greater width, which improves build plate adhesion.
+
+*Pause standby and resume temperature
+Turn off the nozzle when printing with extended pauses to prevent burned filament and nozzle clogging. At the end of a pause, the nozzle will reach printing temperature before resuming a print.
+
+*Extruder per feature
+Assign specific print features (walls, infill, skin, etc.) to a specific nozzle. A possible application of this would be to print an outer shell of an object with a fine nozzle at a greater level of detail while using a larger second nozzle to print infill faster.
+
+*Dark theme
+A dark theme for Cura. Select this theme to reduce eyestrain when working in dark environments. Activate it by selecting “Preferences > Themes > Dark".
+
+*Top navigation bar redesign
+The top bar user interface been improved so that “Prepare” and “Print” have moved from the right side of the interface to the left side.
+
+*New keyboard shortcuts
+Models can now be manipulated on the build plate using hotkeys Q, A, Z, W, and tab keys. Q selects “move”, A selects “scale”, Z selects “rotate”, and W selects “mirror”. Use the tab key to navigate between interfaces.
+
+*Plugin browser
+Easily download and install plugins using an integrated plugin browser. Go to “Extensions > Plugin Browser > Browse plugins” to select it.
+
+*Import SolidWorks files as STL
+A new plugin that enables SolidWorks compatible .SLDPRT files to be imported directly into Cura, where they are automatically converted to .STL format. This plugin can be found in the plugin browser.
+
+*Zoom towards mouse cursor position
+Cura preferences now include an option to zoom towards the cursor position on screen.
+
+*Increased scroll speed in setting lists
+The scroll speed in the setting lists is now three times faster than previous versions.
+
+*Extra tooltips
+Extra tooltips have been added to clarify the machine settings.
+
+*Polish now supported
+Polish language support added. This can be selected in the preferences menu.
+
+*Bug fixes
+- Cura project Mac extensions
+- Crashes when adding printers
+- Jerk fixes
+- Z-hop over-extrusion
+
+
+*3rd party printers
+- Peopoly Moai
+- DiscoEasy200
+- Cartesio
+- EasyArt Ares
+- 3Dator
+- Rigid3D
+- Type A Series 1
+- HelloBEEPrusa
+
+[2.6.2]
+
+*Bug fixes
+- Fixed an issue with Cura crashing on older versions of MacOS.
+
 [2.6.1]
 *New profiles
 The Polypropylene material is added and supported with the Ultimaker 3. Support for CPE+ and PC with 0.8mm nozzles is added as well.

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -76,14 +76,23 @@ class CuraEngineBackend(QObject, Backend):
         self._scene = Application.getInstance().getController().getScene()
         self._scene.sceneChanged.connect(self._onSceneChanged)
 
-        # Triggers for when to (re)start slicing:
+        # Triggers for auto-slicing. Auto-slicing is triggered as follows:
+        #  - auto-slicing is started with a timer
+        #  - whenever there is a value change, we start the timer
+        #  - sometimes an error check can get scheduled for a value change, in that case, we ONLY want to start the
+        #    auto-slicing timer when that error check is finished
+        #  If there is an error check, it will set the "_is_error_check_scheduled" flag, stop the auto-slicing timer,
+        #  and only wait for the error check to be finished to start the auto-slicing timer again.
+        #
         self._global_container_stack = None
         Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
         self._onGlobalStackChanged()
 
-        self._active_extruder_stack = None
-        ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged)
-        self._onActiveExtruderChanged()
+        Application.getInstance().stacksValidationFinished.connect(self._onStackErrorCheckFinished)
+
+        # A flag indicating if an error check was scheduled
+        # If so, we will stop the auto-slice timer and start upon the error check
+        self._is_error_check_scheduled = False
 
         # Listeners for receiving messages from the back-end.
         self._message_handlers["cura.proto.Layer"] = self._onLayerMessage
@@ -426,11 +435,21 @@ class CuraEngineBackend(QObject, Backend):
             self._clearLayerData()
 
     ##  A setting has changed, so check if we must reslice.
-    #
-    #   \param instance The setting instance that has changed.
-    #   \param property The property of the setting instance that has changed.
+    # \param instance The setting instance that has changed.
+    # \param property The property of the setting instance that has changed.
     def _onSettingChanged(self, instance, property):
-        if property == "value": # Only reslice if the value has changed.
+        if property == "value":  # Only reslice if the value has changed.
+            self.needsSlicing()
+            self._onChanged()
+
+        elif property == "validationState":
+            if self._use_timer:
+                self._is_error_check_scheduled = True
+                self._change_timer.stop()
+
+    def _onStackErrorCheckFinished(self):
+        self._is_error_check_scheduled = False
+        if self._need_slicing:
             self.needsSlicing()
             self._onChanged()
 
@@ -525,7 +544,12 @@ class CuraEngineBackend(QObject, Backend):
     def _onChanged(self, *args, **kwargs):
         self.needsSlicing()
         if self._use_timer:
-            self._change_timer.start()
+            # if the error check is scheduled, wait for the error check finish signal to trigger auto-slice,
+            # otherwise business as usual
+            if self._is_error_check_scheduled:
+                self._change_timer.stop()
+            else:
+                self._change_timer.start()
 
     ##  Called when the back-end connects to the front-end.
     def _onBackendConnected(self):
@@ -591,9 +615,10 @@ class CuraEngineBackend(QObject, Backend):
             self._global_container_stack.propertyChanged.disconnect(self._onSettingChanged)
             self._global_container_stack.containersChanged.disconnect(self._onChanged)
             extruders = list(ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()))
-            if extruders:
-                for extruder in extruders:
-                    extruder.propertyChanged.disconnect(self._onSettingChanged)
+
+            for extruder in extruders:
+                extruder.propertyChanged.disconnect(self._onSettingChanged)
+                extruder.containersChanged.disconnect(self._onChanged)
 
         self._global_container_stack = Application.getInstance().getGlobalContainerStack()
 
@@ -601,27 +626,11 @@ class CuraEngineBackend(QObject, Backend):
             self._global_container_stack.propertyChanged.connect(self._onSettingChanged)  # Note: Only starts slicing when the value changed.
             self._global_container_stack.containersChanged.connect(self._onChanged)
             extruders = list(ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()))
-            if extruders:
-                for extruder in extruders:
-                    extruder.propertyChanged.connect(self._onSettingChanged)
-            self._onActiveExtruderChanged()
+            for extruder in extruders:
+                extruder.propertyChanged.connect(self._onSettingChanged)
+                extruder.containersChanged.connect(self._onChanged)
             self._onChanged()
 
-    def _onActiveExtruderChanged(self):
-        if self._global_container_stack:
-            # Connect all extruders of the active machine. This might cause a few connects that have already happend,
-            # but that shouldn't cause issues as only new / unique connections are added.
-            extruders = list(ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()))
-            if extruders:
-                for extruder in extruders:
-                    extruder.propertyChanged.connect(self._onSettingChanged)
-        if self._active_extruder_stack:
-            self._active_extruder_stack.containersChanged.disconnect(self._onChanged)
-
-        self._active_extruder_stack = ExtruderManager.getInstance().getActiveExtruderStack()
-        if self._active_extruder_stack:
-            self._active_extruder_stack.containersChanged.connect(self._onChanged)
-
     def _onProcessLayersFinished(self, job):
         self._process_layers_job = None
 

plugins/CuraEngineBackend/ProcessSlicedLayersJob.py

@@ -24,6 +24,7 @@ from cura import LayerPolygon
 
 import numpy
 from time import time
+from cura.Settings.ExtrudersModel import ExtrudersModel
 catalog = i18nCatalog("cura")
 
 
@@ -174,7 +175,11 @@ class ProcessSlicedLayersJob(Job):
             material_color_map = numpy.zeros((len(extruders), 4), dtype=numpy.float32)
             for extruder in extruders:
                 position = int(extruder.getMetaDataEntry("position", default="0"))  # Get the position
-                color_code = extruder.material.getMetaDataEntry("color_code", default="#e0e000")
+                try:
+                    default_color = ExtrudersModel.defaultColors[position]
+                except IndexError:
+                    default_color = "#e0e000"
+                color_code = extruder.material.getMetaDataEntry("color_code", default=default_color)
                 color = colorCodeToRGBA(color_code)
                 material_color_map[position, :] = color
         else:

plugins/LayerView/LayerView.qml

@@ -63,6 +63,8 @@ Item
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
             spacing: UM.Theme.getSize("layerview_row_spacing").height
+            anchors.right: parent.right
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
 
             Label
             {
@@ -71,6 +73,8 @@ Item
                 text: catalog.i18nc("@label","View Mode: Layers")
                 font.bold: true
                 color: UM.Theme.getColor("text")
+                Layout.fillWidth: true
+                elide: Text.ElideMiddle;
             }
 
             Label
@@ -117,6 +121,8 @@ Item
                 model: layerViewTypes
                 visible: !UM.LayerView.compatibilityMode
                 style: UM.Theme.styles.combobox
+                anchors.right: parent.right
+                anchors.rightMargin: 10
 
                 onActivated:
                 {
@@ -142,6 +148,7 @@ Item
                 id: compatibilityModeLabel
                 anchors.left: parent.left
                 text: catalog.i18nc("@label","Compatibility Mode")
+                color: UM.Theme.getColor("text")
                 visible: UM.LayerView.compatibilityMode
                 Layout.fillWidth: true
                 Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
@@ -175,17 +182,18 @@ Item
             Repeater {
                 model: Cura.ExtrudersModel{}
                 CheckBox {
+                    id: extrudersModelCheckBox
                     checked: view_settings.extruder_opacities[index] > 0.5 || view_settings.extruder_opacities[index] == undefined || view_settings.extruder_opacities[index] == ""
                     onClicked: {
                         view_settings.extruder_opacities[index] = checked ? 1.0 : 0.0
                         UM.Preferences.setValue("layerview/extruder_opacities", view_settings.extruder_opacities.join("|"));
                     }
-                    text: model.name
                     visible: !UM.LayerView.compatibilityMode
                     enabled: index + 1 <= 4
                     Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
+                        anchors.right: extrudersModelCheckBox.right
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         width: UM.Theme.getSize("layerview_legend_size").width
                         height: UM.Theme.getSize("layerview_legend_size").height
                         color: model.color
@@ -197,6 +205,17 @@ Item
                     Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
                     Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
                     style: UM.Theme.styles.checkbox
+                    Label
+                    {
+                        text: model.name
+                        elide: Text.ElideRight
+                        color: UM.Theme.getColor("text")
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.left: extrudersModelCheckBox.left;
+                        anchors.right: extrudersModelCheckBox.right;
+                        anchors.leftMargin: UM.Theme.getSize("checkbox").width + UM.Theme.getSize("default_margin").width /2
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
+                    }
                 }
             }
 
@@ -233,14 +252,15 @@ Item
                 }
 
                 CheckBox {
+                    id: legendModelCheckBox
                     checked: model.initialValue
                     onClicked: {
                         UM.Preferences.setValue(model.preference, checked);
                     }
-                    text: label
                     Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
+                        anchors.right: legendModelCheckBox.right
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         width: UM.Theme.getSize("layerview_legend_size").width
                         height: UM.Theme.getSize("layerview_legend_size").height
                         color: UM.Theme.getColor(model.colorId)
@@ -252,6 +272,17 @@ Item
                     Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
                     Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
                     style: UM.Theme.styles.checkbox
+                    Label
+                    {
+                        text: label
+                        elide: Text.ElideRight
+                        color: UM.Theme.getColor("text")
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.left: legendModelCheckBox.left;
+                        anchors.right: legendModelCheckBox.right;
+                        anchors.leftMargin: UM.Theme.getSize("checkbox").width + UM.Theme.getSize("default_margin").width /2
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
+                    }
                 }
             }
 
@@ -293,9 +324,11 @@ Item
                 Label {
                     text: label
                     visible: view_settings.show_legend
+                    id: typesLegendModelLabel
                     Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
+                        anchors.right: typesLegendModelLabel.right
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         width: UM.Theme.getSize("layerview_legend_size").width
                         height: UM.Theme.getSize("layerview_legend_size").height
                         color: UM.Theme.getColor(model.colorId)

plugins/MachineSettingsAction/MachineSettingsAction.py

@@ -16,6 +16,7 @@ from UM.Logger import Logger
 
 from cura.CuraApplication import CuraApplication
 from cura.Settings.ExtruderManager import ExtruderManager
+from cura.Settings.CuraStackBuilder import CuraStackBuilder
 
 import UM.i18n
 catalog = UM.i18n.i18nCatalog("cura")
@@ -62,7 +63,8 @@ class MachineSettingsAction(MachineAction):
         # Make sure there is a definition_changes container to store the machine settings
         definition_changes_container = self._global_container_stack.definitionChanges
         if definition_changes_container == self._empty_container:
-            definition_changes_container = self._createDefinitionChangesContainer(self._global_container_stack, self._global_container_stack.getName() + "_settings")
+            definition_changes_container = CuraStackBuilder.createDefinitionChangesContainer(
+                self._global_container_stack, self._global_container_stack.getName() + "_settings")
 
         # Notify the UI in which container to store the machine settings data
         container_index = self._global_container_stack.getContainerIndex(definition_changes_container)
@@ -88,19 +90,8 @@ class MachineSettingsAction(MachineAction):
         # Make sure there is a definition_changes container to store the machine settings
         definition_changes_container = extruder_container_stack.definitionChanges
         if definition_changes_container == self._empty_container:
-            definition_changes_container = self._createDefinitionChangesContainer(extruder_container_stack, extruder_container_stack.getId() + "_settings")
-
-    def _createDefinitionChangesContainer(self, container_stack, container_name, container_index = None):
-        definition_changes_container = InstanceContainer(container_name)
-        definition = container_stack.getBottom()
-        definition_changes_container.setDefinition(definition)
-        definition_changes_container.addMetaDataEntry("type", "definition_changes")
-        definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
-
-        self._container_registry.addContainer(definition_changes_container)
-        container_stack.definitionChanges = definition_changes_container
-
-        return definition_changes_container
+            definition_changes_container = CuraStackBuilder.createDefinitionChangesContainer(
+                extruder_container_stack, extruder_container_stack.getId() + "_settings")
 
     containerIndexChanged = pyqtSignal()
 

plugins/MachineSettingsAction/MachineSettingsAction.qml

@@ -70,7 +70,7 @@ Cura.MachineAction
             anchors.top: pageTitle.bottom
             anchors.topMargin: UM.Theme.getSize("default_margin").height
 
-            property real columnWidth: Math.floor((width - 3 * UM.Theme.getSize("default_margin").width) / 2)
+            property real columnWidth: ((width - 3 * UM.Theme.getSize("default_margin").width) / 2) | 0
 
             Tab
             {
@@ -755,7 +755,7 @@ Cura.MachineAction
                 {
                     if(!activeFocus)
                     {
-                        propertyProvider.setPropertyValue("value", gcodeField.text)
+                        propertyProvider.setPropertyValue("value", gcodeArea.text)
                     }
                 }
                 Component.onCompleted:

plugins/PerObjectSettingsTool/PerObjectCategory.qml

@@ -22,7 +22,7 @@ Button {
             UM.RecolorImage
             {
                 anchors.verticalCenter: parent.verticalCenter
-                height: label.height / 2
+                height: (label.height / 2) | 0
                 width: height
                 source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right");
                 color: control.hovered ? palette.highlight : palette.buttonText

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -110,10 +110,10 @@ Item {
 
                         Button
                         {
-                            width: UM.Theme.getSize("setting").height / 2;
-                            height: UM.Theme.getSize("setting").height;
+                            width: (UM.Theme.getSize("setting").height / 2) | 0
+                            height: UM.Theme.getSize("setting").height
 
-                            onClicked: addedSettingsModel.setVisible(model.key, false);
+                            onClicked: addedSettingsModel.setVisible(model.key, false)
 
                             style: ButtonStyle
                             {

plugins/SliceInfoPlugin/SliceInfo.py

@@ -40,7 +40,7 @@ class SliceInfo(Extension):
         Preferences.getInstance().addPreference("info/asked_send_slice_info", False)
 
         if not Preferences.getInstance().getValue("info/asked_send_slice_info"):
-            self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura collects anonymised slicing statistics. You can disable this in preferences"), lifetime = 0, dismissable = False)
+            self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura collects anonymised slicing statistics. You can disable this in the preferences."), lifetime = 0, dismissable = False)
             self.send_slice_info_message.addAction("Dismiss", catalog.i18nc("@action:button", "Dismiss"), None, "")
             self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered)
             self.send_slice_info_message.show()

plugins/UM3NetworkPrinting/DiscoverUM3Action.qml

@@ -114,7 +114,7 @@ Cura.MachineAction
 
             Column
             {
-                width: parent.width * 0.5
+                width: (parent.width * 0.5) | 0
                 spacing: UM.Theme.getSize("default_margin").height
 
                 ScrollView
@@ -193,14 +193,14 @@ Cura.MachineAction
                     wrapMode: Text.WordWrap
                     //: Tips label
                     //TODO: get actual link from webteam
-                    text: catalog.i18nc("@label", "If your printer is not listed, read the <a href='%1'>network-printing troubleshooting guide</a>").arg("https://ultimaker.com/en/troubleshooting");
+                    text: catalog.i18nc("@label", "If your printer is not listed, read the <a href='%1'>network printing troubleshooting guide</a>").arg("https://ultimaker.com/en/troubleshooting");
                     onLinkActivated: Qt.openUrlExternally(link)
                 }
 
             }
             Column
             {
-                width: parent.width * 0.5
+                width: (parent.width * 0.5) | 0
                 visible: base.selectedPrinter ? true : false
                 spacing: UM.Theme.getSize("default_margin").height
                 Label
@@ -218,13 +218,13 @@ Cura.MachineAction
                     columns: 2
                     Label
                     {
-                        width: parent.width * 0.5
+                        width: (parent.width * 0.5) | 0
                         wrapMode: Text.WordWrap
                         text: catalog.i18nc("@label", "Type")
                     }
                     Label
                     {
-                        width: parent.width * 0.5
+                        width: (parent.width * 0.5) | 0
                         wrapMode: Text.WordWrap
                         text:
                         {
@@ -249,25 +249,25 @@ Cura.MachineAction
                     }
                     Label
                     {
-                        width: parent.width * 0.5
+                        width: (parent.width * 0.5) | 0
                         wrapMode: Text.WordWrap
                         text: catalog.i18nc("@label", "Firmware version")
                     }
                     Label
                     {
-                        width: parent.width * 0.5
+                        width: (parent.width * 0.5) | 0
                         wrapMode: Text.WordWrap
                         text: base.selectedPrinter ? base.selectedPrinter.firmwareVersion : ""
                     }
                     Label
                     {
-                        width: parent.width * 0.5
+                        width: (parent.width * 0.5) | 0
                         wrapMode: Text.WordWrap
                         text: catalog.i18nc("@label", "Address")
                     }
                     Label
                     {
-                        width: parent.width * 0.5
+                        width: (parent.width * 0.5) | 0
                         wrapMode: Text.WordWrap
                         text: base.selectedPrinter ? base.selectedPrinter.ipAddress : ""
                     }

plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py

@@ -179,7 +179,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
 
         self._compressing_print = False
         self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "MonitorItem.qml")
-
         printer_type = self._properties.get(b"machine", b"").decode("utf-8")
         if printer_type.startswith("9511"):
             self._updatePrinterType("ultimaker3_extended")
@@ -314,15 +313,16 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
         return True
 
     def _stopCamera(self):
-        self._camera_timer.stop()
-        if self._image_reply:
-            try:
-                self._image_reply.abort()
-                self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
-            except RuntimeError:
-                pass  # It can happen that the wrapped c++ object is already deleted.
-            self._image_reply = None
-            self._image_request = None
+        if self._camera_timer.isActive():
+            self._camera_timer.stop()
+            if self._image_reply:
+                try:
+                    self._image_reply.abort()
+                    self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
+                except RuntimeError:
+                    pass  # It can happen that the wrapped c++ object is already deleted.
+                self._image_reply = None
+                self._image_request = None
 
     def _startCamera(self):
         if self._use_stream:
@@ -645,7 +645,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
 
         # Only check for mistakes if there is material length information.
         if print_information.materialLengths:
-            # Check if print cores / materials are loaded at all. Any failure in these results in an Error.
+            # Check if PrintCores / materials are loaded at all. Any failure in these results in an Error.
             for index in range(0, self._num_extruders):
                 if index < len(print_information.materialLengths) and print_information.materialLengths[index] != 0:
                     if self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] == "":
@@ -677,7 +677,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
                     if variant:
                         if variant.getName() != core_name:
                             Logger.log("w", "Extruder %s has a different Cartridge (%s) as Cura (%s)", index + 1, core_name, variant.getName())
-                            warnings.append(i18n_catalog.i18nc("@label", "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1)))
+                            warnings.append(i18n_catalog.i18nc("@label", "Different PrintCore (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1)))
 
                     material = extruder_manager.getExtruderStack(index).findContainer({"type": "material"})
                     if material:
@@ -699,7 +699,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
                         is_offset_calibrated = True
 
                     if not is_offset_calibrated:
-                        warnings.append(i18n_catalog.i18nc("@label", "Print core {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1))
+                        warnings.append(i18n_catalog.i18nc("@label", "PrintCore {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1))
         else:
             Logger.log("w", "There was no material usage found. No check to match used material with machine is done.")
 
@@ -1176,7 +1176,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
             i18n_catalog.i18nc("@label",
                 "Would you like to use your current printer configuration in Cura?"),
             i18n_catalog.i18nc("@label",
-                "The print cores and/or materials on your printer differ from those within your current project. For the best result, always slice for the print cores and materials that are inserted in your printer."),
+                "The PrintCores and/or materials on your printer differ from those within your current project. For the best result, always slice for the PrintCores and materials that are inserted in your printer."),
             buttons=QMessageBox.Yes + QMessageBox.No,
             icon=QMessageBox.Question,
             callback=callback

plugins/USBPrinting/FirmwareUpdateWindow.qml

@@ -12,7 +12,9 @@ UM.Dialog
     id: base;
 
     width: 500 * Screen.devicePixelRatio;
+    minimumWidth: 500 * Screen.devicePixelRatio;
     height: 100 * Screen.devicePixelRatio;
+    minimumHeight: 100 * Screen.devicePixelRatio;
 
     visible: true;
     modality: Qt.ApplicationModal;

plugins/USBPrinting/USBPrinterOutputDeviceManager.py

@@ -19,6 +19,7 @@ import platform
 import glob
 import time
 import os.path
+import serial.tools.list_ports
 from UM.Extension import Extension
 
 from PyQt5.QtQml import QQmlComponent, QQmlContext
@@ -252,24 +253,13 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
     #   \param only_list_usb If true, only usb ports are listed
     def getSerialPortList(self, only_list_usb = False):
         base_list = []
-        if platform.system() == "Windows":
-            import winreg # type: ignore @UnresolvedImport
-            try:
-                key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,"HARDWARE\\DEVICEMAP\\SERIALCOMM")
-                i = 0
-                while True:
-                    values = winreg.EnumValue(key, i)
-                    if not only_list_usb or "USBSER" or "VCP" in values[0]:
-                        base_list += [values[1]]
-                    i += 1
-            except Exception as e:
-                pass
-        else:
-            if only_list_usb:
-                base_list = base_list + glob.glob("/dev/ttyUSB*") + glob.glob("/dev/ttyACM*") + glob.glob("/dev/cu.usb*") + glob.glob("/dev/tty.wchusb*") + glob.glob("/dev/cu.wchusb*")
-                base_list = filter(lambda s: "Bluetooth" not in s, base_list) # Filter because mac sometimes puts them in the list
-            else:
-                base_list = base_list + glob.glob("/dev/ttyUSB*") + glob.glob("/dev/ttyACM*") + glob.glob("/dev/cu.*") + glob.glob("/dev/tty.usb*") + glob.glob("/dev/tty.wchusb*") + glob.glob("/dev/cu.wchusb*") + glob.glob("/dev/rfcomm*") + glob.glob("/dev/serial/by-id/*")
+        for port in serial.tools.list_ports.comports():
+            if not isinstance(port, tuple):
+                port = (port.device, port.description, port.hwid)
+            if only_list_usb and not port[2].startswith("USB"):
+                continue
+            base_list += [port[0]]
+
         return list(base_list)
 
     _instance = None    # type: "USBPrinterOutputDeviceManager"

plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml

@@ -13,8 +13,8 @@ Cura.MachineAction
     {
         id: checkupMachineAction
         anchors.fill: parent;
-        property int leftRow: checkupMachineAction.width * 0.40
-        property int rightRow: checkupMachineAction.width * 0.60
+        property int leftRow: (checkupMachineAction.width * 0.40) | 0
+        property int rightRow: (checkupMachineAction.width * 0.60) | 0
         property bool heatupHotendStarted: false
         property bool heatupBedStarted: false
         property bool usbConnected: Cura.USBPrinterManager.connectedPrinterList.rowCount() > 0
@@ -166,7 +166,7 @@ Cura.MachineAction
             Label
             {
                 id: nozzleTempStatus
-                width: checkupMachineAction.rightRow * 0.4
+                width: (checkupMachineAction.rightRow * 0.4) | 0
                 anchors.top: nozzleTempLabel.top
                 anchors.left: nozzleTempLabel.right
                 wrapMode: Text.WordWrap
@@ -176,7 +176,7 @@ Cura.MachineAction
             Item
             {
                 id: nozzleTempButton
-                width: checkupMachineAction.rightRow * 0.3
+                width: (checkupMachineAction.rightRow * 0.3) | 0
                 height: childrenRect.height
                 anchors.top: nozzleTempLabel.top
                 anchors.left: bedTempStatus.right
@@ -205,7 +205,7 @@ Cura.MachineAction
                 anchors.top: nozzleTempLabel.top
                 anchors.left: nozzleTempButton.right
                 anchors.leftMargin: UM.Theme.getSize("default_margin").width
-                width: checkupMachineAction.rightRow * 0.2
+                width: (checkupMachineAction.rightRow * 0.2) | 0
                 wrapMode: Text.WordWrap
                 text: manager.hotendTemperature + "°C"
                 font.bold: true
@@ -227,7 +227,7 @@ Cura.MachineAction
             Label
             {
                 id: bedTempStatus
-                width: checkupMachineAction.rightRow * 0.4
+                width: (checkupMachineAction.rightRow * 0.4) | 0
                 anchors.top: bedTempLabel.top
                 anchors.left: bedTempLabel.right
                 wrapMode: Text.WordWrap
@@ -237,7 +237,7 @@ Cura.MachineAction
             Item
             {
                 id: bedTempButton
-                width: checkupMachineAction.rightRow * 0.3
+                width: (checkupMachineAction.rightRow * 0.3) | 0
                 height: childrenRect.height
                 anchors.top: bedTempLabel.top
                 anchors.left: bedTempStatus.right
@@ -263,7 +263,7 @@ Cura.MachineAction
             Label
             {
                 id: bedTemp
-                width: checkupMachineAction.rightRow * 0.2
+                width: (checkupMachineAction.rightRow * 0.2) | 0
                 anchors.top: bedTempLabel.top
                 anchors.left: bedTempButton.right
                 anchors.leftMargin: UM.Theme.getSize("default_margin").width

plugins/UltimakerMachineActions/UMOUpgradeSelection.py

@@ -2,7 +2,6 @@
 # Uranium is released under the terms of the AGPLv3 or higher.
 
 from UM.Settings.ContainerRegistry import ContainerRegistry
-from UM.Settings.InstanceContainer import InstanceContainer
 from cura.MachineAction import MachineAction
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty
 
@@ -10,8 +9,7 @@ from UM.i18n import i18nCatalog
 from UM.Application import Application
 catalog = i18nCatalog("cura")
 
-import UM.Settings.InstanceContainer
-from cura.CuraApplication import CuraApplication
+from cura.Settings.CuraStackBuilder import CuraStackBuilder
 
 ##  The Ultimaker Original can have a few revisions & upgrades. This action helps with selecting them, so they are added
 #   as a variant.
@@ -38,20 +36,8 @@ class UMOUpgradeSelection(MachineAction):
             # Make sure there is a definition_changes container to store the machine settings
             definition_changes_container = global_container_stack.definitionChanges
             if definition_changes_container == ContainerRegistry.getInstance().getEmptyInstanceContainer():
-                definition_changes_container = self._createDefinitionChangesContainer(global_container_stack)
+                definition_changes_container = CuraStackBuilder.createDefinitionChangesContainer(
+                    global_container_stack, global_container_stack.getId() + "_settings")
 
             definition_changes_container.setProperty("machine_heated_bed", "value", heated_bed)
             self.heatedBedChanged.emit()
-
-    def _createDefinitionChangesContainer(self, global_container_stack):
-        # Create a definition_changes container to store the settings in and add it to the stack
-        definition_changes_container = UM.Settings.InstanceContainer.InstanceContainer(global_container_stack.getName() + "_settings")
-        definition = global_container_stack.getBottom()
-        definition_changes_container.setDefinition(definition)
-        definition_changes_container.addMetaDataEntry("type", "definition_changes")
-        definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
-
-        ContainerRegistry.getInstance().addContainer(definition_changes_container)
-        global_container_stack.definitionChanges = definition_changes_container
-
-        return definition_changes_container

plugins/VersionUpgrade/VersionUpgrade26to27/VersionUpgrade26to27.py

@@ -104,6 +104,11 @@ class VersionUpgrade26to27(VersionUpgrade):
             parser["metadata"] = {}
         parser["metadata"]["setting_version"] = "2"
 
+        #Renamed setting value for g-code flavour.
+        if "values" in parser and "machine_gcode_flavor" in parser["values"]:
+            if parser["values"]["machine_gcode_flavor"] == "RepRap (Volumatric)":
+                parser["values"]["machine_gcode_flavor"] = "RepRap (Volumetric)"
+
         # Re-serialise the file.
         output = io.StringIO()
         parser.write(output)

plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py

@@ -53,7 +53,7 @@ def getMetaData():
             },
             "definition_changes": {
                 "get_version": upgrade.getCfgVersion,
-                "location": {"./machine_instances"}
+                "location": {"./definition_changes"}
             }
         }
     }

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -3,7 +3,7 @@
 
 import copy
 import io
-from typing import Optional
+from typing import List, Optional
 import xml.etree.ElementTree as ET
 
 from UM.Resources import Resources
@@ -109,7 +109,7 @@ class XmlMaterialProfile(InstanceContainer):
     ##  Overridden from InstanceContainer
     # base file: common settings + supported machines
     # machine / variant combination: only changes for itself.
-    def serialize(self):
+    def serialize(self, ignored_metadata_keys: Optional[List] = None):
         registry = ContainerRegistry.getInstance()
 
         base_file = self.getMetaDataEntry("base_file", "")
@@ -129,6 +129,14 @@ class XmlMaterialProfile(InstanceContainer):
         builder.start("metadata")
 
         metadata = copy.deepcopy(self.getMetaData())
+        # setting_version is derived from the "version" tag in the schema, so don't serialize it into a file
+        if ignored_metadata_keys is None:
+            ignored_metadata_keys = []
+        ignored_metadata_keys = ignored_metadata_keys + ["setting_version"]
+        # remove the keys that we want to ignore in the metadata
+        for key in ignored_metadata_keys:
+            if key in metadata:
+                del metadata[key]
         properties = metadata.pop("properties", {})
 
         # Metadata properties that should not be serialized.
@@ -420,7 +428,7 @@ class XmlMaterialProfile(InstanceContainer):
         meta_data = {}
         meta_data["type"] = "material"
         meta_data["base_file"] = self.id
-        meta_data["status"] = "unknown"  # TODO: Add material verfication
+        meta_data["status"] = "unknown"  # TODO: Add material verification
 
         common_setting_values = {}
 
@@ -429,10 +437,12 @@ class XmlMaterialProfile(InstanceContainer):
             inherited = self._resolveInheritance(inherits.text)
             data = self._mergeXML(inherited, data)
 
+        # set setting_version in metadata
         if "version" in data.attrib:
             meta_data["setting_version"] = self.xmlVersionToSettingVersion(data.attrib["version"])
         else:
             meta_data["setting_version"] = self.xmlVersionToSettingVersion("1.2") #1.2 and lower didn't have that version number there yet.
+
         metadata = data.iterfind("./um:metadata/*", self.__namespaces)
         for entry in metadata:
             tag_name = _tag_without_namespace(entry)
@@ -451,6 +461,11 @@ class XmlMaterialProfile(InstanceContainer):
                 meta_data["material"] = material.text
                 meta_data["color_name"] = color.text
                 continue
+
+            # setting_version is derived from the "version" tag in the schema earlier, so don't set it here
+            if tag_name == "setting_version":
+                continue
+
             meta_data[tag_name] = entry.text
 
             if tag_name in self.__material_metadata_setting_map:

resources/definitions/cartesio.def.json

@@ -48,8 +48,8 @@
         "material_bed_temp_wait": { "default_value": false },
         "prime_tower_enable": { "default_value": true },
         "prime_tower_wall_thickness": { "resolve": 0.7 },
-        "prime_tower_position_x": { "default_value": 50 },
-        "prime_tower_position_y": { "default_value": 150 },
+        "prime_tower_position_x": { "value": "50" },
+        "prime_tower_position_y": { "value": "150" },
         "prime_blob_enable": { "default_value": false },
         "machine_max_feedrate_z": { "default_value": 20 },
         "machine_disallowed_areas": { "default_value": [

resources/definitions/fdmprinter.def.json

@@ -304,7 +304,7 @@
                     "options":
                     {
                         "RepRap (Marlin/Sprinter)": "Marlin",
-                        "RepRap (Volumatric)": "Marlin (Volumetric)",
+                        "RepRap (Volumetric)": "Marlin (Volumetric)",
                         "RepRap (RepRap)": "RepRap",
                         "UltiGCode": "Ultimaker 2",
                         "Griffin": "Griffin",
@@ -699,6 +699,21 @@
                                 }
                             }
                         },
+                        "roofing_line_width":
+                        {
+                            "label": "Top Surface Skin Line Width",
+                            "description": "Width of a single line of the areas at the top of the print.",
+                            "unit": "mm",
+                            "minimum_value": "0.001",
+                            "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
+                            "maximum_value_warning": "2 * machine_nozzle_size",
+                            "default_value": 0.4,
+                            "type": "float",
+                            "value": "skin_line_width",
+                            "limit_to_extruder": "roofing_extruder_nr",
+                            "settable_per_mesh": true,
+                            "enabled": "roofing_layer_count > 0 and top_layers > 0"
+                        },
                         "skin_line_width":
                         {
                             "label": "Top/Bottom Line Width",
@@ -833,7 +848,9 @@
                             "unit": "%",
                             "default_value": 100.0,
                             "minimum_value": "0.001",
-                            "settable_per_mesh": true
+                            "maximum_value_warning": "150",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true
                         }
                     }
                 }
@@ -853,7 +870,6 @@
                     "description": "The extruder train used for printing the walls. This is used in multi-extrusion.",
                     "type": "optional_extruder",
                     "default_value": "-1",
-                    "value": "-1",
                     "settable_per_mesh": true,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
@@ -931,13 +947,66 @@
                     "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
+                "roofing_extruder_nr":
+                {
+                    "label": "Top Surface Skin Extruder",
+                    "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.",
+                    "type": "optional_extruder",
+                    "default_value": "-1",
+                    "value": "top_bottom_extruder_nr",
+                    "settable_per_mesh": true,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": true,
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1 and roofing_layer_count > 0 and top_layers > 0"
+                },
+                "roofing_layer_count":
+                {
+                    "label": "Top Surface Skin Layers",
+                    "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.",
+                    "default_value": 0,
+                    "minimum_value": "0",
+                    "maximum_value_warning": "top_layers - 1",
+                    "type": "int",
+                    "value": "0",
+                    "limit_to_extruder": "roofing_extruder_nr",
+                    "settable_per_mesh": true,
+                    "enabled": "top_layers > 0"
+                },
+                "roofing_pattern":
+                {
+                    "label": "Top Surface Skin Pattern",
+                    "description": "The pattern of the top most layers.",
+                    "type": "enum",
+                    "options":
+                    {
+                        "lines": "Lines",
+                        "concentric": "Concentric",
+                        "zigzag": "Zig Zag"
+                    },
+                    "default_value": "lines",
+                    "value": "top_bottom_pattern",
+                    "limit_to_extruder": "roofing_extruder_nr",
+                    "settable_per_mesh": true,
+                    "enabled": "roofing_layer_count > 0 and top_layers > 0"
+                },
+                "roofing_angles":
+                {
+                    "label": "Top Surface Skin Line Directions",
+                    "description": "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).",
+                    "type": "[int]",
+                    "default_value": "[ ]",
+                    "value": "skin_angles",
+                    "enabled": "roofing_pattern != 'concentric'",
+                    "limit_to_extruder": "roofing_extruder_nr",
+                    "settable_per_mesh": true
+                },
                 "top_bottom_extruder_nr":
                 {
                     "label": "Top/Bottom Extruder",
                     "description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.",
                     "type": "optional_extruder",
                     "default_value": "-1",
-                    "value": "-1",
                     "settable_per_mesh": true,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
@@ -1243,7 +1312,6 @@
                     "description": "The extruder train used for printing infill. This is used in multi-extrusion.",
                     "type": "optional_extruder",
                     "default_value": "-1",
-                    "value": "-1",
                     "settable_per_mesh": true,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
@@ -1752,7 +1820,7 @@
                     "unit": "mm/s",
                     "type": "float",
                     "default_value": 25,
-                    "minimum_value": "0",
+                    "minimum_value": "0.0001",
                     "minimum_value_warning": "1",
                     "maximum_value": "machine_max_feedrate_e",
                     "maximum_value_warning": "70",
@@ -1768,7 +1836,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "default_value": 25,
-                            "minimum_value": "0",
+                            "minimum_value": "0.0001",
                             "maximum_value": "machine_max_feedrate_e",
                             "minimum_value_warning": "1",
                             "maximum_value_warning": "70",
@@ -1784,7 +1852,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "default_value": 25,
-                            "minimum_value": "0",
+                            "minimum_value": "0.0001",
                             "maximum_value": "machine_max_feedrate_e",
                             "minimum_value_warning": "1",
                             "maximum_value_warning": "70",
@@ -2009,6 +2077,21 @@
                                 }
                             }
                         },
+                        "speed_roofing":
+                        {
+                            "label": "Top Surface Skin Speed",
+                            "description": "The speed at which top surface skin layers are printed.",
+                            "unit": "mm/s",
+                            "type": "float",
+                            "minimum_value": "0.1",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
+                            "maximum_value_warning": "150",
+                            "default_value": 25,
+                            "value": "speed_topbottom",
+                            "limit_to_extruder": "roofing_extruder_nr",
+                            "settable_per_mesh": true,
+                            "enabled": "roofing_layer_count > 0 and top_layers > 0"
+                        },
                         "speed_topbottom":
                         {
                             "label": "Top/Bottom Speed",
@@ -2334,6 +2417,21 @@
                                 }
                             }
                         },
+                        "acceleration_roofing":
+                        {
+                            "label": "Top Surface Skin Acceleration",
+                            "description": "The acceleration with which top surface skin layers are printed.",
+                            "unit": "mm/s²",
+                            "type": "float",
+                            "minimum_value": "0.1",
+                            "minimum_value_warning": "100",
+                            "maximum_value_warning": "10000",
+                            "default_value": 3000,
+                            "value": "acceleration_topbottom",
+                            "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0",
+                            "limit_to_extruder": "roofing_extruder_nr",
+                            "settable_per_mesh": true
+                        },
                         "acceleration_topbottom":
                         {
                             "label": "Top/Bottom Acceleration",
@@ -2608,6 +2706,20 @@
                                 }
                             }
                         },
+                        "jerk_roofing":
+                        {
+                            "label": "Top Surface Skin Jerk",
+                            "description": "The maximum instantaneous velocity change with which top surface skin layers are printed.",
+                            "unit": "mm/s",
+                            "type": "float",
+                            "minimum_value": "0.1",
+                            "maximum_value_warning": "50",
+                            "default_value": 20,
+                            "value": "jerk_topbottom",
+                            "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0",
+                            "limit_to_extruder": "roofing_extruder_nr",
+                            "settable_per_mesh": true
+                        },
                         "jerk_topbottom":
                         {
                             "label": "Top/Bottom Jerk",
@@ -3223,6 +3335,30 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
+                "support_skip_some_zags":
+                {
+                    "label": "Skip Some ZigZags Connections",
+                    "description": "Skip some ZigZags connections to make the support structure easier to break.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "support_enable and (support_pattern == 'zigzag')",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "support_zag_skip_count":
+                {
+                    "label": "ZigZag Connection Skip Count",
+                    "description": "Skip one in every N connection lines to make the support structure easier to break.",
+                    "type": "int",
+                    "default_value": 6,
+                    "minimum_value": "1",
+                    "minimum_value_warning": "3",
+                    "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "support_infill_rate":
                 {
                     "label": "Support Density",
@@ -3427,7 +3563,7 @@
                     "description": "The height of support infill of a given density before switching to half the density.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 1.5,
+                    "default_value": 1,
                     "minimum_value": "0.0001",
                     "minimum_value_warning": "3 * resolveOrValue('layer_height')",
                     "enabled": "support_enable and support_infill_rate > 0 and gradual_support_infill_steps > 0",
@@ -3866,7 +4002,7 @@
                             "default_value": 20,
                             "minimum_value": "0",
                             "maximum_value_warning": "50 / skirt_brim_line_width",
-                            "value": "math.ceil(brim_width / skirt_brim_line_width)",
+                            "value": "math.ceil(brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
                             "enabled": "resolveOrValue('adhesion_type') == 'brim'",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
@@ -4417,6 +4553,7 @@
                     "unit": "mm",
                     "enabled": "resolveOrValue('prime_tower_enable')",
                     "default_value": 200,
+                    "value": "machine_width - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - 1",
                     "maximum_value": "machine_width / 2 if machine_center_is_zero else machine_width",
                     "minimum_value": "resolveOrValue('prime_tower_size') - machine_width / 2 if machine_center_is_zero else resolveOrValue('prime_tower_size')",
                     "settable_per_mesh": false,
@@ -4430,6 +4567,7 @@
                     "unit": "mm",
                     "enabled": "resolveOrValue('prime_tower_enable')",
                     "default_value": 200,
+                    "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - 1",
                     "maximum_value": "machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')",
                     "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
                     "settable_per_mesh": false,
@@ -4783,6 +4921,14 @@
             "description": "experimental!",
             "children":
             {
+                "optimize_wall_printing_order":
+                {
+                    "label": "Optimize Wall Printing Order",
+                    "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization.",
+                    "type": "bool",
+                    "default_value": false,
+                    "settable_per_mesh": true
+                },
                 "draft_shield_enabled":
                 {
                     "label": "Enable Draft Shield",

resources/definitions/kemiq_q2_beta.def.json

@@ -0,0 +1,60 @@
+{
+    "id": "kemiq_q2_beta",
+    "version": 2,
+    "name": "Kemiq Q2 Beta",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "KEMIQ",
+        "manufacturer": "KEMIQ",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "platform": "kemiq_q2.stl",
+        "has_machine_quality": true,
+        "has_materials": true
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "Kemiq Q2 Beta" },
+
+        "machine_width": {
+            "default_value": 190
+        },
+        "machine_depth": {
+            "default_value": 200
+        },
+        "machine_height": {
+            "default_value": 273
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 2
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 2
+        },
+        "gantry_height": {
+            "default_value": 0
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0\nM80 ;Lights On"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM80 ;Lights Off"
+        }
+    }
+}

resources/definitions/kemiq_q2_gama.def.json

@@ -0,0 +1,61 @@
+{
+    "id": "kemiq_q2_gama",
+    "version": 2,
+    "name": "Kemiq Q2 Gama",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "KEMIQ",
+        "manufacturer": "KEMIQ",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "platform": "kemiq_q2.stl",
+        "has_machine_quality": true,
+        "has_materials": true
+    },
+
+    "overrides": {
+        "machine_name": { 
+            "default_value": "Kemiq Q2 Gama" 
+        },
+        "machine_width": {
+            "default_value": 190
+        },
+        "machine_depth": {
+            "default_value": 200
+        },
+        "machine_height": {
+            "default_value": 273
+        },
+        "machine_heated_bed": {
+            "default_value": false
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 2
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 2
+        },
+        "gantry_height": {
+            "default_value": 0
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0\nM80 ;Lights On"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM80 ;Lights Off"
+        }
+    }
+}

resources/definitions/makeit_pro_l.def.json

@@ -72,10 +72,10 @@
             "enabled": true
         },
         "prime_tower_position_x": {
-            "default_value": 185
+            "value": "185"
         },
         "prime_tower_position_y": {
-            "default_value": 160
+            "value": "160"
         },
         "material_diameter": {
           "default_value": 1.75

resources/definitions/makeit_pro_m.def.json

@@ -72,10 +72,10 @@
             "enabled": false
         },
         "prime_tower_position_x": {
-            "default_value": 185
+            "value": "185"
         },
         "prime_tower_position_y": {
-            "default_value": 160
+            "value": "160"
         },
         "material_diameter": {
           "default_value": 1.75

resources/definitions/ultimaker3.def.json

@@ -69,8 +69,7 @@
         "extruder_prime_pos_abs": { "default_value": true },
         "machine_start_gcode": { "default_value": "" },
         "machine_end_gcode": { "default_value": "" },
-        "prime_tower_position_x": { "default_value": 170 },
-        "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 1" },
+        "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" },
         "prime_tower_wipe_enabled": { "default_value": false },
 
         "prime_blob_enable": { "enabled": true },
@@ -131,7 +130,7 @@
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
         "skin_overlap": { "value": "10" },
-        "speed_layer_0": { "value": "speed_print * 30 / 70" },
+        "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
         "speed_support": { "value": "speed_wall_0" },

resources/definitions/ultimaker_original_dual.def.json

@@ -73,10 +73,10 @@
             "default_value": 2
         },
         "prime_tower_position_x": {
-            "default_value": 195
+            "value": "195"
         },
         "prime_tower_position_y": {
-            "default_value": 149
+            "value": "149"
         }
     }
 }

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: German\n"
-"Language: German\n"
-"Lang-Code: de\n"
-"Country-Code: DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Gerät"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Gerätespezifische Einstellungen"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Extruder"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "Die für das Drucken verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Düsendurchmesser"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "Der Innendurchmesser der Düse. Verwenden Sie diese Einstellung, wenn Sie eine Düse einer Nicht-Standardgröße verwenden."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "X-Versatz Düse"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "Die X-Koordinate des Düsenversatzes."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Y-Versatz Düse"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "Die Y-Koordinate des Düsenversatzes."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "G-Code Extruder-Start"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "Starten Sie den G-Code jedes Mal, wenn Sie den Extruder einschalten."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Absolute Startposition des Extruders"
-
-#: 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 "Bevorzugen Sie eine absolute Startposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "X-Position Extruder-Start"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x description"
-msgid "The x-coordinate of the starting position when turning the extruder on."
-msgstr "Die X-Koordinate der Startposition beim Einschalten des Extruders."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Y-Position Extruder-Start"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y description"
-msgid "The y-coordinate of the starting position when turning the extruder on."
-msgstr "Die Y-Koordinate der Startposition beim Einschalten des Extruders."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "G-Code Extruder-Ende"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "Beenden Sie den G-Code jedes Mal, wenn Sie den Extruder ausschalten."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Absolute Extruder-Endposition"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "Bevorzugen Sie eine absolute Endposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "Extruder-Endposition 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 "Die X-Koordinate der Endposition beim Ausschalten des Extruders."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Extruder-Endposition 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 "Die Y-Koordinate der Endposition beim Ausschalten des Extruders."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Z-Position Extruder-Einzug"
-
-#: 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 "Die Z-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Druckplattenhaftung"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Haftung"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "X-Position Extruder-Einzug"
-
-#: 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 "Die X-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Y-Position Extruder-Einzug"
-
-#: 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 "Die Y-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: German\n"
+"Language: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: de\n"
+"Country-Code: DE\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Gerät"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Gerätespezifische Einstellungen"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Extruder"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "Die für das Drucken verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Düsendurchmesser"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Der Innendurchmesser der Düse. Verwenden Sie diese Einstellung, wenn Sie eine Düse einer Nicht-Standardgröße verwenden."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "X-Versatz Düse"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "Die X-Koordinate des Düsenversatzes."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Y-Versatz Düse"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Die Y-Koordinate des Düsenversatzes."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "G-Code Extruder-Start"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Starten Sie den G-Code jedes Mal, wenn Sie den Extruder einschalten."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Absolute Startposition des Extruders"
+
+#: 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 "Bevorzugen Sie eine absolute Startposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "X-Position Extruder-Start"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "Die X-Koordinate der Startposition beim Einschalten des Extruders."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Y-Position Extruder-Start"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "Die Y-Koordinate der Startposition beim Einschalten des Extruders."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "G-Code Extruder-Ende"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Beenden Sie den G-Code jedes Mal, wenn Sie den Extruder ausschalten."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Absolute Extruder-Endposition"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Bevorzugen Sie eine absolute Endposition des Extruders anstelle einer relativen Position zur zuletzt bekannten Kopfposition."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Extruder-Endposition 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 "Die X-Koordinate der Endposition beim Ausschalten des Extruders."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Extruder-Endposition 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 "Die Y-Koordinate der Endposition beim Ausschalten des Extruders."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Z-Position Extruder-Einzug"
+
+#: 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 "Die Z-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Druckplattenhaftung"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Haftung"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "X-Position Extruder-Einzug"
+
+#: 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 "Die X-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Y-Position Extruder-Einzug"
+
+#: 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 "Die Y-Koordinate der Position, an der die Düse am Druckbeginn einzieht."

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Spanish\n"
-"Language: Spanish\n"
-"Lang-Code: es\n"
-"Country-Code: ES\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Máquina"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Ajustes específicos de la máquina"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Extrusor"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "El tren extrusor que se utiliza para imprimir. Se emplea en la extrusión múltiple."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Diámetro de la tobera"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "Diámetro interior de la tobera. Cambie este ajuste cuando utilice un tamaño de tobera no estándar."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "Desplazamiento de la tobera sobre el eje X"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "Coordenada X del desplazamiento de la tobera."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Desplazamiento de la tobera sobre el eje Y"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "Coordenada Y del desplazamiento de la tobera."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "Gcode inicial del extrusor"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "Gcode inicial que se ejecuta cada vez que se enciende el extrusor."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Posición de inicio absoluta del 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 "El extrusor se coloca en la posición de inicio absoluta según la última ubicación conocida del cabezal."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "Posición de inicio del extrusor sobre el eje 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 "Coordenada X de la posición de inicio cuando se enciende el extrusor."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Posición de inicio del extrusor sobre el eje 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 "Coordenada Y de la posición de inicio cuando se enciende el extrusor."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "Gcode final del extrusor"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "Gcode final que se ejecuta cada vez que se apaga el extrusor."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Posición final absoluta del extrusor"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "La posición final del extrusor se considera absoluta, en lugar de relativa a la última ubicación conocida del cabezal."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "Posición de fin del extrusor sobre el eje 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 "Coordenada X de la posición de fin cuando se apaga el extrusor."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Posición de fin del extrusor sobre el eje 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 "Coordenada Y de la posición de fin cuando se apaga el extrusor."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Posición de preparación del extrusor sobre el eje 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."
-msgstr "Coordenada Z de la posición en la que la tobera queda preparada al inicio de la impresión."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Adherencia de la placa de impresión"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Adherencia"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "Posición de preparación del extrusor sobre el eje 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."
-msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Posición de preparación del extrusor sobre el eje 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."
-msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: Spanish\n"
+"Language: Spanish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: es\n"
+"Country-Code: ES\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Máquina"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Ajustes específicos de la máquina"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "El tren extrusor que se utiliza para imprimir. Se emplea en la extrusión múltiple."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Diámetro de la tobera"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Diámetro interior de la tobera. Cambie este ajuste cuando utilice un tamaño de tobera no estándar."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Desplazamiento de la tobera sobre el eje X"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "Coordenada X del desplazamiento de la tobera."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Desplazamiento de la tobera sobre el eje Y"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Coordenada Y del desplazamiento de la tobera."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Gcode inicial del extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Gcode inicial que se ejecuta cada vez que se enciende el extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Posición de inicio absoluta del 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 "El extrusor se coloca en la posición de inicio absoluta según la última ubicación conocida del cabezal."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Posición de inicio del extrusor sobre el eje 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 "Coordenada X de la posición de inicio cuando se enciende el extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Posición de inicio del extrusor sobre el eje 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 "Coordenada Y de la posición de inicio cuando se enciende el extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Gcode final del extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Gcode final que se ejecuta cada vez que se apaga el extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Posición final absoluta del extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "La posición final del extrusor se considera absoluta, en lugar de relativa a la última ubicación conocida del cabezal."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Posición de fin del extrusor sobre el eje 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 "Coordenada X de la posición de fin cuando se apaga el extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Posición de fin del extrusor sobre el eje 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 "Coordenada Y de la posición de fin cuando se apaga el extrusor."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Posición de preparación del extrusor sobre el eje 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."
+msgstr "Coordenada Z de la posición en la que la tobera queda preparada al inicio de la impresión."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Adherencia de la placa de impresión"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Adherencia"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Posición de preparación del extrusor sobre el eje 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."
+msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Posición de preparación del extrusor sobre el eje 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."
+msgstr "Coordenada X de la posición en la que la tobera se coloca al inicio de la impresión."

resources/i18n/fdmextruder.def.json.pot

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
@@ -38,6 +38,16 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr ""
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"

resources/i18n/fdmprinter.def.json.pot

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
@@ -40,7 +40,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants label"
-msgid "Show machine variants"
+msgid "Show Machine Variants"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -86,7 +86,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait label"
-msgid "Wait for build plate heatup"
+msgid "Wait for Build Plate Heatup"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -98,7 +98,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait label"
-msgid "Wait for nozzle heatup"
+msgid "Wait for Nozzle Heatup"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -108,7 +108,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend label"
-msgid "Include material temperatures"
+msgid "Include Material Temperatures"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -121,7 +121,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend label"
-msgid "Include build plate temperature"
+msgid "Include Build Plate Temperature"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -134,7 +134,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_width label"
-msgid "Machine width"
+msgid "Machine Width"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -144,7 +144,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_depth label"
-msgid "Machine depth"
+msgid "Machine Depth"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -154,7 +154,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_shape label"
-msgid "Build plate shape"
+msgid "Build Plate Shape"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -175,7 +175,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
-msgid "Machine height"
+msgid "Machine Height"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -185,7 +185,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed label"
-msgid "Has heated build plate"
+msgid "Has Heated Build Plate"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -195,7 +195,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
-msgid "Is center origin"
+msgid "Is Center Origin"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -336,12 +336,17 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
-msgid "RepRap (Marlin/Sprinter)"
+msgid "Marlin"
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
-msgid "RepRap (Volumetric)"
+msgctxt "machine_gcode_flavor option RepRap (Volumetric)"
+msgid "Marlin (Volumetric)"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_gcode_flavor option RepRap (RepRap)"
+msgid "RepRap"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -426,6 +431,16 @@ msgid ""
 "and Y axes)."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmprinter.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 ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
@@ -684,6 +699,16 @@ msgid ""
 "Width of a single wall line for all wall lines except the outermost one."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "roofing_line_width label"
+msgid "Top Surface Skin Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_line_width description"
+msgid "Width of a single line of the areas at the top of the print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_line_width label"
 msgid "Top/Bottom Line Width"
@@ -764,6 +789,18 @@ msgctxt "prime_tower_line_width description"
 msgid "Width of a single prime tower line."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor label"
+msgid "Initial Layer Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor description"
+msgid ""
+"Multiplier of the line width on the first layer. Increasing this could "
+"improve bed adhesion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "shell label"
 msgid "Shell"
@@ -774,6 +811,42 @@ msgctxt "shell description"
 msgid "Shell"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr label"
+msgid "Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr description"
+msgid ""
+"The extruder train used for printing the walls. This is used in multi-"
+"extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr label"
+msgid "Outer Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr description"
+msgid ""
+"The extruder train used for printing the outer wall. This is used in multi-"
+"extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr label"
+msgid "Inner Walls Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr description"
+msgid ""
+"The extruder train used for printing the inner walls. This is used in multi-"
+"extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_thickness label"
 msgid "Wall Thickness"
@@ -782,8 +855,8 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "wall_thickness description"
 msgid ""
-"The thickness of the outside walls in the horizontal direction. This value "
-"divided by the wall line width defines the number of walls."
+"The thickness of the walls in the horizontal direction. This value divided "
+"by the wall line width defines the number of walls."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -810,6 +883,83 @@ msgid ""
 "better."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr label"
+msgid "Top Surface Skin Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr description"
+msgid ""
+"The extruder train used for printing the top most skin. This is used in "
+"multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count label"
+msgid "Top Surface Skin Layers"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count description"
+msgid ""
+"The number of top most skin layers. Usually only one top most layer is "
+"sufficient to generate higher quality top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern label"
+msgid "Top Surface Skin Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern description"
+msgid "The pattern of the top most layers."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles label"
+msgid "Top Surface Skin Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles description"
+msgid ""
+"A list of integer line directions to use when the top surface skin layers "
+"use the lines or zig zag pattern. Elements from the list are used "
+"sequentially as the layers progress and when the end of the list is reached, "
+"it starts at the beginning again. The list items are separated by commas and "
+"the whole list is contained in square brackets. Default is an empty list "
+"which means use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr label"
+msgid "Top/Bottom Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr description"
+msgid ""
+"The extruder train used for printing the top and bottom skin. This is used "
+"in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -1032,6 +1182,18 @@ msgctxt "fill_perimeter_gaps option everywhere"
 msgid "Everywhere"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps label"
+msgid "Print Thin Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps description"
+msgid ""
+"Print pieces of the model which are horizontally thinner than the nozzle "
+"size."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -1045,6 +1207,19 @@ msgid ""
 "holes."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 label"
+msgid "Initial Layer Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 description"
+msgid ""
+"Amount of offset applied to all polygons in the first layer. A negative "
+"value can compensate for squishing of the first layer known as \"elephant's "
+"foot\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -1099,6 +1274,19 @@ msgid ""
 "layer."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "z_seam_relative label"
+msgid "Z Seam Relative"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_relative description"
+msgid ""
+"When enabled, the z seam coordinates are relative to each part's centre. "
+"When disabled, the coordinates define an absolute position on the build "
+"plate."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1122,6 +1310,17 @@ msgctxt "infill description"
 msgid "Infill"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr label"
+msgid "Infill Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr description"
+msgid ""
+"The extruder train used for printing infill. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_sparse_density label"
 msgid "Infill Density"
@@ -1220,68 +1419,6 @@ msgid ""
 "lines and zig zag patterns and 45 degrees for all other patterns)."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid ""
-"Print the infill every so often, so that the filament will curl up "
-"chaotically inside the object. This reduces print time, but the behaviour is "
-"rather unpredictable."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid ""
-"The maximum angle w.r.t. the Z axis of the inside of the print for areas "
-"which are to be filled with spaghetti infill afterwards. Lowering this value "
-"causes more angled parts in your model to be filled on each layer."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid ""
-"The maximum height of inside space which can be combined and filled from the "
-"top."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid ""
-"The offset from the walls from where the spaghetti infill will be printed."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid ""
-"Adjusts the density of the spaghetti infill. Note that the Infill Density "
-"only controls the line spacing of the filling pattern, not the amount of "
-"extrusion for spaghetti infill."
-msgstr ""
-
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_add label"
 msgid "Cubic Subdivision Shell"
@@ -1328,8 +1465,10 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "skin_overlap description"
 msgid ""
-"The amount of overlap between the skin and the walls. A slight overlap "
-"allows the walls to connect firmly to the skin."
+"The amount of overlap between the skin and the walls as a percentage of the "
+"line width. A slight overlap allows the walls to connect firmly to the skin. "
+"This is a percentage of the average line widths of the skin lines and the "
+"innermost wall."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -1890,6 +2029,16 @@ msgid ""
 "this in between the outer wall speed and the infill speed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "speed_roofing label"
+msgid "Top Surface Skin Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_roofing description"
+msgid "The speed at which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_topbottom label"
 msgid "Top/Bottom Speed"
@@ -1900,6 +2049,16 @@ msgctxt "speed_topbottom description"
 msgid "The speed at which top/bottom layers are printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "speed_ironing label"
+msgid "Ironing Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_ironing description"
+msgid "The speed at which to pass over the top surface."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_support label"
 msgid "Support Speed"
@@ -2147,6 +2306,16 @@ msgctxt "acceleration_wall_x description"
 msgid "The acceleration with which all inner walls are printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing label"
+msgid "Top Surface Skin Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing description"
+msgid "The acceleration with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_topbottom label"
 msgid "Top/Bottom Acceleration"
@@ -2157,6 +2326,16 @@ msgctxt "acceleration_topbottom description"
 msgid "The acceleration with which top/bottom layers are printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing label"
+msgid "Ironing Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing description"
+msgid "The acceleration with which ironing is performed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_support label"
 msgid "Support Acceleration"
@@ -2344,6 +2523,18 @@ msgid ""
 "printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "jerk_roofing label"
+msgid "Top Surface Skin Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_roofing description"
+msgid ""
+"The maximum instantaneous velocity change with which top surface skin layers "
+"are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_topbottom label"
 msgid "Top/Bottom Jerk"
@@ -2356,6 +2547,16 @@ msgid ""
 "printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "jerk_ironing label"
+msgid "Ironing Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_ironing description"
+msgid "The maximum instantaneous velocity change while performing ironing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_support label"
 msgid "Support Jerk"
@@ -2978,6 +3179,29 @@ msgid ""
 "structure."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags label"
+msgid "Skip Some ZigZags Connections"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags description"
+msgid ""
+"Skip some ZigZags connections to make the support structure easier to break."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count label"
+msgid "ZigZag Connection Skip Count"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count description"
+msgid ""
+"Skip one in every N connection lines to make the support structure easier to "
+"break."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_infill_rate label"
 msgid "Support Density"
@@ -3132,6 +3356,43 @@ msgid ""
 "values can smooth out the support areas and result in more sturdy support."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness label"
+msgid "Support Infill Layer Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness description"
+msgid ""
+"The thickness per layer of support infill material. This value should always "
+"be a multiple of the layer height and is otherwise rounded."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps label"
+msgid "Gradual Support Infill Steps"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps description"
+msgid ""
+"Number of times to reduce the support infill density by half when getting "
+"further below top surfaces. Areas which are closer to top surfaces get a "
+"higher density, up to the Support Infill Density."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height label"
+msgid "Gradual Support Infill Step Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height description"
+msgid ""
+"The height of support infill of a given density before switching to half the "
+"density."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_enable label"
 msgid "Enable Support Interface"
@@ -4060,6 +4321,19 @@ msgid ""
 "the oozed material causes least harm to the surface quality of your print."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume label"
+msgid "Prime Tower Purge Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume description"
+msgid ""
+"Amount of filament to be purged when wiping on the prime tower. Purging is "
+"useful for compensating the filament lost by oozing during inactivity of the "
+"nozzle."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "ooze_shield_enabled label"
 msgid "Enable Ooze Shield"
@@ -4581,6 +4855,92 @@ msgid ""
 "directions."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled description"
+msgid ""
+"Print the infill every so often, so that the filament will curl up "
+"chaotically inside the object. This reduces print time, but the behaviour is "
+"rather unpredictable."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped label"
+msgid "Spaghetti Infill Stepping"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped description"
+msgid ""
+"Whether to print spaghetti infill in steps or extrude all the infill "
+"filament at the end of the print."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle label"
+msgid "Spaghetti Maximum Infill Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle description"
+msgid ""
+"The maximum angle w.r.t. the Z axis of the inside of the print for areas "
+"which are to be filled with spaghetti infill afterwards. Lowering this value "
+"causes more angled parts in your model to be filled on each layer."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height label"
+msgid "Spaghetti Infill Maximum Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height description"
+msgid ""
+"The maximum height of inside space which can be combined and filled from the "
+"top."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset label"
+msgid "Spaghetti Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset description"
+msgid ""
+"The offset from the walls from where the spaghetti infill will be printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow label"
+msgid "Spaghetti Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow description"
+msgid ""
+"Adjusts the density of the spaghetti infill. Note that the Infill Density "
+"only controls the line spacing of the filling pattern, not the amount of "
+"extrusion for spaghetti infill."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume label"
+msgid "Spaghetti Infill Extra Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume description"
+msgid ""
+"A correction term to adjust the total volume being extruded each time when "
+"filling spaghetti."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -4994,6 +5354,75 @@ msgid ""
 "applies to Wire Printing."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "ironing_enabled label"
+msgid "Enable Ironing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_enabled description"
+msgid ""
+"Go over the top surface one additional time, but without extruding material. "
+"This is meant to melt the plastic on top further, creating a smoother "
+"surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern label"
+msgid "Ironing Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern description"
+msgid "The pattern to use for ironing top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing label"
+msgid "Ironing Line Spacing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing description"
+msgid "The distance between the lines of ironing."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow label"
+msgid "Ironing Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow description"
+msgid ""
+"The amount of material, relative to a normal skin line, to extrude during "
+"ironing. Keeping the nozzle filled helps filling some of the crevices of the "
+"top surface, but too much results in overextrusion and blips on the side of "
+"the surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset label"
+msgid "Ironing Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset description"
+msgid ""
+"A distance to keep from the edges of the model. Ironing all the way to the "
+"edge of the mesh may result in a jagged edge on your print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"
 msgid "Command Line Settings"

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Finnish\n"
-"Language: Finnish\n"
-"Lang-Code: fi\n"
-"Country-Code: FI\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Laite"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Laitekohtaiset asetukset"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Suulake"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "Tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Suuttimen halkaisija"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "Suuttimen sisähalkaisija. Muuta tätä asetusta, kun käytössä on muu kuin vakiokokoinen suutin."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "Suuttimen X-siirtymä"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "Suuttimen siirtymän X-koordinaatti."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Suuttimen Y-siirtymä"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "Suuttimen siirtymän Y-koordinaatti."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "Suulakkeen aloitus-GCode"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "Aloitus-GCode, joka suoritetaan suulakkeen käynnistyksen yhteydessä."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Suulakkeen aloitussijainti absoluuttinen"
-
-#: 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 "Tekee suulakkeen aloitussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "Suulakkeen aloitussijainti 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 "Aloitussijainnin X-koordinaatti suulaketta käynnistettäessä."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Suulakkeen aloitussijainti 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 "Aloitussijainnin Y-koordinaatti suulaketta käynnistettäessä."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "Suulakkeen lopetus-GCode"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "Lopetus-GCode, joka suoritetaan, kun suulake poistetaan käytöstä."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Suulakkeen lopetussijainti absoluuttinen"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "Tekee suulakkeen lopetussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "Suulakkeen lopetussijainti 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 "Lopetussijainnin X-koordinaatti, kun suulake poistetaan käytöstä."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Suulakkeen lopetussijainti 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 "Lopetussijainnin Y-koordinaatti, kun suulake poistetaan käytöstä."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Suulakkeen esitäytön Z-sijainti"
-
-#: 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 "Z-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Alustan tarttuvuus"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Tarttuvuus"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "Suulakkeen esitäytön X-sijainti"
-
-#: 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 "X-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Suulakkeen esitäytön Y-sijainti"
-
-#: 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 "Y-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: Finnish\n"
+"Language: Finnish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: fi\n"
+"Country-Code: FI\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Laite"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Laitekohtaiset asetukset"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Suulake"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "Tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Suuttimen halkaisija"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Suuttimen sisähalkaisija. Muuta tätä asetusta, kun käytössä on muu kuin vakiokokoinen suutin."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Suuttimen X-siirtymä"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "Suuttimen siirtymän X-koordinaatti."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Suuttimen Y-siirtymä"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Suuttimen siirtymän Y-koordinaatti."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Suulakkeen aloitus-GCode"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Aloitus-GCode, joka suoritetaan suulakkeen käynnistyksen yhteydessä."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Suulakkeen aloitussijainti absoluuttinen"
+
+#: 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 "Tekee suulakkeen aloitussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Suulakkeen aloitussijainti 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 "Aloitussijainnin X-koordinaatti suulaketta käynnistettäessä."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Suulakkeen aloitussijainti 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 "Aloitussijainnin Y-koordinaatti suulaketta käynnistettäessä."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Suulakkeen lopetus-GCode"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Lopetus-GCode, joka suoritetaan, kun suulake poistetaan käytöstä."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Suulakkeen lopetussijainti absoluuttinen"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Tekee suulakkeen lopetussijainnista absoluuttisen eikä suhteellisen viimeksi tunnettuun pään sijaintiin nähden."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Suulakkeen lopetussijainti 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 "Lopetussijainnin X-koordinaatti, kun suulake poistetaan käytöstä."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Suulakkeen lopetussijainti 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 "Lopetussijainnin Y-koordinaatti, kun suulake poistetaan käytöstä."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Suulakkeen esitäytön Z-sijainti"
+
+#: 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 "Z-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Alustan tarttuvuus"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Tarttuvuus"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Suulakkeen esitäytön X-sijainti"
+
+#: 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 "X-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Suulakkeen esitäytön Y-sijainti"
+
+#: 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 "Y-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa."

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: French\n"
-"Language: French\n"
-"Lang-Code: fr\n"
-"Country-Code: FR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Machine"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Paramètres spécifiques de la machine"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Extrudeuse"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "Le train d'extrudeuse utilisé pour l'impression. Cela est utilisé en multi-extrusion."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Diamètre de la buse"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "Le diamètre intérieur de la buse. Modifiez ce paramètre si vous utilisez une taille de buse non standard."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "Buse Décalage X"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "Les coordonnées X du décalage de la buse."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Buse Décalage Y"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "Les coordonnées Y du décalage de la buse."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "Extrudeuse G-Code de démarrage"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "G-Code de démarrage à exécuter à chaque mise en marche de l'extrudeuse."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Extrudeuse Position de départ absolue"
-
-#: 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 "Rendre la position de départ de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "Extrudeuse Position de départ 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 "Les coordonnées X de la position de départ lors de la mise en marche de l'extrudeuse."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Extrudeuse Position de départ 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 "Les coordonnées Y de la position de départ lors de la mise en marche de l'extrudeuse."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "Extrudeuse G-Code de fin"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "G-Code de fin à exécuter à chaque arrêt de l'extrudeuse."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Extrudeuse Position de fin absolue"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "Rendre la position de fin de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "Extrudeuse Position de fin 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 "Les coordonnées X de la position de fin lors de l'arrêt de l'extrudeuse."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Extrudeuse Position de fin 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 "Les coordonnées Y de la position de fin lors de l'arrêt de l'extrudeuse."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Extrudeuse Position d'amorçage 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."
-msgstr "Les coordonnées Z de la position à laquelle la buse s'amorce au début de l'impression."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Adhérence du plateau"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Adhérence"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "Extrudeuse Position d'amorçage 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."
-msgstr "Les coordonnées X de la position à laquelle la buse s'amorce au début de l'impression."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Extrudeuse Position d'amorçage 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."
-msgstr "Les coordonnées Y de la position à laquelle la buse s'amorce au début de l'impression."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: French\n"
+"Language: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: fr\n"
+"Country-Code: FR\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Machine"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Paramètres spécifiques de la machine"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Extrudeuse"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "Le train d'extrudeuse utilisé pour l'impression. Cela est utilisé en multi-extrusion."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Diamètre de la buse"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Le diamètre intérieur de la buse. Modifiez ce paramètre si vous utilisez une taille de buse non standard."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Buse Décalage X"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "Les coordonnées X du décalage de la buse."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Buse Décalage Y"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Les coordonnées Y du décalage de la buse."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Extrudeuse G-Code de démarrage"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "G-Code de démarrage à exécuter à chaque mise en marche de l'extrudeuse."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Extrudeuse Position de départ absolue"
+
+#: 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 "Rendre la position de départ de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Extrudeuse Position de départ 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 "Les coordonnées X de la position de départ lors de la mise en marche de l'extrudeuse."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Extrudeuse Position de départ 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 "Les coordonnées Y de la position de départ lors de la mise en marche de l'extrudeuse."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Extrudeuse G-Code de fin"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "G-Code de fin à exécuter à chaque arrêt de l'extrudeuse."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Extrudeuse Position de fin absolue"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Rendre la position de fin de l'extrudeuse absolue plutôt que relative à la dernière position connue de la tête."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Extrudeuse Position de fin 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 "Les coordonnées X de la position de fin lors de l'arrêt de l'extrudeuse."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Extrudeuse Position de fin 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 "Les coordonnées Y de la position de fin lors de l'arrêt de l'extrudeuse."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Extrudeuse Position d'amorçage 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."
+msgstr "Les coordonnées Z de la position à laquelle la buse s'amorce au début de l'impression."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Adhérence du plateau"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Adhérence"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Extrudeuse Position d'amorçage 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."
+msgstr "Les coordonnées X de la position à laquelle la buse s'amorce au début de l'impression."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Extrudeuse Position d'amorçage 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."
+msgstr "Les coordonnées Y de la position à laquelle la buse s'amorce au début de l'impression."

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Italian\n"
-"Language: Italian\n"
-"Lang-Code: it\n"
-"Country-Code: IT\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Macchina"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Impostazioni macchina specifiche"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Estrusore"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "Treno estrusore utilizzato per la stampa. Utilizzato nell’estrusione multipla."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Diametro ugello"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "Diametro interno dell'ugello. Modificare questa impostazione quando si utilizza un ugello di dimensioni non standard."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "Offset X ugello"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "La coordinata y dell’offset dell’ugello."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Offset Y ugello"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "La coordinata y dell’offset dell’ugello."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "Codice G avvio estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "Codice G di avvio da eseguire ogniqualvolta si accende l’estrusore."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Assoluto posizione avvio estrusore"
-
-#: 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 "Rende la posizione di partenza estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "X posizione avvio estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x description"
-msgid "The x-coordinate of the starting position when turning the extruder on."
-msgstr "La coordinata x della posizione di partenza all’accensione dell’estrusore."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Y posizione avvio estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y description"
-msgid "The y-coordinate of the starting position when turning the extruder on."
-msgstr "La coordinata y della posizione di partenza all’accensione dell’estrusore."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "Codice G fine estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "Codice G di fine da eseguire ogniqualvolta si spegne l’estrusore."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Assoluto posizione fine estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "Rende la posizione di fine estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "Posizione X fine estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x description"
-msgid "The x-coordinate of the ending position when turning the extruder off."
-msgstr "La coordinata x della posizione di fine allo spegnimento dell’estrusore."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Posizione Y fine estrusore"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y description"
-msgid "The y-coordinate of the ending position when turning the extruder off."
-msgstr "La coordinata y della posizione di fine allo spegnimento dell’estrusore."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Posizione Z innesco estrusore"
-
-#: 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 "Indica la coordinata Z della posizione in cui l’ugello si innesca all’avvio della stampa."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Adesione piano di stampa"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Adesione"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "Posizione X innesco estrusore"
-
-#: 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 "La coordinata X della posizione in cui l’ugello si innesca all’avvio della stampa."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Posizione Y innesco estrusore"
-
-#: 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 "La coordinata Y della posizione in cui l’ugello si innesca all’avvio della stampa."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: Italian\n"
+"Language: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: it\n"
+"Country-Code: IT\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Macchina"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Impostazioni macchina specifiche"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Estrusore"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "Treno estrusore utilizzato per la stampa. Utilizzato nell’estrusione multipla."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Diametro ugello"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Diametro interno dell'ugello. Modificare questa impostazione quando si utilizza un ugello di dimensioni non standard."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Offset X ugello"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "La coordinata y dell’offset dell’ugello."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Offset Y ugello"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "La coordinata y dell’offset dell’ugello."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Codice G avvio estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Codice G di avvio da eseguire ogniqualvolta si accende l’estrusore."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Assoluto posizione avvio estrusore"
+
+#: 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 "Rende la posizione di partenza estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "X posizione avvio estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "La coordinata x della posizione di partenza all’accensione dell’estrusore."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Y posizione avvio estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "La coordinata y della posizione di partenza all’accensione dell’estrusore."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Codice G fine estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Codice G di fine da eseguire ogniqualvolta si spegne l’estrusore."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Assoluto posizione fine estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Rende la posizione di fine estrusore assoluta anziché relativa rispetto all’ultima posizione nota della testina."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Posizione X fine estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr "La coordinata x della posizione di fine allo spegnimento dell’estrusore."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Posizione Y fine estrusore"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr "La coordinata y della posizione di fine allo spegnimento dell’estrusore."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Posizione Z innesco estrusore"
+
+#: 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 "Indica la coordinata Z della posizione in cui l’ugello si innesca all’avvio della stampa."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Adesione piano di stampa"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Adesione"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Posizione X innesco estrusore"
+
+#: 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 "La coordinata X della posizione in cui l’ugello si innesca all’avvio della stampa."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Posizione Y innesco estrusore"
+
+#: 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 "La coordinata Y della posizione in cui l’ugello si innesca all’avvio della stampa."

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-26 17:30+0900\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
 "Language: ja\n"
-"Lang-Code: ja\n"
-"Country-Code: JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: ja\n"
+"Country-Code: JP\n"
 "X-Generator: Poedit 2.0.2\n"
 
 #: fdmextruder.def.json
@@ -39,6 +39,16 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr "エクストルーダーの列。デュアルノズル印刷時に使用。"
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-26 17:52+0900\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
 "Language: ja\n"
-"Lang-Code: ja\n"
-"Country-Code: JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: ja\n"
+"Country-Code: JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.2\n"
 
@@ -42,8 +42,8 @@ msgstr "3Dプリンターの機種名"
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants label"
-msgid "Show machine variants"
-msgstr "プリンターのバリエーションを表示する"
+msgid "Show Machine Variants"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants description"
@@ -90,8 +90,8 @@ msgstr "マテリアルのGUID。これは自動的に設定されます。"
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait label"
-msgid "Wait for build plate heatup"
-msgstr "ビルドプレート加熱時の待機"
+msgid "Wait for Build Plate Heatup"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait description"
@@ -100,8 +100,8 @@ msgstr "開始時にビルドプレートが温度に達するまで待つコマ
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait label"
-msgid "Wait for nozzle heatup"
-msgstr "ノズル加熱時の待機"
+msgid "Wait for Nozzle Heatup"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait description"
@@ -110,8 +110,8 @@ msgstr "開始時にノズルの温度が達するまで待つかどうか。"
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend label"
-msgid "Include material temperatures"
-msgstr "ノズル温度設定の挿入"
+msgid "Include Material Temperatures"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend description"
@@ -120,8 +120,8 @@ msgstr "GCodeの開始時にノズル温度設定を含めるかどうか。 既
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend label"
-msgid "Include build plate temperature"
-msgstr "ビルドプレート温度設定の挿入"
+msgid "Include Build Plate Temperature"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend description"
@@ -130,8 +130,8 @@ msgstr "GCodeの開始時にビルドプレート温度設定を含めるかど
 
 #: fdmprinter.def.json
 msgctxt "machine_width label"
-msgid "Machine width"
-msgstr "造形サイズ(X)"
+msgid "Machine Width"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_width description"
@@ -140,8 +140,8 @@ msgstr "造形可能領域の幅（X方向）。"
 
 #: fdmprinter.def.json
 msgctxt "machine_depth label"
-msgid "Machine depth"
-msgstr "造形サイズ(Y)"
+msgid "Machine Depth"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_depth description"
@@ -150,8 +150,8 @@ msgstr "造形可能領域の幅（Y方向）。"
 
 #: fdmprinter.def.json
 msgctxt "machine_shape label"
-msgid "Build plate shape"
-msgstr "ビルドプレートの形"
+msgid "Build Plate Shape"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_shape description"
@@ -170,8 +170,8 @@ msgstr "楕円形"
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
-msgid "Machine height"
-msgstr "造形サイズ(Z)"
+msgid "Machine Height"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_height description"
@@ -180,8 +180,8 @@ msgstr "造形可能領域の幅（Z方向）。"
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed label"
-msgid "Has heated build plate"
-msgstr "ヒートベッドの有無"
+msgid "Has Heated Build Plate"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed description"
@@ -190,8 +190,8 @@ msgstr "プリンターに加熱式ビルドプレートが付属しているか
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
-msgid "Is center origin"
-msgstr "原点"
+msgid "Is Center Origin"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero description"
@@ -310,13 +310,18 @@ msgstr "生成するGコードの種類"
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
-msgid "RepRap (Marlin/Sprinter)"
-msgstr "RepRap (Marlin/Sprinter)"
+msgid "Marlin"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
-msgid "RepRap (Volumetric)"
-msgstr "RepRap (Volumetric)"
+msgctxt "machine_gcode_flavor option RepRap (Volumetric)"
+msgid "Marlin (Volumetric)"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_gcode_flavor option RepRap (RepRap)"
+msgid "RepRap"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option UltiGCode"
@@ -398,6 +403,16 @@ msgctxt "gantry_height description"
 msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)."
 msgstr "ノズルの先端とガントリーシステムの高さの差（X軸とY軸）。"
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmprinter.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 ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
@@ -638,6 +653,16 @@ msgctxt "wall_line_width_x description"
 msgid "Width of a single wall line for all wall lines except the outermost one."
 msgstr "一番外側のウォールラインを除くすべてのウォールラインのラインの幅。"
 
+#: fdmprinter.def.json
+msgctxt "roofing_line_width label"
+msgid "Top Surface Skin Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_line_width description"
+msgid "Width of a single line of the areas at the top of the print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_line_width label"
 msgid "Top/Bottom Line Width"
@@ -718,6 +743,16 @@ msgctxt "prime_tower_line_width description"
 msgid "Width of a single prime tower line."
 msgstr "単一のプライムタワーラインの幅。"
 
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor label"
+msgid "Initial Layer Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor description"
+msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "shell label"
 msgid "Shell"
@@ -728,6 +763,36 @@ msgctxt "shell description"
 msgid "Shell"
 msgstr "外郭"
 
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr label"
+msgid "Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr description"
+msgid "The extruder train used for printing the walls. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr label"
+msgid "Outer Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr description"
+msgid "The extruder train used for printing the outer wall. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr label"
+msgid "Inner Walls Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr description"
+msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_thickness label"
 msgid "Wall Thickness"
@@ -735,8 +800,8 @@ msgstr "Wall Thickness"
 
 #: fdmprinter.def.json
 msgctxt "wall_thickness description"
-msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
-msgstr "水平方向の外壁厚さ　この値をウォールライン幅で割ることで、ウォール数を定義します。"
+msgid "The thickness of the walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "wall_line_count label"
@@ -758,6 +823,71 @@ msgctxt "wall_0_wipe_dist description"
 msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better."
 msgstr "外壁の後に挿入された移動の距離はZシームをよりよく隠します。"
 
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr label"
+msgid "Top Surface Skin Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr description"
+msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count label"
+msgid "Top Surface Skin Layers"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count description"
+msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern label"
+msgid "Top Surface Skin Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern description"
+msgid "The pattern of the top most layers."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles label"
+msgid "Top Surface Skin Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles description"
+msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr label"
+msgid "Top/Bottom Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr description"
+msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -948,6 +1078,16 @@ msgctxt "fill_perimeter_gaps option everywhere"
 msgid "Everywhere"
 msgstr "Everywhere"
 
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps label"
+msgid "Print Thin Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps description"
+msgid "Print pieces of the model which are horizontally thinner than the nozzle size."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -958,6 +1098,16 @@ msgctxt "xy_offset description"
 msgid "Amount of offset applied to all polygons in each layer. Positive values can compensate for too big holes; negative values can compensate for too small holes."
 msgstr "各レイヤーのすべてのポリゴンに適用されるオフセットの量。正の値は大きすぎる穴を補うことができます。負の値は小さすぎる穴を補うことができます。"
 
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 label"
+msgid "Initial Layer Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 description"
+msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -1005,6 +1155,16 @@ msgctxt "z_seam_y description"
 msgid "The Y coordinate of the position near where to start printing each part in a layer."
 msgstr "レイヤー内の各パーツの印刷を開始する場所の近くのY座標。"
 
+#: fdmprinter.def.json
+msgctxt "z_seam_relative label"
+msgid "Z Seam Relative"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_relative description"
+msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1025,6 +1185,16 @@ msgctxt "infill description"
 msgid "Infill"
 msgstr "インフィル"
 
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr label"
+msgid "Infill Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr description"
+msgid "The extruder train used for printing infill. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_sparse_density label"
 msgid "Infill Density"
@@ -1110,56 +1280,6 @@ msgctxt "infill_angles description"
 msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns)."
 msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストです。これは、従来のデフォルト角度（線とジグザグのパターンでは45と135度、他のすべてのパターンでは45度）を使用することを意味します。"
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "時々インフィルを印刷してください、オブジェクト内でフィラメントがぐちゃぐちゃに巻き上がります。印刷時間は短縮できるが、フィラメントの動きは予想不可能となります。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
-msgstr "最大角度 w.r.t.-印刷範囲内がスパゲッティ・インフィルで埋まるZ軸。この値を下げることでモデルの斜め部分にインフィルが各レイヤーに付着します。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid "The maximum height of inside space which can be combined and filled from the top."
-msgstr "内部空間の上から結合して埋め込むことができる最大の高さ"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "スパゲッティ・インフィルがプリントされる壁からのオフセット。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
-msgstr "スパゲッティ・インフィルの密度を調整します。インフィルの密度は、行間枠のパターンを決めるだけで、スパゲッティ・インフィルの押出量は制御しないことにご注意ください。"
-
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_add label"
 msgid "Cubic Subdivision Shell"
@@ -1197,8 +1317,8 @@ msgstr "Skin Overlap Percentage"
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap description"
-msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
-msgstr "スキンと壁の間のオーバーラップ量　わずかなオーバーラップによって壁がスキンにしっかりつながります。"
+msgid "The amount of overlap between the skin and the walls as a percentage of the line width. A slight overlap allows the walls to connect firmly to the skin. This is a percentage of the average line widths of the skin lines and the innermost wall."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap_mm label"
@@ -1675,6 +1795,16 @@ msgctxt "speed_wall_x description"
 msgid "The speed at which all inner walls are printed. Printing the inner wall faster than the outer wall will reduce printing time. It works well to set this in between the outer wall speed and the infill speed."
 msgstr "内側のウォールをプリントする速度　外壁より内壁を高速でプリントすると、印刷時間の短縮になります。外壁のプリント速度とインフィルのプリント速度の中間に設定するのが適切です。"
 
+#: fdmprinter.def.json
+msgctxt "speed_roofing label"
+msgid "Top Surface Skin Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_roofing description"
+msgid "The speed at which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_topbottom label"
 msgid "Top/Bottom Speed"
@@ -1685,6 +1815,16 @@ msgctxt "speed_topbottom description"
 msgid "The speed at which top/bottom layers are printed."
 msgstr "トップ/ボトムのレイヤーのプリント速度"
 
+#: fdmprinter.def.json
+msgctxt "speed_ironing label"
+msgid "Ironing Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_ironing description"
+msgid "The speed at which to pass over the top surface."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_support label"
 msgid "Support Speed"
@@ -1895,6 +2035,16 @@ msgctxt "acceleration_wall_x description"
 msgid "The acceleration with which all inner walls are printed."
 msgstr "内側のウォールがが出力される際のスピード。"
 
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing label"
+msgid "Top Surface Skin Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing description"
+msgid "The acceleration with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_topbottom label"
 msgid "Top/Bottom Acceleration"
@@ -1905,6 +2055,16 @@ msgctxt "acceleration_topbottom description"
 msgid "The acceleration with which top/bottom layers are printed."
 msgstr "トップとボトムのレイヤーの印刷加速度。"
 
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing label"
+msgid "Ironing Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing description"
+msgid "The acceleration with which ironing is performed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_support label"
 msgid "Support Acceleration"
@@ -2075,6 +2235,16 @@ msgctxt "jerk_wall_x description"
 msgid "The maximum instantaneous velocity change with which all inner walls are printed."
 msgstr "内側のウォールがプリントされれう際の最大瞬間速度の変更。"
 
+#: fdmprinter.def.json
+msgctxt "jerk_roofing label"
+msgid "Top Surface Skin Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_roofing description"
+msgid "The maximum instantaneous velocity change with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_topbottom label"
 msgid "Top/Bottom Jerk"
@@ -2085,6 +2255,16 @@ msgctxt "jerk_topbottom description"
 msgid "The maximum instantaneous velocity change with which top/bottom layers are printed."
 msgstr "トップとボトムのレイヤーを印刷する際の最大瞬間速度の変更。"
 
+#: fdmprinter.def.json
+msgctxt "jerk_ironing label"
+msgid "Ironing Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_ironing description"
+msgid "The maximum instantaneous velocity change while performing ironing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_support label"
 msgid "Support Jerk"
@@ -2613,6 +2793,26 @@ msgctxt "support_connect_zigzags description"
 msgid "Connect the ZigZags. This will increase the strength of the zig zag support structure."
 msgstr "ジグザグを接続します。ジグザグ形のサポート材の強度が上がります。"
 
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags label"
+msgid "Skip Some ZigZags Connections"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags description"
+msgid "Skip some ZigZags connections to make the support structure easier to break."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count label"
+msgid "ZigZag Connection Skip Count"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count description"
+msgid "Skip one in every N connection lines to make the support structure easier to break."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_infill_rate label"
 msgid "Support Density"
@@ -2743,6 +2943,36 @@ msgctxt "support_offset description"
 msgid "Amount of offset applied to all support polygons in each layer. Positive values can smooth out the support areas and result in more sturdy support."
 msgstr "各レイヤーのサポート用ポリゴンに適用されるオフセットの量。正の値はサポート領域を円滑にし、より丈夫なサポートにつながります。"
 
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness label"
+msgid "Support Infill Layer Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness description"
+msgid "The thickness per layer of support infill material. This value should always be a multiple of the layer height and is otherwise rounded."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps label"
+msgid "Gradual Support Infill Steps"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps description"
+msgid "Number of times to reduce the support infill density by half when getting further below top surfaces. Areas which are closer to top surfaces get a higher density, up to the Support Infill Density."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height label"
+msgid "Gradual Support Infill Step Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height description"
+msgid "The height of support infill of a given density before switching to half the density."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_enable label"
 msgid "Enable Support Interface"
@@ -3555,6 +3785,16 @@ msgctxt "dual_pre_wipe description"
 msgid "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print."
 msgstr "エクストルーダーを切り替えた後、最初に印刷したものの上にあるノズルから滲み出したマテリアルを拭き取ってください。余分に出たマテリアルがプリントの表面品質に与える影響が最も少ない場所で、ゆっくりと払拭を行います。"
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume label"
+msgid "Prime Tower Purge Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume description"
+msgid "Amount of filament to be purged when wiping on the prime tower. Purging is useful for compensating the filament lost by oozing during inactivity of the nozzle."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "ooze_shield_enabled label"
 msgid "Enable Ooze Shield"
@@ -3980,6 +4220,76 @@ msgctxt "skin_alternate_rotation description"
 msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions."
 msgstr "トップ/ボトムのレイヤーが印刷される方向を変更します。通常、それらは斜めに印刷されます。この設定では、X方向のみとY方向のみが追加されます。"
 
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled description"
+msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
+msgstr "時々インフィルを印刷してください、オブジェクト内でフィラメントがぐちゃぐちゃに巻き上がります。印刷時間は短縮できるが、フィラメントの動きは予想不可能となります。"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped label"
+msgid "Spaghetti Infill Stepping"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped description"
+msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle label"
+msgid "Spaghetti Maximum Infill Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle description"
+msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
+msgstr "最大角度 w.r.t.-印刷範囲内がスパゲッティ・インフィルで埋まるZ軸。この値を下げることでモデルの斜め部分にインフィルが各レイヤーに付着します。"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height label"
+msgid "Spaghetti Infill Maximum Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height description"
+msgid "The maximum height of inside space which can be combined and filled from the top."
+msgstr "内部空間の上から結合して埋め込むことができる最大の高さ"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset label"
+msgid "Spaghetti Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset description"
+msgid "The offset from the walls from where the spaghetti infill will be printed."
+msgstr "スパゲッティ・インフィルがプリントされる壁からのオフセット。"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow label"
+msgid "Spaghetti Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow description"
+msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
+msgstr "スパゲッティ・インフィルの密度を調整します。インフィルの密度は、行間枠のパターンを決めるだけで、スパゲッティ・インフィルの押出量は制御しないことにご注意ください。"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume label"
+msgid "Spaghetti Infill Extra Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume description"
+msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -4317,6 +4627,66 @@ msgctxt "wireframe_nozzle_clearance description"
 msgid "Distance between the nozzle and horizontally downward lines. Larger clearance results in diagonally downward lines with a less steep angle, which in turn results in less upward connections with the next layer. Only applies to Wire Printing."
 msgstr "ノズルと水平方向に下向きの線間の距離。大きな隙間がある場合、急な角度で斜め下方線となり、次の層が上方接続しずらくなる。ワイヤ印刷にのみ適用されます。"
 
+#: fdmprinter.def.json
+msgctxt "ironing_enabled label"
+msgid "Enable Ironing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_enabled description"
+msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern label"
+msgid "Ironing Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern description"
+msgid "The pattern to use for ironing top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing label"
+msgid "Ironing Line Spacing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing description"
+msgid "The distance between the lines of ironing."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow label"
+msgid "Ironing Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow description"
+msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset label"
+msgid "Ironing Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset description"
+msgid "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"
 msgid "Command Line Settings"
@@ -4377,6 +4747,66 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。"
 
+#~ msgctxt "machine_show_variants label"
+#~ msgid "Show machine variants"
+#~ msgstr "プリンターのバリエーションを表示する"
+
+#~ msgctxt "material_bed_temp_wait label"
+#~ msgid "Wait for build plate heatup"
+#~ msgstr "ビルドプレート加熱時の待機"
+
+#~ msgctxt "material_print_temp_wait label"
+#~ msgid "Wait for nozzle heatup"
+#~ msgstr "ノズル加熱時の待機"
+
+#~ msgctxt "material_print_temp_prepend label"
+#~ msgid "Include material temperatures"
+#~ msgstr "ノズル温度設定の挿入"
+
+#~ msgctxt "material_bed_temp_prepend label"
+#~ msgid "Include build plate temperature"
+#~ msgstr "ビルドプレート温度設定の挿入"
+
+#~ msgctxt "machine_width label"
+#~ msgid "Machine width"
+#~ msgstr "造形サイズ(X)"
+
+#~ msgctxt "machine_depth label"
+#~ msgid "Machine depth"
+#~ msgstr "造形サイズ(Y)"
+
+#~ msgctxt "machine_shape label"
+#~ msgid "Build plate shape"
+#~ msgstr "ビルドプレートの形"
+
+#~ msgctxt "machine_height label"
+#~ msgid "Machine height"
+#~ msgstr "造形サイズ(Z)"
+
+#~ msgctxt "machine_heated_bed label"
+#~ msgid "Has heated build plate"
+#~ msgstr "ヒートベッドの有無"
+
+#~ msgctxt "machine_center_is_zero label"
+#~ msgid "Is center origin"
+#~ msgstr "原点"
+
+#~ msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
+#~ msgid "RepRap (Marlin/Sprinter)"
+#~ msgstr "RepRap (Marlin/Sprinter)"
+
+#~ msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
+#~ msgid "RepRap (Volumetric)"
+#~ msgstr "RepRap (Volumetric)"
+
+#~ msgctxt "wall_thickness description"
+#~ msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+#~ msgstr "水平方向の外壁厚さ　この値をウォールライン幅で割ることで、ウォール数を定義します。"
+
+#~ msgctxt "skin_overlap description"
+#~ msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
+#~ msgstr "スキンと壁の間のオーバーラップ量　わずかなオーバーラップによって壁がスキンにしっかりつながります。"
+
 #~ msgctxt "support_interface_line_width description"
 #~ msgid "Width of a single support interface line."
 #~ msgstr "単一のサポートインタフェースラインの幅。"

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-19 17:36+0900\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
 "Language: ko\n"
-"Lang-Code: ko\n"
-"Country-Code: KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: ko\n"
+"Country-Code: KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.1\n"
 
@@ -40,6 +40,16 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr "인쇄에 사용되는 압출기 트레인. 이것은 다중 압출에 사용됩니다. "
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"

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

@@ -2,12 +2,12 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-23 16:16+0900\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
@@ -40,7 +40,7 @@ msgstr "3D 프린터 모델의 이름입니다. "
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants label"
-msgid "Show machine variants"
+msgid "Show Machine Variants"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -84,7 +84,7 @@ msgstr "재료의 GUID. 자동으로 설정됩니다. "
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait label"
-msgid "Wait for build plate heatup"
+msgid "Wait for Build Plate Heatup"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -94,7 +94,7 @@ msgstr "시작 시, 빌드 플레이트 온도에 도달 할 때까지 대기하
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait label"
-msgid "Wait for nozzle heatup"
+msgid "Wait for Nozzle Heatup"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -104,7 +104,7 @@ msgstr "시작 시, 노즐 온도에 도달 할 때까지 대기할지 여부 "
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend label"
-msgid "Include material temperatures"
+msgid "Include Material Temperatures"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -114,7 +114,7 @@ msgstr "gcode의 시작 부분에 노즐 온도 명령을 포함할지 여부. s
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend label"
-msgid "Include build plate temperature"
+msgid "Include Build Plate Temperature"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -124,7 +124,7 @@ msgstr "gcode가 시작될 때 빌드 플레이트 온도 명령을 포함할지
 
 #: fdmprinter.def.json
 msgctxt "machine_width label"
-msgid "Machine width"
+msgid "Machine Width"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -134,7 +134,7 @@ msgstr "인쇄 가능 영역의 폭 (X 방향) "
 
 #: fdmprinter.def.json
 msgctxt "machine_depth label"
-msgid "Machine depth"
+msgid "Machine Depth"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -144,7 +144,7 @@ msgstr "인쇄 가능 영역의 깊이 (Y 방향) "
 
 #: fdmprinter.def.json
 msgctxt "machine_shape label"
-msgid "Build plate shape"
+msgid "Build Plate Shape"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -164,7 +164,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
-msgid "Machine height"
+msgid "Machine Height"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -174,7 +174,7 @@ msgstr "인쇄 가능 영역의 높이 (Z 방향)입니다. "
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed label"
-msgid "Has heated build plate"
+msgid "Has Heated Build Plate"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -184,7 +184,7 @@ msgstr "기계에 가열 된 빌드 플레이트가 있는지 여부 "
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
-msgid "Is center origin"
+msgid "Is Center Origin"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -304,12 +304,17 @@ msgstr "생성 될 gcode 유형입니다. "
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
-msgid "RepRap (Marlin/Sprinter)"
+msgid "Marlin"
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
-msgid "RepRap (Volumetric)"
+msgctxt "machine_gcode_flavor option RepRap (Volumetric)"
+msgid "Marlin (Volumetric)"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_gcode_flavor option RepRap (RepRap)"
+msgid "RepRap"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -392,6 +397,16 @@ msgctxt "gantry_height description"
 msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)."
 msgstr "노즐 끝과 갠트리 시스템 사이의 높이 차이 (X 및 Y 축). "
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmprinter.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 ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
@@ -632,6 +647,16 @@ msgctxt "wall_line_width_x description"
 msgid "Width of a single wall line for all wall lines except the outermost one."
 msgstr "가장 바깥 쪽 벽 선을 제외한 모든 벽 선에 대해 단일 벽 선의 폭입니다. "
 
+#: fdmprinter.def.json
+msgctxt "roofing_line_width label"
+msgid "Top Surface Skin Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_line_width description"
+msgid "Width of a single line of the areas at the top of the print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_line_width label"
 msgid "Top/Bottom Line Width"
@@ -712,6 +737,16 @@ msgctxt "prime_tower_line_width description"
 msgid "Width of a single prime tower line."
 msgstr "단일 주요 타워 선의 너비. "
 
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor label"
+msgid "Initial Layer Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor description"
+msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "shell label"
 msgid "Shell"
@@ -722,6 +757,36 @@ msgctxt "shell description"
 msgid "Shell"
 msgstr "껍질 "
 
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr label"
+msgid "Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr description"
+msgid "The extruder train used for printing the walls. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr label"
+msgid "Outer Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr description"
+msgid "The extruder train used for printing the outer wall. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr label"
+msgid "Inner Walls Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr description"
+msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_thickness label"
 msgid "Wall Thickness"
@@ -729,8 +794,8 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "wall_thickness description"
-msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
-msgstr "외벽의 수평 방향의 두께. 이 값을 벽 선 너비로 나눈 값은 벽의 수를 정의합니다. "
+msgid "The thickness of the walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "wall_line_count label"
@@ -752,6 +817,71 @@ msgctxt "wall_0_wipe_dist description"
 msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better."
 msgstr "바깥 쪽 벽 뒤에 삽입 된 이동 거리. Z 솔기를 더 잘 숨 깁니다. "
 
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr label"
+msgid "Top Surface Skin Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr description"
+msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count label"
+msgid "Top Surface Skin Layers"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count description"
+msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern label"
+msgid "Top Surface Skin Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern description"
+msgid "The pattern of the top most layers."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles label"
+msgid "Top Surface Skin Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles description"
+msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr label"
+msgid "Top/Bottom Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr description"
+msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -942,6 +1072,16 @@ msgctxt "fill_perimeter_gaps option everywhere"
 msgid "Everywhere"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps label"
+msgid "Print Thin Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps description"
+msgid "Print pieces of the model which are horizontally thinner than the nozzle size."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -952,6 +1092,16 @@ msgctxt "xy_offset description"
 msgid "Amount of offset applied to all polygons in each layer. Positive values can compensate for too big holes; negative values can compensate for too small holes."
 msgstr "각 레이어의 모든 다각형에 적용된 오프셋의 양입니다. 양수 값은 너무 큰 구멍을 보완 할 수 있습니다. 음수 값은 너무 작은 구멍을 보완 할 수 있습니다. "
 
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 label"
+msgid "Initial Layer Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 description"
+msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -997,6 +1147,16 @@ msgctxt "z_seam_y description"
 msgid "The Y coordinate of the position near where to start printing each part in a layer."
 msgstr "레이어의 각 부분을 인쇄 할 위치 근처의 위치에 대한 Y 좌표입니다. "
 
+#: fdmprinter.def.json
+msgctxt "z_seam_relative label"
+msgid "Z Seam Relative"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_relative description"
+msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1017,6 +1177,16 @@ msgctxt "infill description"
 msgid "Infill"
 msgstr "충진 "
 
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr label"
+msgid "Infill Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr description"
+msgid "The extruder train used for printing infill. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_sparse_density label"
 msgid "Infill Density"
@@ -1102,56 +1272,6 @@ msgctxt "infill_angles description"
 msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns)."
 msgstr "사용할 정수선 방향 목록. 목록의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 목록의 끝에 도달하면 처음부터 다시 시작됩니다. 목록 항목은 쉼표로 구분되며 전체 목록은 대괄호 안에 들어 있습니다. 기본값은 전통적인 기본 각도 (선 및 지그재그 패턴의 경우 45 및 135도, 다른 모든 패턴의 경우 45도)를 사용한다는 의미의 빈 목록입니다. "
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "필라멘트가 물체 내부에서 혼란스럽게 뒤 틀릴 수 있도록 필러를 너무 자주 인쇄하십시오. 이렇게하면 인쇄 시간이 줄어들지 만 예측할 수없는 행동입니다. "
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
-msgstr "최대 각도 w.r.t. 나중에 스파게티가 채워질 영역에 대한 인쇄 내부의 Z 축. 이 값을 낮추면 모델의 각진 부분이 각 레이어에 채워집니다. "
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid "The maximum height of inside space which can be combined and filled from the top."
-msgstr "상단에서 결합하여 채울 수있는 내부 공간의 최대 높이입니다. "
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "스파게티가 채워지는 벽의 오프셋. "
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
-msgstr "스파게티 주입 물의 밀도를 조정합니다. Infill Density는 스파게티 필링의 돌출 량이 아니라 채우기 패턴의 줄 간격 만 제어합니다. "
-
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_add label"
 msgid "Cubic Subdivision Shell"
@@ -1189,8 +1309,8 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap description"
-msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
-msgstr "피부와 벽 사이의 겹침 정도입니다. 약간 겹치면 벽이 피부에 단단히 연결됩니다. "
+msgid "The amount of overlap between the skin and the walls as a percentage of the line width. A slight overlap allows the walls to connect firmly to the skin. This is a percentage of the average line widths of the skin lines and the innermost wall."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap_mm label"
@@ -1662,6 +1782,16 @@ msgctxt "speed_wall_x description"
 msgid "The speed at which all inner walls are printed. Printing the inner wall faster than the outer wall will reduce printing time. It works well to set this in between the outer wall speed and the infill speed."
 msgstr "모든 내부 벽이 인쇄되는 속도입니다. 내벽을 외벽보다 빠르게 인쇄하면 인쇄 시간이 단축됩니다. 외벽 속도와 충전 속도 사이에서 이것을 설정하는 것이 효과적입니다. "
 
+#: fdmprinter.def.json
+msgctxt "speed_roofing label"
+msgid "Top Surface Skin Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_roofing description"
+msgid "The speed at which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_topbottom label"
 msgid "Top/Bottom Speed"
@@ -1672,6 +1802,16 @@ msgctxt "speed_topbottom description"
 msgid "The speed at which top/bottom layers are printed."
 msgstr "위쪽 / 아래쪽 레이어가 인쇄되는 속도입니다. "
 
+#: fdmprinter.def.json
+msgctxt "speed_ironing label"
+msgid "Ironing Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_ironing description"
+msgid "The speed at which to pass over the top surface."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_support label"
 msgid "Support Speed"
@@ -1882,6 +2022,16 @@ msgctxt "acceleration_wall_x description"
 msgid "The acceleration with which all inner walls are printed."
 msgstr "모든 내부 벽이 인쇄되는 가속도입니다. "
 
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing label"
+msgid "Top Surface Skin Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing description"
+msgid "The acceleration with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_topbottom label"
 msgid "Top/Bottom Acceleration"
@@ -1892,6 +2042,16 @@ msgctxt "acceleration_topbottom description"
 msgid "The acceleration with which top/bottom layers are printed."
 msgstr "위쪽 / 아래쪽 레이어가 인쇄되는 가속도입니다. "
 
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing label"
+msgid "Ironing Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing description"
+msgid "The acceleration with which ironing is performed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_support label"
 msgid "Support Acceleration"
@@ -2062,6 +2222,16 @@ msgctxt "jerk_wall_x description"
 msgid "The maximum instantaneous velocity change with which all inner walls are printed."
 msgstr "모든 내부 벽이 인쇄되는 최대 순간 속도 변화. "
 
+#: fdmprinter.def.json
+msgctxt "jerk_roofing label"
+msgid "Top Surface Skin Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_roofing description"
+msgid "The maximum instantaneous velocity change with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_topbottom label"
 msgid "Top/Bottom Jerk"
@@ -2072,6 +2242,16 @@ msgctxt "jerk_topbottom description"
 msgid "The maximum instantaneous velocity change with which top/bottom layers are printed."
 msgstr "상단 / 하단 레이어가 인쇄되는 최대 순간 속도 변화. "
 
+#: fdmprinter.def.json
+msgctxt "jerk_ironing label"
+msgid "Ironing Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_ironing description"
+msgid "The maximum instantaneous velocity change while performing ironing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_support label"
 msgid "Support Jerk"
@@ -2597,6 +2777,26 @@ msgctxt "support_connect_zigzags description"
 msgid "Connect the ZigZags. This will increase the strength of the zig zag support structure."
 msgstr "지그재그를 연결하십시오. 이것은 지그재그지지 구조의 강도를 증가시킵니다. "
 
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags label"
+msgid "Skip Some ZigZags Connections"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags description"
+msgid "Skip some ZigZags connections to make the support structure easier to break."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count label"
+msgid "ZigZag Connection Skip Count"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count description"
+msgid "Skip one in every N connection lines to make the support structure easier to break."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_infill_rate label"
 msgid "Support Density"
@@ -2727,6 +2927,36 @@ msgctxt "support_offset description"
 msgid "Amount of offset applied to all support polygons in each layer. Positive values can smooth out the support areas and result in more sturdy support."
 msgstr "각 레이어의 모든 지원 다각형에 적용된 오프셋의 양입니다. 양수 값을 사용하면 지원 영역이 원활 해지며보다 견고한 지원을받을 수 있습니다. "
 
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness label"
+msgid "Support Infill Layer Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness description"
+msgid "The thickness per layer of support infill material. This value should always be a multiple of the layer height and is otherwise rounded."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps label"
+msgid "Gradual Support Infill Steps"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps description"
+msgid "Number of times to reduce the support infill density by half when getting further below top surfaces. Areas which are closer to top surfaces get a higher density, up to the Support Infill Density."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height label"
+msgid "Gradual Support Infill Step Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height description"
+msgid "The height of support infill of a given density before switching to half the density."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_enable label"
 msgid "Enable Support Interface"
@@ -3539,6 +3769,16 @@ msgctxt "dual_pre_wipe description"
 msgid "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print."
 msgstr "압출기를 전환 한 후, 인쇄 된 첫 번째 것을 노즐에서 닦아 낸 물질을 닦아냅니다. 이렇게하면 흘러 나온 물질이 인쇄물의 표면 품질에 가장 해를 입히는 곳에서 안전한 천천히 닦아줍니다. "
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume label"
+msgid "Prime Tower Purge Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume description"
+msgid "Amount of filament to be purged when wiping on the prime tower. Purging is useful for compensating the filament lost by oozing during inactivity of the nozzle."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "ooze_shield_enabled label"
 msgid "Enable Ooze Shield"
@@ -3964,6 +4204,76 @@ msgctxt "skin_alternate_rotation description"
 msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions."
 msgstr "위쪽 / 아래쪽 레이어가 인쇄되는 방향을 바꿉니다. 보통 대각선으로 만 인쇄됩니다. 이 설정은 X 전용 및 Y 전용 방향을 추가합니다. "
 
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled description"
+msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
+msgstr "필라멘트가 물체 내부에서 혼란스럽게 뒤 틀릴 수 있도록 필러를 너무 자주 인쇄하십시오. 이렇게하면 인쇄 시간이 줄어들지 만 예측할 수없는 행동입니다. "
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped label"
+msgid "Spaghetti Infill Stepping"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped description"
+msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle label"
+msgid "Spaghetti Maximum Infill Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle description"
+msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
+msgstr "최대 각도 w.r.t. 나중에 스파게티가 채워질 영역에 대한 인쇄 내부의 Z 축. 이 값을 낮추면 모델의 각진 부분이 각 레이어에 채워집니다. "
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height label"
+msgid "Spaghetti Infill Maximum Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height description"
+msgid "The maximum height of inside space which can be combined and filled from the top."
+msgstr "상단에서 결합하여 채울 수있는 내부 공간의 최대 높이입니다. "
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset label"
+msgid "Spaghetti Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset description"
+msgid "The offset from the walls from where the spaghetti infill will be printed."
+msgstr "스파게티가 채워지는 벽의 오프셋. "
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow label"
+msgid "Spaghetti Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow description"
+msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
+msgstr "스파게티 주입 물의 밀도를 조정합니다. Infill Density는 스파게티 필링의 돌출 량이 아니라 채우기 패턴의 줄 간격 만 제어합니다. "
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume label"
+msgid "Spaghetti Infill Extra Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume description"
+msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -4301,6 +4611,66 @@ msgctxt "wireframe_nozzle_clearance description"
 msgid "Distance between the nozzle and horizontally downward lines. Larger clearance results in diagonally downward lines with a less steep angle, which in turn results in less upward connections with the next layer. Only applies to Wire Printing."
 msgstr "노즐과 수평 아래쪽 라인 사이의 거리. 클리어런스가 클수록 비스듬한 각도에서 비스듬히 아래쪽으로 선이 그어져 다음 층과의 연결이보다 적어집니다. 와이어 인쇄에만 적용됩니다. "
 
+#: fdmprinter.def.json
+msgctxt "ironing_enabled label"
+msgid "Enable Ironing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_enabled description"
+msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern label"
+msgid "Ironing Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern description"
+msgid "The pattern to use for ironing top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing label"
+msgid "Ironing Line Spacing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing description"
+msgid "The distance between the lines of ironing."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow label"
+msgid "Ironing Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow description"
+msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset label"
+msgid "Ironing Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset description"
+msgid "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"
 msgid "Command Line Settings"
@@ -4360,3 +4730,11 @@ msgstr ""
 msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬입니다. "
+
+#~ msgctxt "wall_thickness description"
+#~ msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+#~ msgstr "외벽의 수평 방향의 두께. 이 값을 벽 선 너비로 나눈 값은 벽의 수를 정의합니다. "
+
+#~ msgctxt "skin_overlap description"
+#~ msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
+#~ msgstr "피부와 벽 사이의 겹침 정도입니다. 약간 겹치면 벽이 피부에 단단히 연결됩니다. "

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Dutch\n"
-"Language: Dutch\n"
-"Lang-Code: nl\n"
-"Country-Code: NL\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Machine"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Instellingen van de machine"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Extruder"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "De extruder train die voor het printen wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Nozzlediameter"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "De binnendiameter van de nozzle. Wijzig deze instelling wanneer u een nozzle gebruikt die geen standaardformaat heeft."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "X-Offset Nozzle"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "De X-coördinaat van de offset van de nozzle."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Y-Offset Nozzle"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "De Y-coördinaat van de offset van de nozzle."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "Start G-code van Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "Start-g-code die wordt uitgevoerd wanneer de extruder wordt ingeschakeld."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Absolute Startpositie Extruder"
-
-#: 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 "Maak van de startpositie van de extruder de absolute startpositie, in plaats van de relatieve startpositie ten opzichte van de laatst bekende locatie van de printkop."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "X-startpositie Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x description"
-msgid "The x-coordinate of the starting position when turning the extruder on."
-msgstr "De X-coördinaat van de startpositie wanneer de extruder wordt ingeschakeld."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Y-startpositie Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y description"
-msgid "The y-coordinate of the starting position when turning the extruder on."
-msgstr "De Y-coördinaat van de startpositie wanneer de extruder wordt ingeschakeld."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "Eind-g-code van Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "Eind-g-code die wordt uitgevoerd wanneer de extruder wordt uitgeschakeld."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Absolute Eindpositie Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "Maak van de eindpositie van de extruder de absolute eindpositie, in plaats van de relatieve eindpositie ten opzichte van de laatst bekende locatie van de printkop."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "X-eindpositie Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x description"
-msgid "The x-coordinate of the ending position when turning the extruder off."
-msgstr "De X-coördinaat van de eindpositie wanneer de extruder wordt uitgeschakeld."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Y-eindpositie Extruder"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y description"
-msgid "The y-coordinate of the ending position when turning the extruder off."
-msgstr "De Y-coördinaat van de eindpositie wanneer de extruder wordt uitgeschakeld."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Z-positie voor Primen Extruder"
-
-#: 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 "De Z-coördinaat van de positie waar filament in de nozzle wordt geprimed aan het begin van het printen."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Hechting aan Platform"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Hechting"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "X-positie voor Primen Extruder"
-
-#: 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 "De X-coördinaat van de positie waar filament in de nozzle wordt geprimed aan het begin van het printen."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Y-positie voor Primen Extruder"
-
-#: 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 "De Y-coördinaat van de positie waar filament in de nozzle wordt geprimed aan het begin van het printen."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: Dutch\n"
+"Language: Dutch\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: nl\n"
+"Country-Code: NL\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Machine"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Instellingen van de machine"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Extruder"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "De extruder train die voor het printen wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Nozzlediameter"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "De binnendiameter van de nozzle. Wijzig deze instelling wanneer u een nozzle gebruikt die geen standaardformaat heeft."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "X-Offset Nozzle"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "De X-coördinaat van de offset van de nozzle."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Y-Offset Nozzle"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "De Y-coördinaat van de offset van de nozzle."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Start G-code van Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Start-g-code die wordt uitgevoerd wanneer de extruder wordt ingeschakeld."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Absolute Startpositie Extruder"
+
+#: 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 "Maak van de startpositie van de extruder de absolute startpositie, in plaats van de relatieve startpositie ten opzichte van de laatst bekende locatie van de printkop."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "X-startpositie Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "De X-coördinaat van de startpositie wanneer de extruder wordt ingeschakeld."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Y-startpositie Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "De Y-coördinaat van de startpositie wanneer de extruder wordt ingeschakeld."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Eind-g-code van Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Eind-g-code die wordt uitgevoerd wanneer de extruder wordt uitgeschakeld."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Absolute Eindpositie Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Maak van de eindpositie van de extruder de absolute eindpositie, in plaats van de relatieve eindpositie ten opzichte van de laatst bekende locatie van de printkop."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "X-eindpositie Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr "De X-coördinaat van de eindpositie wanneer de extruder wordt uitgeschakeld."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Y-eindpositie Extruder"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr "De Y-coördinaat van de eindpositie wanneer de extruder wordt uitgeschakeld."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Z-positie voor Primen Extruder"
+
+#: 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 "De Z-coördinaat van de positie waar filament in de nozzle wordt geprimed aan het begin van het printen."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Hechting aan Platform"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Hechting"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "X-positie voor Primen Extruder"
+
+#: 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 "De X-coördinaat van de positie waar filament in de nozzle wordt geprimed aan het begin van het printen."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Y-positie voor Primen Extruder"
+
+#: 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 "De Y-coördinaat van de positie waar filament in de nozzle wordt geprimed aan het begin van het printen."

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

@@ -0,0 +1,201 @@
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-08-04 12:25+0200\n"
+"Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
+"Language-Team: reprapy.pl\n"
+"Language: Polish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: pl\n"
+"Country-Code: PL\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.3\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Maszyna"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Specyficzne ustawienia maszyny"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Ekstruder"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "Ekstruder używany do drukowania. Ta opcja używana jest podczas multi-ekstruzji."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr "ID Dyszy"
+
+#: 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 "ID dyszy dla wózka ekstrudera np. \"AA 0.4\" i \"BB 0.8\"."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Średnica Dyszy"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Wewnętrzna średnica dyszy. Zmień to ustawienie kiedy używasz niestandardowego rozmiaru dyszy."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Przesunięcie X Dyszy"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "Współrzędna X przesunięcia dyszy."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Przesunięcie Y Dyszy"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Współrzędna Y przesunięcia dyszy."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Początkowy G-code Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Początkowy G-code wywoływany kiedy ekstruder uruchamia się."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Bezwzględna Pozycja Początkowa Ekstrudera"
+
+#: 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 "Zmień pozycję początkową ekstrudera na bezwzględną, zamiast względem ostatniej pozycji głowicy."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Początkowa Pozycja X Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "Współrzędna X początkowej pozycji ekstrudera podczas jego włączania."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Początkowa Pozycja Y Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "Współrzędna Y początkowej pozycji ekstrudera podczas jego włączania."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Końcowy G-code Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Końcowy G-code, który jest wywoływany, kiedy ekstruder jest wyłączany."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Bezwzgl. Końcowa Pozycja Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Zmień pozycję końcową ekstrudera na bezwzględną, zamiast względem ostatniej pozycji głowicy."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Końcowa Pozycja X Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr "Współrzędna X końcowej pozycji ekstrudera podczas jego wyłączania."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Końcowa Pozycja Y Ekstrudera"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr "Współrzędna Y końcowej pozycji ekstrudera podczas jego wyłączania."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Pozycja Z Czyszczenia Dyszy"
+
+#: 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 "Współrzędna Z, w której dysza jest czyszczona na początku wydruku."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Przyczepność do stołu"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Przyczepność"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Pozycja X Czyszczenia Dyszy"
+
+#: 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 "Współrzędna X, w której dysza jest czyszczona na początku wydruku."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Pozycja Y Czyszczenia Dyszy"
+
+#: 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 "Współrzędna Y, w której dysza jest czyszczona na początku wydruku."

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-11 12: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: Brazillian Portuguese\n"
-"Lang-Code: pt\n"
-"Country-Code: BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: pt\n"
+"Country-Code: BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: fdmextruder.def.json
@@ -39,6 +39,16 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr "O extrusor usado para impressão. Isto é usado em multi-extrusão."
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-13 14: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: Brazillian Portuguese\n"
-"Lang-Code: pt\n"
-"Country-Code: BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: pt\n"
+"Country-Code: BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: fdmprinter.def.json
@@ -41,8 +41,8 @@ msgstr "Nome do seu modelo de impressora 3D."
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants label"
-msgid "Show machine variants"
-msgstr "Mostrar variantes da máquina"
+msgid "Show Machine Variants"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants description"
@@ -88,10 +88,9 @@ msgid "GUID of the material. This is set automatically. "
 msgstr "GUID do material. Este valor é ajustado automaticamente. "
 
 #: fdmprinter.def.json
-#, fuzzy
 msgctxt "material_bed_temp_wait label"
-msgid "Wait for build plate heatup"
-msgstr "Aguardar o aquecimento do bico"
+msgid "Wait for Build Plate Heatup"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait description"
@@ -100,8 +99,8 @@ msgstr "Indique se desejar inserir o comando para aguardar que a temperatura-alv
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait label"
-msgid "Wait for nozzle heatup"
-msgstr "Aguardar o aquecimento do bico"
+msgid "Wait for Nozzle Heatup"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait description"
@@ -110,8 +109,8 @@ msgstr "Indique se desejar inserir o comando para aguardar que a temperatura-alv
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend label"
-msgid "Include material temperatures"
-msgstr "Incluir temperaturas dos materiais"
+msgid "Include Material Temperatures"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend description"
@@ -120,8 +119,8 @@ msgstr "Indique se deseja incluir comandos de temperatura do bico no início do
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend label"
-msgid "Include build plate temperature"
-msgstr "Incluir temperatura da mesa de impressão"
+msgid "Include Build Plate Temperature"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend description"
@@ -130,8 +129,8 @@ msgstr "Indique se deseja incluir comandos de temperatura da mesa de impressão
 
 #: fdmprinter.def.json
 msgctxt "machine_width label"
-msgid "Machine width"
-msgstr "Largura da mesa"
+msgid "Machine Width"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_width description"
@@ -140,8 +139,8 @@ msgstr "A largura (direção X) da área imprimível."
 
 #: fdmprinter.def.json
 msgctxt "machine_depth label"
-msgid "Machine depth"
-msgstr "Profundidada da mesa"
+msgid "Machine Depth"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_depth description"
@@ -150,8 +149,8 @@ msgstr "A profundidade (direção Y) da área imprimível."
 
 #: fdmprinter.def.json
 msgctxt "machine_shape label"
-msgid "Build plate shape"
-msgstr "Forma da mesa de impressão"
+msgid "Build Plate Shape"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_shape description"
@@ -170,8 +169,8 @@ msgstr "Elíptica"
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
-msgid "Machine height"
-msgstr "Altura do volume de impressão"
+msgid "Machine Height"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_height description"
@@ -180,8 +179,8 @@ msgstr "A altura (direção Z) do volume imprimível."
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed label"
-msgid "Has heated build plate"
-msgstr "Tem mesa de impressão aquecida"
+msgid "Has Heated Build Plate"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed description"
@@ -190,8 +189,8 @@ msgstr "Indica se a plataforma de impressão pode ser aquecida."
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
-msgid "Is center origin"
-msgstr "A origem está no centro"
+msgid "Is Center Origin"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero description"
@@ -310,13 +309,18 @@ msgstr "Tipo de G-Code a ser gerado para a impressora."
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
-msgid "RepRap (Marlin/Sprinter)"
-msgstr "RepRap (Marlin/Sprinter)"
+msgid "Marlin"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
-msgid "RepRap (Volumetric)"
-msgstr "RepRap (Volumétrico)"
+msgctxt "machine_gcode_flavor option RepRap (Volumetric)"
+msgid "Marlin (Volumetric)"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_gcode_flavor option RepRap (RepRap)"
+msgid "RepRap"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option UltiGCode"
@@ -398,6 +402,16 @@ msgctxt "gantry_height description"
 msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)."
 msgstr "Diferença de altura entre a ponta do bico e o sistema de eixos X ou X e Y (onde o extrusor desliza)."
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmprinter.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 ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
@@ -638,6 +652,16 @@ msgctxt "wall_line_width_x description"
 msgid "Width of a single wall line for all wall lines except the outermost one."
 msgstr "Largura de extrusão das paredes internas (todas menos a mais externa)."
 
+#: fdmprinter.def.json
+msgctxt "roofing_line_width label"
+msgid "Top Surface Skin Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_line_width description"
+msgid "Width of a single line of the areas at the top of the print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_line_width label"
 msgid "Top/Bottom Line Width"
@@ -718,6 +742,16 @@ msgctxt "prime_tower_line_width description"
 msgid "Width of a single prime tower line."
 msgstr "Largura de um filete usado na torre de purga."
 
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor label"
+msgid "Initial Layer Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor description"
+msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "shell label"
 msgid "Shell"
@@ -728,6 +762,36 @@ msgctxt "shell description"
 msgid "Shell"
 msgstr "Perímetro"
 
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr label"
+msgid "Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr description"
+msgid "The extruder train used for printing the walls. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr label"
+msgid "Outer Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr description"
+msgid "The extruder train used for printing the outer wall. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr label"
+msgid "Inner Walls Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr description"
+msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_thickness label"
 msgid "Wall Thickness"
@@ -735,8 +799,8 @@ msgstr "Espessura de Parede"
 
 #: fdmprinter.def.json
 msgctxt "wall_thickness description"
-msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
-msgstr "A espessura das paredes na direção horizontal. Este valor dividido pela largura de extrusão da parede define o número de paredes."
+msgid "The thickness of the walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "wall_line_count label"
@@ -758,6 +822,71 @@ msgctxt "wall_0_wipe_dist description"
 msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better."
 msgstr "Distância do percurso inserido após a parede externa para esconder melhor a costura em Z."
 
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr label"
+msgid "Top Surface Skin Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr description"
+msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count label"
+msgid "Top Surface Skin Layers"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count description"
+msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern label"
+msgid "Top Surface Skin Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern description"
+msgid "The pattern of the top most layers."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles label"
+msgid "Top Surface Skin Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles description"
+msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr label"
+msgid "Top/Bottom Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr description"
+msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -948,6 +1077,16 @@ msgctxt "fill_perimeter_gaps option everywhere"
 msgid "Everywhere"
 msgstr "Em todos os lugares"
 
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps label"
+msgid "Print Thin Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps description"
+msgid "Print pieces of the model which are horizontally thinner than the nozzle size."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -958,6 +1097,16 @@ msgctxt "xy_offset description"
 msgid "Amount of offset applied to all polygons in each layer. Positive values can compensate for too big holes; negative values can compensate for too small holes."
 msgstr "Deslocamento adicional aplicado para todos os polígonos em cada camada. Valores positivos 'engordam' a camada e podem compensar por furos exagerados; valores negativos a 'emagrecem' e podem compensar por furos pequenos."
 
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 label"
+msgid "Initial Layer Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 description"
+msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -1003,6 +1152,16 @@ msgctxt "z_seam_y description"
 msgid "The Y coordinate of the position near where to start printing each part in a layer."
 msgstr "A coordenada Y da posição onde iniciar a impressão de cada parte em uma camada."
 
+#: fdmprinter.def.json
+msgctxt "z_seam_relative label"
+msgid "Z Seam Relative"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_relative description"
+msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1023,6 +1182,16 @@ msgctxt "infill description"
 msgid "Infill"
 msgstr "Preenchimento"
 
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr label"
+msgid "Infill Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr description"
+msgid "The extruder train used for printing infill. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_sparse_density label"
 msgid "Infill Density"
@@ -1108,56 +1277,6 @@ msgctxt "infill_angles description"
 msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns)."
 msgstr "Uma lista de direções de filetes em números inteiros a usar. Elementos da lista são usados sequencialmente de acordo com o progresso das camadas e quando o fim da lista é alcançado, ela volta ao começo. Os itens da lista são separados por vírgula e a lista inteira é contida em colchetes. O default é uma lista vazia que implica em usar os ângulos default tradicionais (45 e 135 graus para os padrões linha e ziguezague e 45 graus para todos os outros padrões)."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Preenchimento em Espaguete"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Imprime o preenchimento intermitentemente de modo que o filamento se enrole caoticamente dentro do objeto. Isto reduz o tempo de impressão, mas tem comportamento bem imprevisível."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Ângulo de Preenchimento Máximo do Espaguete"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
-msgstr "O ângulo máximo em relação ao Z do interior da impressão para áreas que serão preenchidas com espaguete no final. Abaixar este valor faz com que mais partes anguladas do seu modelo sejam preenchidas a cada camada."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Altura Máxima do Preenchimento Espaguete"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid "The maximum height of inside space which can be combined and filled from the top."
-msgstr "A altura máxima do espaço interior que pode ser combinado e preenchido a partir do topo."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Penetração do Espaguete"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "O deslocamento a partir das paredes de onde o preenchimento espaguete será impresso."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Fluxo de Espaguete"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
-msgstr "Ajusta a densidade do preenchimento espaguete. Note que a Densidade de Preenchimento controla somente o espaçamento entre linhas do padrão de preenchimento, não a quantidade de extrusão para o preenchimento espaguete."
-
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_add label"
 msgid "Cubic Subdivision Shell"
@@ -1195,8 +1314,8 @@ msgstr "Porcentagem de Sobreposição do Contorno"
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap description"
-msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
-msgstr "Porcentagem de sobreposição entre o contorno e as paredes. Uma ligeira sobreposição permite às paredes ficarem firmemente aderidas ao contorno."
+msgid "The amount of overlap between the skin and the walls as a percentage of the line width. A slight overlap allows the walls to connect firmly to the skin. This is a percentage of the average line widths of the skin lines and the innermost wall."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap_mm label"
@@ -1668,6 +1787,16 @@ msgctxt "speed_wall_x description"
 msgid "The speed at which all inner walls are printed. Printing the inner wall faster than the outer wall will reduce printing time. It works well to set this in between the outer wall speed and the infill speed."
 msgstr "A velocidade em que todas as paredes interiores são impressas. Imprimir a parede interior mais rapidamente que a parede externa reduzirá o tempo de impressão. Funciona bem ajustar este valor a meio caminho entre a velocidade da parede mais externa e a velocidade de preenchimento."
 
+#: fdmprinter.def.json
+msgctxt "speed_roofing label"
+msgid "Top Surface Skin Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_roofing description"
+msgid "The speed at which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_topbottom label"
 msgid "Top/Bottom Speed"
@@ -1678,6 +1807,16 @@ msgctxt "speed_topbottom description"
 msgid "The speed at which top/bottom layers are printed."
 msgstr "Velocidade em que as camadas superiores e inferiores são impressas."
 
+#: fdmprinter.def.json
+msgctxt "speed_ironing label"
+msgid "Ironing Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_ironing description"
+msgid "The speed at which to pass over the top surface."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_support label"
 msgid "Support Speed"
@@ -1888,6 +2027,16 @@ msgctxt "acceleration_wall_x description"
 msgid "The acceleration with which all inner walls are printed."
 msgstr "Aceleração com que se imprimem as paredes interiores."
 
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing label"
+msgid "Top Surface Skin Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing description"
+msgid "The acceleration with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_topbottom label"
 msgid "Top/Bottom Acceleration"
@@ -1898,6 +2047,16 @@ msgctxt "acceleration_topbottom description"
 msgid "The acceleration with which top/bottom layers are printed."
 msgstr "Aceleração com que as camadas superiores e inferiores são impressas."
 
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing label"
+msgid "Ironing Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing description"
+msgid "The acceleration with which ironing is performed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_support label"
 msgid "Support Acceleration"
@@ -2068,6 +2227,16 @@ msgctxt "jerk_wall_x description"
 msgid "The maximum instantaneous velocity change with which all inner walls are printed."
 msgstr "A máxima mudança de velocidade instantânea em uma direção com que as paredes internas são impressas."
 
+#: fdmprinter.def.json
+msgctxt "jerk_roofing label"
+msgid "Top Surface Skin Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_roofing description"
+msgid "The maximum instantaneous velocity change with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_topbottom label"
 msgid "Top/Bottom Jerk"
@@ -2078,6 +2247,16 @@ msgctxt "jerk_topbottom description"
 msgid "The maximum instantaneous velocity change with which top/bottom layers are printed."
 msgstr "A máxima mudança de velocidade instantânea em uma direção com que as camadas superiores e inferiores são impressas."
 
+#: fdmprinter.def.json
+msgctxt "jerk_ironing label"
+msgid "Ironing Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_ironing description"
+msgid "The maximum instantaneous velocity change while performing ironing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_support label"
 msgid "Support Jerk"
@@ -2603,6 +2782,26 @@ msgctxt "support_connect_zigzags description"
 msgid "Connect the ZigZags. This will increase the strength of the zig zag support structure."
 msgstr "Conecta os ziguezagues. Isto aumentará a força da estrutura de suporte em ziguezague."
 
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags label"
+msgid "Skip Some ZigZags Connections"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags description"
+msgid "Skip some ZigZags connections to make the support structure easier to break."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count label"
+msgid "ZigZag Connection Skip Count"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count description"
+msgid "Skip one in every N connection lines to make the support structure easier to break."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_infill_rate label"
 msgid "Support Density"
@@ -2733,6 +2932,36 @@ msgctxt "support_offset description"
 msgid "Amount of offset applied to all support polygons in each layer. Positive values can smooth out the support areas and result in more sturdy support."
 msgstr "Quantidade de deslocamento aplicado a todos os polígonos do suporte em cada camada. Valores positivos podem amaciar as áreas de suporte e resultar em suporte mais estável."
 
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness label"
+msgid "Support Infill Layer Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness description"
+msgid "The thickness per layer of support infill material. This value should always be a multiple of the layer height and is otherwise rounded."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps label"
+msgid "Gradual Support Infill Steps"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps description"
+msgid "Number of times to reduce the support infill density by half when getting further below top surfaces. Areas which are closer to top surfaces get a higher density, up to the Support Infill Density."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height label"
+msgid "Gradual Support Infill Step Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height description"
+msgid "The height of support infill of a given density before switching to half the density."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_enable label"
 msgid "Enable Support Interface"
@@ -3547,6 +3776,16 @@ msgctxt "dual_pre_wipe description"
 msgid "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print."
 msgstr "Depois de trocar extrusores, limpar o material escorrendo do bico na primeira peça impressa. Isso causa um movimento lento de limpeza do bico em um lugar onde o material escorrido causa o menor dano à qualidade de superfície da sua impressão."
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume label"
+msgid "Prime Tower Purge Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume description"
+msgid "Amount of filament to be purged when wiping on the prime tower. Purging is useful for compensating the filament lost by oozing during inactivity of the nozzle."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "ooze_shield_enabled label"
 msgid "Enable Ooze Shield"
@@ -3972,6 +4211,76 @@ msgctxt "skin_alternate_rotation description"
 msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions."
 msgstr "Alterna a direção em que as camadas superiores e inferiores são impressas. Normalmente elas são impressas somente na diagonal. Este ajuste permite direções somente no X e somente no Y."
 
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr "Preenchimento em Espaguete"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled description"
+msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
+msgstr "Imprime o preenchimento intermitentemente de modo que o filamento se enrole caoticamente dentro do objeto. Isto reduz o tempo de impressão, mas tem comportamento bem imprevisível."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped label"
+msgid "Spaghetti Infill Stepping"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped description"
+msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle label"
+msgid "Spaghetti Maximum Infill Angle"
+msgstr "Ângulo de Preenchimento Máximo do Espaguete"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle description"
+msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
+msgstr "O ângulo máximo em relação ao Z do interior da impressão para áreas que serão preenchidas com espaguete no final. Abaixar este valor faz com que mais partes anguladas do seu modelo sejam preenchidas a cada camada."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height label"
+msgid "Spaghetti Infill Maximum Height"
+msgstr "Altura Máxima do Preenchimento Espaguete"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height description"
+msgid "The maximum height of inside space which can be combined and filled from the top."
+msgstr "A altura máxima do espaço interior que pode ser combinado e preenchido a partir do topo."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset label"
+msgid "Spaghetti Inset"
+msgstr "Penetração do Espaguete"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset description"
+msgid "The offset from the walls from where the spaghetti infill will be printed."
+msgstr "O deslocamento a partir das paredes de onde o preenchimento espaguete será impresso."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow label"
+msgid "Spaghetti Flow"
+msgstr "Fluxo de Espaguete"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow description"
+msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
+msgstr "Ajusta a densidade do preenchimento espaguete. Note que a Densidade de Preenchimento controla somente o espaçamento entre linhas do padrão de preenchimento, não a quantidade de extrusão para o preenchimento espaguete."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume label"
+msgid "Spaghetti Infill Extra Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume description"
+msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -4311,6 +4620,66 @@ msgctxt "wireframe_nozzle_clearance description"
 msgid "Distance between the nozzle and horizontally downward lines. Larger clearance results in diagonally downward lines with a less steep angle, which in turn results in less upward connections with the next layer. Only applies to Wire Printing."
 msgstr "Distância entre o bico e os filetes descendentes horizontais. Espaços livres maiores resultarão em filetes descendentes diagonais com ângulo menos acentuado, o que por sua vez resulta em menos conexões ascendentes à próxima camada. Somente se aplica à Impressão em Arame."
 
+#: fdmprinter.def.json
+msgctxt "ironing_enabled label"
+msgid "Enable Ironing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_enabled description"
+msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern label"
+msgid "Ironing Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern description"
+msgid "The pattern to use for ironing top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing label"
+msgid "Ironing Line Spacing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing description"
+msgid "The distance between the lines of ironing."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow label"
+msgid "Ironing Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow description"
+msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset label"
+msgid "Ironing Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset description"
+msgid "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"
 msgid "Command Line Settings"
@@ -4371,6 +4740,67 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matriz de transformação a ser aplicada ao modelo após o carregamento do arquivo."
 
+#~ msgctxt "machine_show_variants label"
+#~ msgid "Show machine variants"
+#~ msgstr "Mostrar variantes da máquina"
+
+#, fuzzy
+#~ msgctxt "material_bed_temp_wait label"
+#~ msgid "Wait for build plate heatup"
+#~ msgstr "Aguardar o aquecimento do bico"
+
+#~ msgctxt "material_print_temp_wait label"
+#~ msgid "Wait for nozzle heatup"
+#~ msgstr "Aguardar o aquecimento do bico"
+
+#~ msgctxt "material_print_temp_prepend label"
+#~ msgid "Include material temperatures"
+#~ msgstr "Incluir temperaturas dos materiais"
+
+#~ msgctxt "material_bed_temp_prepend label"
+#~ msgid "Include build plate temperature"
+#~ msgstr "Incluir temperatura da mesa de impressão"
+
+#~ msgctxt "machine_width label"
+#~ msgid "Machine width"
+#~ msgstr "Largura da mesa"
+
+#~ msgctxt "machine_depth label"
+#~ msgid "Machine depth"
+#~ msgstr "Profundidada da mesa"
+
+#~ msgctxt "machine_shape label"
+#~ msgid "Build plate shape"
+#~ msgstr "Forma da mesa de impressão"
+
+#~ msgctxt "machine_height label"
+#~ msgid "Machine height"
+#~ msgstr "Altura do volume de impressão"
+
+#~ msgctxt "machine_heated_bed label"
+#~ msgid "Has heated build plate"
+#~ msgstr "Tem mesa de impressão aquecida"
+
+#~ msgctxt "machine_center_is_zero label"
+#~ msgid "Is center origin"
+#~ msgstr "A origem está no centro"
+
+#~ msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
+#~ msgid "RepRap (Marlin/Sprinter)"
+#~ msgstr "RepRap (Marlin/Sprinter)"
+
+#~ msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
+#~ msgid "RepRap (Volumetric)"
+#~ msgstr "RepRap (Volumétrico)"
+
+#~ msgctxt "wall_thickness description"
+#~ msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+#~ msgstr "A espessura das paredes na direção horizontal. Este valor dividido pela largura de extrusão da parede define o número de paredes."
+
+#~ msgctxt "skin_overlap description"
+#~ msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
+#~ msgstr "Porcentagem de sobreposição entre o contorno e as paredes. Uma ligeira sobreposição permite às paredes ficarem firmemente aderidas ao contorno."
+
 #~ msgctxt "support_interface_line_width description"
 #~ msgid "Width of a single support interface line."
 #~ msgstr "Largura de extrusão de um filete usado na interface da estrutura de suporte com o modelo."

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-01-08 04:33+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
 "Language-Team: Ruslan Popov\n"
 "Language: Russian\n"
-"Lang-Code: ru\n"
-"Country-Code: RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: ru\n"
+"Country-Code: RU\n"
 "X-Generator: Poedit 1.8.11\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -40,6 +40,16 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr "Экструдер, который используется для печати. Имеет значение при использовании нескольких экструдеров."
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"

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

@@ -2,21 +2,21 @@
 # Copyright (C) 2017 Ultimaker
 # This file is distributed under the same license as the Cura package.
 # Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: 2017-06-05 08:51+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
 "Language-Team: Ruslan Popov\n"
 "Language: ru\n"
-"Lang-Code: ru\n"
-"Country-Code: RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: ru\n"
+"Country-Code: RU\n"
 "X-Generator: Poedit 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -42,8 +42,8 @@ msgstr "Название модели вашего 3D принтера."
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants label"
-msgid "Show machine variants"
-msgstr "Показать варианты принтера"
+msgid "Show Machine Variants"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants description"
@@ -90,8 +90,8 @@ msgstr "Идентификатор материала, устанавливае
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait label"
-msgid "Wait for build plate heatup"
-msgstr "Ожидать пока прогреется стол"
+msgid "Wait for Build Plate Heatup"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait description"
@@ -100,8 +100,8 @@ msgstr "Следует ли добавлять команду ожидания
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait label"
-msgid "Wait for nozzle heatup"
-msgstr "Ожидать пока прогреется голова"
+msgid "Wait for Nozzle Heatup"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait description"
@@ -110,8 +110,8 @@ msgstr "Следует ли добавлять команду ожидания
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend label"
-msgid "Include material temperatures"
-msgstr "Добавлять температуру из материала"
+msgid "Include Material Temperatures"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend description"
@@ -120,8 +120,8 @@ msgstr "Следует ли добавлять команды управлени
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend label"
-msgid "Include build plate temperature"
-msgstr "Добавлять температуру стола"
+msgid "Include Build Plate Temperature"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend description"
@@ -130,8 +130,8 @@ msgstr "Следует ли добавлять команды управлени
 
 #: fdmprinter.def.json
 msgctxt "machine_width label"
-msgid "Machine width"
-msgstr "Ширина принтера"
+msgid "Machine Width"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_width description"
@@ -140,8 +140,8 @@ msgstr "Ширина (по оси X) области печати."
 
 #: fdmprinter.def.json
 msgctxt "machine_depth label"
-msgid "Machine depth"
-msgstr "Глубина принтера"
+msgid "Machine Depth"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_depth description"
@@ -150,8 +150,8 @@ msgstr "Ширина (по оси Y) области печати."
 
 #: fdmprinter.def.json
 msgctxt "machine_shape label"
-msgid "Build plate shape"
-msgstr "Форма стола"
+msgid "Build Plate Shape"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_shape description"
@@ -170,8 +170,8 @@ msgstr "Эллиптическая"
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
-msgid "Machine height"
-msgstr "Высота принтера"
+msgid "Machine Height"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_height description"
@@ -180,8 +180,8 @@ msgstr "Ширина (по оси Z) области печати."
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed label"
-msgid "Has heated build plate"
-msgstr "Имеет подогреваемый стол"
+msgid "Has Heated Build Plate"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed description"
@@ -190,8 +190,8 @@ msgstr "Имеет ли принтер подогреваемый стол."
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
-msgid "Is center origin"
-msgstr "Начало координат в центре"
+msgid "Is Center Origin"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero description"
@@ -310,13 +310,18 @@ msgstr "Генерируемый вариант G-кода."
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
-msgid "RepRap (Marlin/Sprinter)"
-msgstr "RepRap (Marlin/Sprinter)"
+msgid "Marlin"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
-msgid "RepRap (Volumetric)"
-msgstr "RepRap (Volumetric)"
+msgctxt "machine_gcode_flavor option RepRap (Volumetric)"
+msgid "Marlin (Volumetric)"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_gcode_flavor option RepRap (RepRap)"
+msgid "RepRap"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option UltiGCode"
@@ -398,6 +403,16 @@ msgctxt "gantry_height description"
 msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes)."
 msgstr "Высота между кончиком сопла и портальной системой (по осям X и Y)."
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmprinter.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 ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
@@ -638,6 +653,16 @@ msgctxt "wall_line_width_x description"
 msgid "Width of a single wall line for all wall lines except the outermost one."
 msgstr "Ширина одной линии стенки для всех линий стенки, кроме самой внешней."
 
+#: fdmprinter.def.json
+msgctxt "roofing_line_width label"
+msgid "Top Surface Skin Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_line_width description"
+msgid "Width of a single line of the areas at the top of the print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_line_width label"
 msgid "Top/Bottom Line Width"
@@ -718,6 +743,16 @@ msgctxt "prime_tower_line_width description"
 msgid "Width of a single prime tower line."
 msgstr "Ширина отдельной линии черновой башни."
 
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor label"
+msgid "Initial Layer Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor description"
+msgid "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "shell label"
 msgid "Shell"
@@ -728,6 +763,36 @@ msgctxt "shell description"
 msgid "Shell"
 msgstr "Ограждение"
 
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr label"
+msgid "Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr description"
+msgid "The extruder train used for printing the walls. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr label"
+msgid "Outer Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr description"
+msgid "The extruder train used for printing the outer wall. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr label"
+msgid "Inner Walls Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr description"
+msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_thickness label"
 msgid "Wall Thickness"
@@ -735,8 +800,8 @@ msgstr "Толщина стенки"
 
 #: fdmprinter.def.json
 msgctxt "wall_thickness description"
-msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
-msgstr "Толщина внешних стенок в горизонтальном направлении. Это значение, разделённое на ширину линии стенки, определяет количество линий стенки."
+msgid "The thickness of the walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "wall_line_count label"
@@ -758,6 +823,71 @@ msgctxt "wall_0_wipe_dist description"
 msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better."
 msgstr "Расстояние перемещения, добавленное после печати внешней стенки, чтобы лучше спрятать Z шов."
 
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr label"
+msgid "Top Surface Skin Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr description"
+msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count label"
+msgid "Top Surface Skin Layers"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count description"
+msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern label"
+msgid "Top Surface Skin Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern description"
+msgid "The pattern of the top most layers."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles label"
+msgid "Top Surface Skin Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles description"
+msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr label"
+msgid "Top/Bottom Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr description"
+msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -948,6 +1078,16 @@ msgctxt "fill_perimeter_gaps option everywhere"
 msgid "Everywhere"
 msgstr "Везде"
 
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps label"
+msgid "Print Thin Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps description"
+msgid "Print pieces of the model which are horizontally thinner than the nozzle size."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -958,6 +1098,16 @@ msgctxt "xy_offset description"
 msgid "Amount of offset applied to all polygons in each layer. Positive values can compensate for too big holes; negative values can compensate for too small holes."
 msgstr "Сумма смещения применяемая ко всем полигонам на каждом слое. Позитивные значения могут возместить потери для слишком больших отверстий; негативные значения могут возместить потери для слишком малых отверстий."
 
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 label"
+msgid "Initial Layer Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 description"
+msgid "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -1003,6 +1153,16 @@ msgctxt "z_seam_y description"
 msgid "The Y coordinate of the position near where to start printing each part in a layer."
 msgstr "Y координата позиции вблизи которой следует начинать путь на каждом слое."
 
+#: fdmprinter.def.json
+msgctxt "z_seam_relative label"
+msgid "Z Seam Relative"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_relative description"
+msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1023,6 +1183,16 @@ msgctxt "infill description"
 msgid "Infill"
 msgstr "Заполнение"
 
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr label"
+msgid "Infill Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr description"
+msgid "The extruder train used for printing infill. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_sparse_density label"
 msgid "Infill Density"
@@ -1108,56 +1278,6 @@ msgctxt "infill_angles description"
 msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns)."
 msgstr "Список направлений линии при печати слоёв. Элементы списка используются последовательно по мере печати слоёв и когда конец списка будет достигнут, он начнётся сначала. Элементы списка отделяются запятыми и сам список заключён в квадратные скобки. По умолчанию, он пустой, что означает использование стандартных углов (45 и 135 градусов для линий из зигзага и 45 градусов для всех остальных шаблонов)."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Спагетти"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Печатает заполнение так часто, что филамент хаотически заполняет внутренность объекта. Это сокращает время печати, но выражается в непредсказуемом поведении."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Максимальный угол спагетти заполнения"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
-msgstr "Максимальный угол по отношению к оси Z внутри печатаемого объёма для заполняемых областей. Уменьшение этого значения приводит к тому, что более наклонённый части вашей модели будут заполнены на каждом слое."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Максимальная высота спагетти заполнения"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid "The maximum height of inside space which can be combined and filled from the top."
-msgstr "Максимальная высота внутри пространства которое может быть объединено и заполнено сверху."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Спагетти вставка"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Смещение от стенок внутри которых должно быть использовано спагетти заполнение."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Спагетти поток"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
-msgstr "Управляет плотностью спагетти заполнения. Следует отметить, что плотность заполнения только контролирует расстояние между линиями шаблона заполнения, а не объёмом выдавливаемого материала."
-
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_add label"
 msgid "Cubic Subdivision Shell"
@@ -1195,8 +1315,8 @@ msgstr "Процент перекрытия оболочек"
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap description"
-msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
-msgstr "Величина перекрытия между оболочкой и стенками. Небольшое перекрытие позволяет стенкам плотно соединиться с оболочкой."
+msgid "The amount of overlap between the skin and the walls as a percentage of the line width. A slight overlap allows the walls to connect firmly to the skin. This is a percentage of the average line widths of the skin lines and the innermost wall."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "skin_overlap_mm label"
@@ -1668,6 +1788,16 @@ msgctxt "speed_wall_x description"
 msgid "The speed at which all inner walls are printed. Printing the inner wall faster than the outer wall will reduce printing time. It works well to set this in between the outer wall speed and the infill speed."
 msgstr "Скорость, на которой происходит печать внутренних стенок. Печать внутренних стенок на скорости, большей скорости печати внешней стенки, ускоряет печать. Отлично работает, если значение скорости находится между скоростями печати внешней стенки и скорости заполнения."
 
+#: fdmprinter.def.json
+msgctxt "speed_roofing label"
+msgid "Top Surface Skin Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_roofing description"
+msgid "The speed at which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_topbottom label"
 msgid "Top/Bottom Speed"
@@ -1678,6 +1808,16 @@ msgctxt "speed_topbottom description"
 msgid "The speed at which top/bottom layers are printed."
 msgstr "Скорость, на которой печатаются слои крышки/дна."
 
+#: fdmprinter.def.json
+msgctxt "speed_ironing label"
+msgid "Ironing Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_ironing description"
+msgid "The speed at which to pass over the top surface."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_support label"
 msgid "Support Speed"
@@ -1888,6 +2028,16 @@ msgctxt "acceleration_wall_x description"
 msgid "The acceleration with which all inner walls are printed."
 msgstr "Ускорение, с которым происходит печать внутренних стенок."
 
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing label"
+msgid "Top Surface Skin Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing description"
+msgid "The acceleration with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_topbottom label"
 msgid "Top/Bottom Acceleration"
@@ -1898,6 +2048,16 @@ msgctxt "acceleration_topbottom description"
 msgid "The acceleration with which top/bottom layers are printed."
 msgstr "Ускорение, с которым печатаются слои крышки/дна."
 
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing label"
+msgid "Ironing Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing description"
+msgid "The acceleration with which ironing is performed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_support label"
 msgid "Support Acceleration"
@@ -2068,6 +2228,16 @@ msgctxt "jerk_wall_x description"
 msgid "The maximum instantaneous velocity change with which all inner walls are printed."
 msgstr "Изменение максимальной мгновенной скорости, с которой печатаются внутренние стенки."
 
+#: fdmprinter.def.json
+msgctxt "jerk_roofing label"
+msgid "Top Surface Skin Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_roofing description"
+msgid "The maximum instantaneous velocity change with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_topbottom label"
 msgid "Top/Bottom Jerk"
@@ -2078,6 +2248,16 @@ msgctxt "jerk_topbottom description"
 msgid "The maximum instantaneous velocity change with which top/bottom layers are printed."
 msgstr "Изменение максимальной мгновенной скорости, с которой печатаются верхние и нижние слои."
 
+#: fdmprinter.def.json
+msgctxt "jerk_ironing label"
+msgid "Ironing Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_ironing description"
+msgid "The maximum instantaneous velocity change while performing ironing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_support label"
 msgid "Support Jerk"
@@ -2603,6 +2783,26 @@ msgctxt "support_connect_zigzags description"
 msgid "Connect the ZigZags. This will increase the strength of the zig zag support structure."
 msgstr "Соединяет зигзаги. Это увеличивает прочность такой поддержки."
 
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags label"
+msgid "Skip Some ZigZags Connections"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags description"
+msgid "Skip some ZigZags connections to make the support structure easier to break."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count label"
+msgid "ZigZag Connection Skip Count"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count description"
+msgid "Skip one in every N connection lines to make the support structure easier to break."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_infill_rate label"
 msgid "Support Density"
@@ -2733,6 +2933,36 @@ msgctxt "support_offset description"
 msgid "Amount of offset applied to all support polygons in each layer. Positive values can smooth out the support areas and result in more sturdy support."
 msgstr "Величина смещения, применяемая ко всем полигонам поддержки в каждом слое. Положительные значения могут сглаживать зоны поддержки и приводить к укреплению структур поддержек."
 
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness label"
+msgid "Support Infill Layer Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness description"
+msgid "The thickness per layer of support infill material. This value should always be a multiple of the layer height and is otherwise rounded."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps label"
+msgid "Gradual Support Infill Steps"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps description"
+msgid "Number of times to reduce the support infill density by half when getting further below top surfaces. Areas which are closer to top surfaces get a higher density, up to the Support Infill Density."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height label"
+msgid "Gradual Support Infill Step Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height description"
+msgid "The height of support infill of a given density before switching to half the density."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_enable label"
 msgid "Enable Support Interface"
@@ -3547,6 +3777,16 @@ msgctxt "dual_pre_wipe description"
 msgid "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print."
 msgstr "После смены экструдера убираем на первой печатаемой части материал, вытекший из сопла. Выполняется безопасная медленная очистка на месте, где вытекший материал нанесёт наименьший ущерб качеству печатаемой поверхности."
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume label"
+msgid "Prime Tower Purge Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume description"
+msgid "Amount of filament to be purged when wiping on the prime tower. Purging is useful for compensating the filament lost by oozing during inactivity of the nozzle."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "ooze_shield_enabled label"
 msgid "Enable Ooze Shield"
@@ -3972,6 +4212,76 @@ msgctxt "skin_alternate_rotation description"
 msgid "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions."
 msgstr "Изменить направление, в котором печатаются слои крышки/дна. Обычно, они печатаются по диагонали. Данный параметр добавляет направления X-только и Y-только."
 
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr "Спагетти"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled description"
+msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
+msgstr "Печатает заполнение так часто, что филамент хаотически заполняет внутренность объекта. Это сокращает время печати, но выражается в непредсказуемом поведении."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped label"
+msgid "Spaghetti Infill Stepping"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped description"
+msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle label"
+msgid "Spaghetti Maximum Infill Angle"
+msgstr "Максимальный угол спагетти заполнения"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle description"
+msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
+msgstr "Максимальный угол по отношению к оси Z внутри печатаемого объёма для заполняемых областей. Уменьшение этого значения приводит к тому, что более наклонённый части вашей модели будут заполнены на каждом слое."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height label"
+msgid "Spaghetti Infill Maximum Height"
+msgstr "Максимальная высота спагетти заполнения"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height description"
+msgid "The maximum height of inside space which can be combined and filled from the top."
+msgstr "Максимальная высота внутри пространства которое может быть объединено и заполнено сверху."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset label"
+msgid "Spaghetti Inset"
+msgstr "Спагетти вставка"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset description"
+msgid "The offset from the walls from where the spaghetti infill will be printed."
+msgstr "Смещение от стенок внутри которых должно быть использовано спагетти заполнение."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow label"
+msgid "Spaghetti Flow"
+msgstr "Спагетти поток"
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow description"
+msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
+msgstr "Управляет плотностью спагетти заполнения. Следует отметить, что плотность заполнения только контролирует расстояние между линиями шаблона заполнения, а не объёмом выдавливаемого материала."
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume label"
+msgid "Spaghetti Infill Extra Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume description"
+msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -4311,6 +4621,66 @@ msgctxt "wireframe_nozzle_clearance description"
 msgid "Distance between the nozzle and horizontally downward lines. Larger clearance results in diagonally downward lines with a less steep angle, which in turn results in less upward connections with the next layer. Only applies to Wire Printing."
 msgstr "Зазор между соплом и горизонтально нисходящими линиями. Большее значение уменьшает угол нисхождения, что приводит уменьшению восходящих соединений на следующем слое. Применяется только при каркасной печати."
 
+#: fdmprinter.def.json
+msgctxt "ironing_enabled label"
+msgid "Enable Ironing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_enabled description"
+msgid "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern label"
+msgid "Ironing Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern description"
+msgid "The pattern to use for ironing top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing label"
+msgid "Ironing Line Spacing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing description"
+msgid "The distance between the lines of ironing."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow label"
+msgid "Ironing Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow description"
+msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset label"
+msgid "Ironing Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset description"
+msgid "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"
 msgid "Command Line Settings"
@@ -4371,6 +4741,66 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Матрица преобразования, применяемая к модели при её загрузки из файла."
 
+#~ msgctxt "machine_show_variants label"
+#~ msgid "Show machine variants"
+#~ msgstr "Показать варианты принтера"
+
+#~ msgctxt "material_bed_temp_wait label"
+#~ msgid "Wait for build plate heatup"
+#~ msgstr "Ожидать пока прогреется стол"
+
+#~ msgctxt "material_print_temp_wait label"
+#~ msgid "Wait for nozzle heatup"
+#~ msgstr "Ожидать пока прогреется голова"
+
+#~ msgctxt "material_print_temp_prepend label"
+#~ msgid "Include material temperatures"
+#~ msgstr "Добавлять температуру из материала"
+
+#~ msgctxt "material_bed_temp_prepend label"
+#~ msgid "Include build plate temperature"
+#~ msgstr "Добавлять температуру стола"
+
+#~ msgctxt "machine_width label"
+#~ msgid "Machine width"
+#~ msgstr "Ширина принтера"
+
+#~ msgctxt "machine_depth label"
+#~ msgid "Machine depth"
+#~ msgstr "Глубина принтера"
+
+#~ msgctxt "machine_shape label"
+#~ msgid "Build plate shape"
+#~ msgstr "Форма стола"
+
+#~ msgctxt "machine_height label"
+#~ msgid "Machine height"
+#~ msgstr "Высота принтера"
+
+#~ msgctxt "machine_heated_bed label"
+#~ msgid "Has heated build plate"
+#~ msgstr "Имеет подогреваемый стол"
+
+#~ msgctxt "machine_center_is_zero label"
+#~ msgid "Is center origin"
+#~ msgstr "Начало координат в центре"
+
+#~ msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
+#~ msgid "RepRap (Marlin/Sprinter)"
+#~ msgstr "RepRap (Marlin/Sprinter)"
+
+#~ msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
+#~ msgid "RepRap (Volumetric)"
+#~ msgstr "RepRap (Volumetric)"
+
+#~ msgctxt "wall_thickness description"
+#~ msgid "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls."
+#~ msgstr "Толщина внешних стенок в горизонтальном направлении. Это значение, разделённое на ширину линии стенки, определяет количество линий стенки."
+
+#~ msgctxt "skin_overlap description"
+#~ msgid "The amount of overlap between the skin and the walls. A slight overlap allows the walls to connect firmly to the skin."
+#~ msgstr "Величина перекрытия между оболочкой и стенками. Небольшое перекрытие позволяет стенкам плотно соединиться с оболочкой."
+
 #~ msgctxt "support_interface_line_width description"
 #~ msgid "Width of a single support interface line."
 #~ msgstr "Ширина одной линии поддерживающей крыши."

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

@@ -1,189 +1,199 @@
-# Cura JSON setting files
-# Copyright (C) 2017 Ultimaker
-# This file is distributed under the same license as the Cura package.
-# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.6\n"
-"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
-"PO-Revision-Date: 2017-06-07 16:04+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Turkish\n"
-"Language: Turkish\n"
-"Lang-Code: tr\n"
-"Country-Code: TR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings label"
-msgid "Machine"
-msgstr "Makine"
-
-#: fdmextruder.def.json
-msgctxt "machine_settings description"
-msgid "Machine specific settings"
-msgstr "Makine özel ayarları"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr label"
-msgid "Extruder"
-msgstr "Ekstruder"
-
-#: fdmextruder.def.json
-msgctxt "extruder_nr description"
-msgid "The extruder train used for printing. This is used in multi-extrusion."
-msgstr "Yazdırma için kullanılan ekstruder dişli çark. Çoklu ekstrüzyon işlemi için kullanılır."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size label"
-msgid "Nozzle Diameter"
-msgstr "Nozül Çapı"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_size description"
-msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-msgstr "Nozülün iç çapı. Standart olmayan boyutta bir nozül kullanırken bu ayarı değiştirin."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x label"
-msgid "Nozzle X Offset"
-msgstr "Nozül NX Ofseti"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_x description"
-msgid "The x-coordinate of the offset of the nozzle."
-msgstr "Nozül ofsetinin x koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y label"
-msgid "Nozzle Y Offset"
-msgstr "Nozül Y Ofseti"
-
-#: fdmextruder.def.json
-msgctxt "machine_nozzle_offset_y description"
-msgid "The y-coordinate of the offset of the nozzle."
-msgstr "Nozül ofsetinin y koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code label"
-msgid "Extruder Start G-Code"
-msgstr "Ekstruder G-Code'u başlatma"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_code description"
-msgid "Start g-code to execute whenever turning the extruder on."
-msgstr "Ekstruderi her açtığınızda g-code'u başlatın."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_abs label"
-msgid "Extruder Start Position Absolute"
-msgstr "Ekstruderin Mutlak Başlangıç Konumu"
-
-#: 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 "Ekstruder başlama konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x label"
-msgid "Extruder Start Position X"
-msgstr "Ekstruder X Başlangıç Konumu"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_x description"
-msgid "The x-coordinate of the starting position when turning the extruder on."
-msgstr "Ekstruder açılırken başlangıç konumunun x koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y label"
-msgid "Extruder Start Position Y"
-msgstr "Ekstruder Y Başlangıç Konumu"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_start_pos_y description"
-msgid "The y-coordinate of the starting position when turning the extruder on."
-msgstr "Ekstruder açılırken başlangıç konumunun Y koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code label"
-msgid "Extruder End G-Code"
-msgstr "Ekstruder G-Code'u Sonlandırma"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_code description"
-msgid "End g-code to execute whenever turning the extruder off."
-msgstr "Ekstruderi her kapattığınızda g-code'u sonlandırın."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs label"
-msgid "Extruder End Position Absolute"
-msgstr "Ekstruderin Mutlak Bitiş Konumu"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_abs description"
-msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
-msgstr "Ekstruder bitiş konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x label"
-msgid "Extruder End Position X"
-msgstr "Ekstruderin X Bitiş Konumu"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_x description"
-msgid "The x-coordinate of the ending position when turning the extruder off."
-msgstr "Ekstruder kapatılırken bitiş konumunun x koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y label"
-msgid "Extruder End Position Y"
-msgstr "Ekstruderin Y Bitiş Konumu"
-
-#: fdmextruder.def.json
-msgctxt "machine_extruder_end_pos_y description"
-msgid "The y-coordinate of the ending position when turning the extruder off."
-msgstr "Ekstruder kapatılırken bitiş konumunun Y koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_z label"
-msgid "Extruder Prime Z Position"
-msgstr "Ekstruder İlk Z konumu"
-
-#: 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 "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Z koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion label"
-msgid "Build Plate Adhesion"
-msgstr "Yapı Levhası Yapıştırması"
-
-#: fdmextruder.def.json
-msgctxt "platform_adhesion description"
-msgid "Adhesion"
-msgstr "Yapıştırma"
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_x label"
-msgid "Extruder Prime X Position"
-msgstr "Extruder İlk X konumu"
-
-#: 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 "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun X koordinatı."
-
-#: fdmextruder.def.json
-msgctxt "extruder_prime_pos_y label"
-msgid "Extruder Prime Y Position"
-msgstr "Extruder İlk Y konumu"
-
-#: 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 "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Y koordinatı."
+# Cura JSON setting files
+# Copyright (C) 2017 Ultimaker
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Cura 2.7\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
+"PO-Revision-Date: 2017-06-07 16:04+0200\n"
+"Last-Translator: Bothof <info@bothof.nl>\n"
+"Language-Team: Turkish\n"
+"Language: Turkish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Lang-Code: tr\n"
+"Country-Code: TR\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Makine"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Makine özel ayarları"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Ekstruder"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "Yazdırma için kullanılan ekstruder dişli çark. Çoklu ekstrüzyon işlemi için kullanılır."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Nozül Çapı"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Nozülün iç çapı. Standart olmayan boyutta bir nozül kullanırken bu ayarı değiştirin."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Nozül NX Ofseti"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "Nozül ofsetinin x koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Nozül Y Ofseti"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Nozül ofsetinin y koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Ekstruder G-Code'u başlatma"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "Ekstruderi her açtığınızda g-code'u başlatın."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Ekstruderin Mutlak Başlangıç Konumu"
+
+#: 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 "Ekstruder başlama konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Ekstruder X Başlangıç Konumu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "Ekstruder açılırken başlangıç konumunun x koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Ekstruder Y Başlangıç Konumu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "Ekstruder açılırken başlangıç konumunun Y koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Ekstruder G-Code'u Sonlandırma"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "Ekstruderi her kapattığınızda g-code'u sonlandırın."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Ekstruderin Mutlak Bitiş Konumu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Ekstruder bitiş konumunu, yazıcı başlığının son konumuna göre ayarlamak yerine mutlak olarak ayarlayın."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Ekstruderin X Bitiş Konumu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr "Ekstruder kapatılırken bitiş konumunun x koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Ekstruderin Y Bitiş Konumu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr "Ekstruder kapatılırken bitiş konumunun Y koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Ekstruder İlk Z konumu"
+
+#: 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 "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Z koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Yapı Levhası Yapıştırması"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Yapıştırma"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Extruder İlk X konumu"
+
+#: 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 "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun X koordinatı."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Extruder İlk Y konumu"
+
+#: 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 "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Y koordinatı."

resources/qml/AboutDialog.qml

@@ -22,15 +22,15 @@ UM.Dialog
     Image
     {
         id: logo
-        width: base.minimumWidth * 0.85
-        height: width * (1/4.25)
+        width: (base.minimumWidth * 0.85) | 0
+        height: (width * (1/4.25)) | 0
 
         source: UM.Theme.getImage("logo")
 
         sourceSize.width: width
         sourceSize.height: height
         anchors.top: parent.top
-        anchors.topMargin: (base.minimumWidth - width) / 2
+        anchors.topMargin: ((base.minimumWidth - width) / 2) | 0
         anchors.horizontalCenter: parent.horizontalCenter
 
         UM.I18nCatalog{id: catalog; name:"cura"}
@@ -44,7 +44,7 @@ UM.Dialog
         font: UM.Theme.getFont("large")
         anchors.right : logo.right
         anchors.top: logo.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height / 2
+        anchors.topMargin: (UM.Theme.getSize("default_margin").height / 2) | 0
     }
 
     Label
@@ -125,7 +125,7 @@ UM.Dialog
                 projectsModel.append({ name:"PyQt", description: catalog.i18nc("@label", "GUI framework bindings"), license: "GPL", url: "https://riverbankcomputing.com/software/pyqt" });
                 projectsModel.append({ name:"SIP", description: catalog.i18nc("@label", "C/C++ Binding library"), license: "GPL", url: "https://riverbankcomputing.com/software/sip" });
                 projectsModel.append({ name:"Protobuf", description: catalog.i18nc("@label", "Data interchange format"), license: "BSD", url: "https://developers.google.com/protocol-buffers" });
-                projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing "), license: "BSD-new", url: "https://www.scipy.org/" });
+                projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing"), license: "BSD-new", url: "https://www.scipy.org/" });
                 projectsModel.append({ name:"NumPy", description: catalog.i18nc("@label", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" });
                 projectsModel.append({ name:"NumPy-STL", description: catalog.i18nc("@label", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" });
                 projectsModel.append({ name:"libSavitar", description: catalog.i18nc("@label", "Support library for handling 3MF files"), license: "AGPLv3", url: "https://github.com/ultimaker/libsavitar" });

resources/qml/Cura.qml

@@ -632,7 +632,7 @@ UM.MainWindow
     Connections
     {
         target: Cura.Actions.quit
-        onTriggered: base.visible = false;
+        onTriggered: CuraApplication.closeApplication();
     }
 
     Connections

resources/qml/DiscardOrKeepProfileChangesDialog.qml

@@ -109,20 +109,20 @@ UM.Dialog
                 role: "label"
                 title: catalog.i18nc("@title:column", "Profile settings")
                 delegate: labelDelegate
-                width: tableView.width * 0.4
+                width: (tableView.width * 0.4) | 0
             }
             TableViewColumn
             {
                 role: "original_value"
                 title: catalog.i18nc("@title:column", "Default")
-                width: tableView.width * 0.3
+                width: (tableView.width * 0.3) | 0
                 delegate: defaultDelegate
             }
             TableViewColumn
             {
                 role: "user_value"
                 title: catalog.i18nc("@title:column", "Customized")
-                width: tableView.width * 0.3 - 1
+                width: (tableView.width * 0.3) | 0
             }
             section.property: "category"
             section.delegate: Label

resources/qml/JobSpecs.qml

@@ -157,19 +157,6 @@ Item {
             width: parent.width
             height: parent.height
 
-            UM.RecolorImage
-            {
-                id: timeIcon
-                anchors.right: timeSpecPerFeatureTooltipArea.left
-                anchors.rightMargin: UM.Theme.getSize("default_margin").width/2
-                anchors.verticalCenter: parent.verticalCenter
-                width: UM.Theme.getSize("save_button_specs_icons").width
-                height: UM.Theme.getSize("save_button_specs_icons").height
-                sourceSize.width: width
-                sourceSize.height: width
-                color: UM.Theme.getColor("text_subtext")
-                source: UM.Theme.getIcon("print_time")
-            }
             UM.TooltipArea
             {
                 id: timeSpecPerFeatureTooltipArea
@@ -205,10 +192,25 @@ Item {
                 anchors.rightMargin: UM.Theme.getSize("default_margin").width
                 anchors.verticalCenter: parent.verticalCenter
 
+                UM.RecolorImage
+                {
+                    id: timeIcon
+                    anchors.left: parent.left
+                    anchors.top: parent.top
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: UM.Theme.getSize("save_button_specs_icons").width
+                    height: UM.Theme.getSize("save_button_specs_icons").height
+                    sourceSize.width: width
+                    sourceSize.height: width
+                    color: UM.Theme.getColor("text_subtext")
+                    source: UM.Theme.getIcon("print_time")
+                }
+
                 Text
                 {
                     id: timeSpec
-                    anchors.left: parent.left
+                    anchors.left: timeIcon.right
+                    anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2
                     anchors.top: parent.top
                     font: UM.Theme.getFont("small")
                     color: UM.Theme.getColor("text_subtext")

resources/qml/Menus/ContextMenu.qml

@@ -78,6 +78,7 @@ Menu
     Dialog
     {
         id: multiplyDialog
+        modality: Qt.ApplicationModal
 
         title: catalog.i18ncp("@title:window", "Multiply Selected Model", "Multiply Selected Models", UM.Selection.selectionCount)
 

resources/qml/Menus/NozzleMenu.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -23,7 +23,7 @@ Menu
             if(printerConnected && Cura.MachineManager.printerOutputDevices[0].hotendIds.length > extruderIndex)
             {
                 var nozzleName = Cura.MachineManager.printerOutputDevices[0].hotendIds[extruderIndex];
-                return catalog.i18nc("@title:menuitem %1 is the value from the printer", "Automatic: %1").arg(nozzleName);
+                return catalog.i18nc("@title:menuitem %1 is the nozzle currently loaded in the printer", "Automatic: %1").arg(nozzleName);
             }
             return "";
         }

resources/qml/OpenFilesIncludingProjectsDialog.qml

@@ -59,7 +59,7 @@ UM.Dialog
         anchors.right: parent.right
         spacing: 10
 
-        Text
+        Label
         {
             text: catalog.i18nc("@text:window", "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?")
             anchors.left: parent.left

resources/qml/Preferences/GeneralPage.qml

@@ -157,6 +157,7 @@ UM.PreferencesPage
                             append({ text: "日本語", code: "jp" })
                             append({ text: "한국어", code: "ko" })
                             append({ text: "Nederlands", code: "nl" })
+                            append({ text: "Polski", code: "pl" })
                             append({ text: "Português do Brasil", code: "ptbr" })
                             append({ text: "Русский", code: "ru" })
                             append({ text: "Türkçe", code: "tr" })

resources/qml/Preferences/MachinesPage.qml

@@ -66,7 +66,7 @@ UM.ManagementPage
         visible: base.currentItem != null
         anchors.fill: parent
 
-        Text
+        Label
         {
             id: machineName
             text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
@@ -146,34 +146,34 @@ UM.ManagementPage
             property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null
             property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
 
-            Text
+            Label
             {
                 text: catalog.i18nc("@label", "Printer type:")
                 visible: base.currentItem && "definition_name" in base.currentItem.metadata
             }
-            Text
+            Label
             {
                 text: (base.currentItem && "definition_name" in base.currentItem.metadata) ? base.currentItem.metadata.definition_name : ""
             }
-            Text
+            Label
             {
                 text: catalog.i18nc("@label", "Connection:")
                 visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId
             }
-            Text
+            Label
             {
-                width: parent.width * 0.7
+                width: (parent.width * 0.7) | 0
                 text: machineInfo.printerConnected ? machineInfo.connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
                 visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId
                 wrapMode: Text.WordWrap
             }
-            Text
+            Label
             {
                 text: catalog.i18nc("@label", "State:")
                 visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId && machineInfo.printerAcceptsCommands
             }
             Label {
-                width: parent.width * 0.7
+                width: (parent.width * 0.7) | 0
                 text:
                 {
                     if(!machineInfo.printerConnected || !machineInfo.printerAcceptsCommands) {

resources/qml/Preferences/MaterialView.qml

@@ -16,8 +16,8 @@ TabView
 
     property bool editingEnabled: false;
     property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€"
-    property real firstColumnWidth: width * 0.45
-    property real secondColumnWidth: width * 0.45
+    property real firstColumnWidth: (width * 0.45) | 0
+    property real secondColumnWidth: (width * 0.45) | 0
     property string containerId: ""
     property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {}
 
@@ -53,7 +53,7 @@ TabView
             flickableItem.flickableDirection: Flickable.VerticalFlick
             frameVisible: true
 
-            property real columnWidth: Math.floor(viewport.width * 0.5) - UM.Theme.getSize("default_margin").width
+            property real columnWidth: (viewport.width * 0.5 - UM.Theme.getSize("default_margin").width) | 0
 
             Flow
             {
@@ -115,8 +115,8 @@ TabView
                         id: colorSelector
                         color: properties.color_code
 
-                        width: colorLabel.height * 0.75
-                        height: colorLabel.height * 0.75
+                        width: (colorLabel.height * 0.75) | 0
+                        height: (colorLabel.height * 0.75) | 0
                         border.width: UM.Theme.getSize("default_lining").height
 
                         anchors.verticalCenter: parent.verticalCenter

resources/qml/Preferences/MaterialsPage.qml

@@ -53,21 +53,21 @@ UM.ManagementPage
 
         Row
         {
-            spacing: UM.Theme.getSize("default_margin").width / 2;
-            anchors.left: parent.left;
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width;
-            anchors.right: parent.right;
+            spacing: (UM.Theme.getSize("default_margin").width / 2) | 0
+            anchors.left: parent.left
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.right: parent.right
             Rectangle
             {
-                width: parent.height * 0.8
-                height: parent.height * 0.8
+                width: (parent.height * 0.8) | 0
+                height: (parent.height * 0.8) | 0
                 color: model.metadata.color_code
                 border.color: isCurrentItem ? palette.highlightedText : palette.text;
                 anchors.verticalCenter: parent.verticalCenter
             }
             Label
             {
-                width: parent.width * 0.3
+                width: (parent.width * 0.3) | 0
                 text: model.metadata.material
                 elide: Text.ElideRight
                 font.italic: model.id == activeId

resources/qml/Preferences/ProfileTab.qml

@@ -51,14 +51,14 @@ Tab
         {
             role: "label"
             title: catalog.i18nc("@title:column", "Setting")
-            width: parent.width * 0.4
+            width: (parent.width * 0.4) | 0
             delegate: itemDelegate
         }
         TableViewColumn
         {
             role: "profile_value"
             title: catalog.i18nc("@title:column", "Profile")
-            width: parent.width * 0.18
+            width: (parent.width * 0.18) | 0
             delegate: itemDelegate
         }
         TableViewColumn
@@ -66,14 +66,14 @@ Tab
             role: "user_value"
             title: catalog.i18nc("@title:column", "Current");
             visible: quality == Cura.MachineManager.globalQualityId
-            width: parent.width * 0.18
+            width: (parent.width * 0.18) | 0
             delegate: itemDelegate
         }
         TableViewColumn
         {
             role: "unit"
             title: catalog.i18nc("@title:column", "Unit")
-            width: parent.width * 0.14
+            width: (parent.width * 0.14) | 0
             delegate: itemDelegate
         }
 

resources/qml/Settings/SettingView.qml

@@ -238,10 +238,16 @@ Item
                     when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0);
                     value:
                     {
+                        // associate this binding with Cura.MachineManager.activeMachineId in the beginning so this
+                        // binding will be triggered when activeMachineId is changed too.
+                        // Otherwise, if this value only depends on the extruderIds, it won't get updated when the
+                        // machine gets changed.
+                        var activeMachineId = Cura.MachineManager.activeMachineId;
+
                         if(!model.settable_per_extruder || machineExtruderCount.properties.value == 1)
                         {
                             //Not settable per extruder or there only is global, so we must pick global.
-                            return Cura.MachineManager.activeMachineId;
+                            return activeMachineId;
                         }
                         if(inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0)
                         {
@@ -254,7 +260,7 @@ Item
                             return ExtruderManager.activeExtruderStackId;
                         }
                         //No extruder tab is selected. Pick the global stack. Shouldn't happen any more since we removed the global tab.
-                        return Cura.MachineManager.activeMachineId;
+                        return activeMachineId;
                     }
                 }
 

resources/qml/Sidebar.qml

@@ -20,6 +20,7 @@ Rectangle
     // Is there an output device for this printer?
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
     property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
+    property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
     property int backendState: UM.Backend.state;
 
     property bool monitoringPrint: false
@@ -344,12 +345,48 @@ Rectangle
 
     Loader
     {
+        id: controlItem
         anchors.bottom: footerSeparator.top
         anchors.top: headerSeparator.bottom
         anchors.left: base.left
         anchors.right: base.right
-        source: monitoringPrint ? "PrintMonitor.qml": "SidebarContents.qml"
-   }
+        sourceComponent:
+        {
+            if(monitoringPrint && connectedPrinter != null)
+            {
+                if(connectedPrinter.controlItem != null)
+                {
+                    return connectedPrinter.controlItem
+                }
+            }
+            return null
+        }
+    }
+
+    Loader
+    {
+        anchors.bottom: footerSeparator.top
+        anchors.top: headerSeparator.bottom
+        anchors.left: base.left
+        anchors.right: base.right
+        source:
+        {
+            if(controlItem.sourceComponent == null)
+            {
+                if(monitoringPrint)
+                {
+                    return "PrintMonitor.qml"
+                } else
+                {
+                    return "SidebarContents.qml"
+                }
+            }
+            else
+            {
+                return ""
+            }
+        }
+    }
 
     Rectangle
     {

resources/qml/SidebarSimple.qml

@@ -65,10 +65,10 @@ Item
             id: infillListView
             property int activeIndex:
             {
-                var density = parseInt(infillDensity.properties.value);
-                var steps = parseInt(infillSteps.properties.value);
                 for(var i = 0; i < infillModel.count; ++i)
                 {
+                    var density = parseInt(infillDensity.properties.value);
+                    var steps = parseInt(infillSteps.properties.value);
                     if(density > infillModel.get(i).percentageMin && density <= infillModel.get(i).percentageMax && steps > infillModel.get(i).stepsMin && steps <= infillModel.get(i).stepsMax)
                     {
                         return i;
@@ -416,6 +416,7 @@ Item
             text: catalog.i18nc("@label", "Build Plate Adhesion");
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
+            elide: Text.ElideRight
         }
 
         CheckBox
@@ -520,6 +521,41 @@ Item
         }
     }
 
+    UM.SettingPropertyProvider
+    {
+        id: infillExtruderNumber
+
+        containerStackId: Cura.MachineManager.activeStackId
+        key: "infill_extruder_nr"
+        watchedProperties: [ "value" ]
+        storeIndex: 0
+    }
+
+    Binding
+    {
+        target: infillDensity
+        property: "containerStackId"
+        value:
+        {
+            var activeMachineId = Cura.MachineManager.activeMachineId;
+            if (machineExtruderCount.properties.value > 1)
+            {
+                var infillExtruderNr = parseInt(infillExtruderNumber.properties.value);
+                if (infillExtruderNr >= 0)
+                {
+                    activeMachineId = ExtruderManager.extruderIds[infillExtruderNumber.properties.value];
+                }
+                else if (ExtruderManager.activeExtruderStackId)
+                {
+                    activeMachineId = ExtruderManager.activeExtruderStackId;
+                }
+            }
+
+            infillSteps.containerStackId = activeMachineId;
+            return activeMachineId;
+        }
+    }
+
     UM.SettingPropertyProvider
     {
         id: infillDensity

resources/qml/WorkspaceSummaryDialog.qml

@@ -95,12 +95,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Type")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: Cura.MachineManager.activeDefinitionName
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
             Row
@@ -110,12 +110,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Name")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: Cura.MachineManager.activeMachineName
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
 
@@ -142,12 +142,12 @@ UM.Dialog
                         Label
                         {
                             text: catalog.i18nc("@action:label", "%1 & material").arg(Cura.MachineManager.activeDefinitionVariantsName)
-                            width: parent.width / 3
+                            width: (parent.width / 3) | 0
                         }
                         Label
                         {
                             text: Cura.MachineManager.activeVariantNames[index] + ", " + modelData
-                            width: parent.width / 3
+                            width: (parent.width / 3) | 0
                         }
                     }
                 }
@@ -170,12 +170,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Not in profile")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", Cura.MachineManager.numUserSettings).arg(Cura.MachineManager.numUserSettings)
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 visible: Cura.MachineManager.numUserSettings
             }
@@ -186,12 +186,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Name")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: Cura.MachineManager.activeQualityName
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
 
             }
@@ -214,12 +214,12 @@ UM.Dialog
                 Label
                 {
                     text: catalog.i18nc("@action:label", "Visible settings:")
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
                 Label
                 {
                     text: catalog.i18nc("@action:label", "%1 out of %2" ).arg(definitionsModel.visibleCount).arg(Cura.MachineManager.totalNumberOfSettings)
-                    width: parent.width / 3
+                    width: (parent.width / 3) | 0
                 }
             }
 

resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg

@@ -0,0 +1,42 @@
+[general]
+version = 2
+name = Draft
+definition = kemiq_q2_beta
+
+[metadata]
+type = quality
+weight = -3
+material = generic_abs
+quality_type = coarse
+setting_version = 2
+
+[values]
+layer_height = 0.35
+layer_height_0 = 0.3
+
+speed_print = 70
+speed_infill = 60
+speed_layer_0 = 20
+speed_wall_0 = 30
+speed_wall_x = 50
+speed_topbottom = 30
+speed_travel = 120
+
+material_print_temperature = 246
+material_bed_temperature = 85
+material_diameter = 1.75
+
+retraction_speed = 50
+retraction_amount = 1.5
+
+adhesion_type = raft
+raft_airgap = 0.25
+raft_margin = 10
+raft_surface_layers = 3
+raft_interface_line_spacing = 2
+raft_speed = 20
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
+raft_surface_line_spacing = 0.4
+
+cool_fan_enabled = False

resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg

@@ -0,0 +1,42 @@
+[general]
+version = 2
+name = Extra Fine
+definition = kemiq_q2_beta
+
+[metadata]
+type = quality
+weight = 1
+material = generic_abs
+quality_type = high
+setting_version = 2
+
+[values]
+layer_height = 0.06
+layer_height_0 = 0.3
+
+speed_print = 40
+speed_infill = 50
+speed_layer_0 = 15
+speed_wall_0 = 20
+speed_wall_x = 40
+speed_topbottom = 20
+speed_travel = 120
+
+material_print_temperature = 246
+material_bed_temperature = 85
+material_diameter = 1.75
+
+retraction_speed = 50
+retraction_amount = 1.5
+
+adhesion_type = raft
+raft_airgap = 0.25
+raft_margin = 10
+raft_surface_layers = 3
+raft_interface_line_spacing = 2
+raft_speed = 20
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
+raft_surface_line_spacing = 0.4
+
+cool_fan_enabled = False