Merge branch 'master' into mb-group-walls

Jenkinsfile

@@ -14,9 +14,14 @@ parallel_nodes(['linux && cura', 'windows && cura']) {
         dir('build') {
             // 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+$/)) {
+                    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/master")
-                cmake("..", "-DCMAKE_PREFIX_PATH=${env.CURA_ENVIRONMENT_PATH} -DCMAKE_BUILD_TYPE=Release -DURANIUM_DIR=${uranium_dir}")
+                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}")
             }
 
             // Try and run the unit tests. If this stage fails, we consider the build to be "unstable".

README.md

@@ -51,6 +51,7 @@ Third party plugins
 * [Auto orientation](https://github.com/nallath/CuraOrientationPlugin): Calculate the optimal orientation for a model.
 * [OctoPrint Plugin](https://github.com/fieldofview/OctoPrintPlugin): Send printjobs directly to OctoPrint and monitor their progress in Cura.
 * [WirelessPrinting Plugin](https://github.com/probonopd/WirelessPrinting): Print wirelessly from Cura to your 3D printer connected to an ESP8266 module.
+* [Electric Print Cost Calculator Plugin](https://github.com/zoff99/ElectricPrintCostCalculator): Calculate the electric costs of a print.
 
 Making profiles for other printers
 ----------------------------------

cura/BuildVolume.py

@@ -871,7 +871,7 @@ class BuildVolume(SceneNode):
         else:
             extruder_index = self._global_container_stack.getProperty(extruder_setting_key, "value")
 
-            if extruder_index == "-1":  # If extruder index is -1 use global instead
+            if str(extruder_index) == "-1":  # If extruder index is -1 use global instead
                 stack = self._global_container_stack
             else:
                 extruder_stack_id = ExtruderManager.getInstance().extruderIds[str(extruder_index)]

cura/ConvexHullDecorator.py

@@ -298,7 +298,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
             self._onChanged()
 
     ##   Private convenience function to get a setting from the correct extruder (as defined by limit_to_extruder property).
-    def _getSettingProperty(self, setting_key, property="value"):
+    def _getSettingProperty(self, setting_key, property = "value"):
         per_mesh_stack = self._node.callDecoration("getStack")
         if per_mesh_stack:
             return per_mesh_stack.getProperty(setting_key, property)
@@ -314,10 +314,8 @@ class ConvexHullDecorator(SceneNodeDecorator):
                 extruder_stack_id = ExtruderManager.getInstance().extruderIds["0"]
             extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0]
             return extruder_stack.getProperty(setting_key, property)
-        else: #Limit_to_extruder is set. Use that one.
-            extruder_stack_id = ExtruderManager.getInstance().extruderIds[str(extruder_index)]
-            stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0]
-            return stack.getProperty(setting_key, property)
+        else: #Limit_to_extruder is set. The global stack handles this then.
+            return self._global_stack.getProperty(setting_key, property)
 
     ## Returns true if node is a descendant or the same as the root node.
     def __isDescendant(self, root, node):

cura/CrashHandler.py

@@ -2,6 +2,9 @@ import sys
 import platform
 import traceback
 import webbrowser
+import faulthandler
+import tempfile
+import os
 import urllib
 
 from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, Qt, QCoreApplication
@@ -91,6 +94,17 @@ def show(exception_type, value, tb):
     crash_info = "Version: {0}\nPlatform: {1}\nQt: {2}\nPyQt: {3}\n\nException:\n{4}"
     crash_info = crash_info.format(version, platform.platform(), QT_VERSION_STR, PYQT_VERSION_STR, trace)
 
+    tmp_file_fd, tmp_file_path = tempfile.mkstemp(prefix = "cura-crash", text = True)
+    os.close(tmp_file_fd)
+    with open(tmp_file_path, "w") as f:
+        faulthandler.dump_traceback(f, all_threads=True)
+    with open(tmp_file_path, "r") as f:
+        data = f.read()
+
+    msg = "-------------------------\n"
+    msg += data
+    crash_info += "\n\n" + msg
+
     textarea.setText(crash_info)
 
     buttons = QDialogButtonBox(QDialogButtonBox.Close, dialog)

cura/CuraApplication.py

@@ -138,13 +138,14 @@ class CuraApplication(QtApplication):
         # From which stack the setting would inherit if not defined per object (handled in the engine)
         # AND for settings which are not settable_per_mesh:
         # which extruder is the only extruder this setting is obtained from
-        SettingDefinition.addSupportedProperty("limit_to_extruder", DefinitionPropertyType.Function, default = "-1")
+        SettingDefinition.addSupportedProperty("limit_to_extruder", DefinitionPropertyType.Function, default = "-1", depends_on = "value")
 
         # For settings which are not settable_per_mesh and not settable_per_extruder:
         # A function which determines the glabel/meshgroup value by looking at the values of the setting in all (used) extruders
         SettingDefinition.addSupportedProperty("resolve", DefinitionPropertyType.Function, default = None, depends_on = "value")
 
         SettingDefinition.addSettingType("extruder", None, str, Validator)
+        SettingDefinition.addSettingType("optional_extruder", None, str, None)
 
         SettingDefinition.addSettingType("[int]", None, str, None)
 
@@ -178,7 +179,8 @@ class CuraApplication(QtApplication):
                 ("machine_stack", ContainerStack.Version): (self.ResourceTypes.MachineStack, "application/x-uranium-containerstack"),
                 ("extruder_train", ContainerStack.Version): (self.ResourceTypes.ExtruderStack, "application/x-uranium-extruderstack"),
                 ("preferences", Preferences.Version):               (Resources.Preferences, "application/x-uranium-preferences"),
-                ("user", InstanceContainer.Version * 1000000 + self.SettingVersion):       (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer")
+                ("user", InstanceContainer.Version * 1000000 + self.SettingVersion):       (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"),
+                ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"),
             }
         )
 
@@ -347,6 +349,8 @@ class CuraApplication(QtApplication):
         self.globalContainerStackChanged.connect(self._onGlobalContainerChanged)
         self._onGlobalContainerChanged()
 
+        self._plugin_registry.addSupportedPluginExtension("curaplugin", "Cura Plugin")
+
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
@@ -488,7 +492,7 @@ class CuraApplication(QtApplication):
 
         self._plugin_registry.loadPlugins()
 
-        if self.getBackend() == None:
+        if self.getBackend() is None:
             raise RuntimeError("Could not load the backend plugin!")
 
         self._plugins_loaded = True

cura/PrinterOutputDevice.py

@@ -3,13 +3,18 @@
 
 from UM.i18n import i18nCatalog
 from UM.OutputDevice.OutputDevice import OutputDevice
-from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QTimer
+from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QTimer, pyqtSignal, QUrl
+from PyQt5.QtQml import QQmlComponent, QQmlContext
 from PyQt5.QtWidgets import QMessageBox
 from enum import IntEnum  # For the connection state tracking.
 
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Logger import Logger
 from UM.Signal import signalemitter
+from UM.PluginRegistry import PluginRegistry
+from UM.Application import Application
+
+import os
 
 i18n_catalog = i18nCatalog("cura")
 
@@ -57,6 +62,11 @@ class PrinterOutputDevice(QObject, OutputDevice):
 
         self._camera_active = False
 
+        self._monitor_view_qml_path = ""
+        self._monitor_component = None
+        self._monitor_item = None
+        self._qml_context = None
+
     def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None):
         raise NotImplementedError("requestWrite needs to be implemented")
 
@@ -111,6 +121,32 @@ class PrinterOutputDevice(QObject, OutputDevice):
     # Signal to be emitted when some drastic change occurs in the remaining time (not when the time just passes on normally).
     preheatBedRemainingTimeChanged = pyqtSignal()
 
+    @pyqtProperty(QObject, constant=True)
+    def monitorItem(self):
+        # Note that we specifically only check if the monitor component is created.
+        # It could be that it failed to actually create the qml item! If we check if the item was created, it will try to
+        # create the item (and fail) every time.
+        if not self._monitor_component:
+            self._createMonitorViewFromQML()
+
+        return self._monitor_item
+
+    def _createMonitorViewFromQML(self):
+        path = QUrl.fromLocalFile(self._monitor_view_qml_path)
+
+        # Because of garbage collection we need to keep this referenced by python.
+        self._monitor_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._monitor_item = self._monitor_component.create(self._qml_context)
+        if self._monitor_item is None:
+            Logger.log("e", "QQmlComponent status %s", self._monitor_component.status())
+            Logger.log("e", "QQmlComponent error string %s", self._monitor_component.errorString())
+
     @pyqtProperty(str, notify=printerTypeChanged)
     def printerType(self):
         return self._printer_type

cura/Settings/ContainerManager.py

@@ -700,7 +700,7 @@ class ContainerManager(QObject):
         self._container_registry.addContainer(duplicated_container)
         return self._getMaterialContainerIdForActiveMachine(new_id)
 
-    ##  Create a new material by cloning Generic PLA and setting the GUID to something unqiue
+    ##  Create a new material by cloning Generic PLA for the current material diameter and setting the GUID to something unqiue
     #
     #   \return \type{str} the id of the newly created container.
     @pyqtSlot(result = str)
@@ -708,14 +708,25 @@ class ContainerManager(QObject):
         # Ensure all settings are saved.
         Application.getInstance().saveSettings()
 
-        containers = self._container_registry.findInstanceContainers(id="generic_pla")
+        global_stack = Application.getInstance().getGlobalContainerStack()
+        if not global_stack:
+            return ""
+
+        approximate_diameter = round(global_stack.getProperty("material_diameter", "value"))
+        containers = self._container_registry.findInstanceContainers(id = "generic_pla*", approximate_diameter = approximate_diameter)
         if not containers:
-            Logger.log("d", "Unable to create a new material by cloning generic_pla, because it doesn't exist.")
+            Logger.log("d", "Unable to create a new material by cloning Generic PLA, because it cannot be found for the material diameter for this machine.")
+            return ""
+
+        base_file = containers[0].getMetaDataEntry("base_file")
+        containers = self._container_registry.findInstanceContainers(id = base_file)
+        if not containers:
+            Logger.log("d", "Unable to create a new material by cloning Generic PLA, because the base file for Generic PLA for this machine can not be found.")
             return ""
 
         # Create a new ID & container to hold the data.
         new_id = self._container_registry.uniqueName("custom_material")
-        container_type = type(containers[0])  # Could be either a XMLMaterialProfile or a InstanceContainer
+        container_type = type(containers[0])  # Always XMLMaterialProfile, since we specifically clone the base_file
         duplicated_container = container_type(new_id)
 
         # Instead of duplicating we load the data from the basefile again.

cura/Settings/CuraContainerRegistry.py

@@ -4,6 +4,9 @@
 import os
 import os.path
 import re
+
+from typing import Optional
+
 from PyQt5.QtWidgets import QMessageBox
 
 from UM.Decorators import override
@@ -199,8 +202,12 @@ class CuraContainerRegistry(ContainerRegistry):
                 new_name = self.uniqueName(name_seed)
                 if type(profile_or_list) is not list:
                     profile = profile_or_list
-                    self._configureProfile(profile, name_seed, new_name)
-                    return { "status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile.getName()) }
+
+                    result = self._configureProfile(profile, name_seed, new_name)
+                    if result is not None:
+                        return {"status": "error", "message": catalog.i18nc("@info:status", "Failed to import profile from <filename>{0}</filename>: <message>{1}</message>", file_name, result)}
+
+                    return {"status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile.getName())}
                 else:
                     profile_index = -1
                     global_profile = None
@@ -230,7 +237,9 @@ class CuraContainerRegistry(ContainerRegistry):
                             global_profile = profile
                             profile_id = (global_container_stack.getBottom().getId() + "_" + name_seed).lower().replace(" ", "_")
 
-                        self._configureProfile(profile, profile_id, new_name)
+                        result = self._configureProfile(profile, profile_id, new_name)
+                        if result is not None:
+                            return {"status": "error", "message": catalog.i18nc("@info:status", "Failed to import profile from <filename>{0}</filename>: <message>{1}</message>", file_name, result)}
 
                         profile_index += 1
 
@@ -244,7 +253,14 @@ class CuraContainerRegistry(ContainerRegistry):
         super().load()
         self._fixupExtruders()
 
-    def _configureProfile(self, profile, id_seed, new_name):
+    ##  Update an imported profile to match the current machine configuration.
+    #
+    #   \param profile The profile to configure.
+    #   \param id_seed The base ID for the profile. May be changed so it does not conflict with existing containers.
+    #   \param new_name The new name for the profile.
+    #
+    #   \return None if configuring was successful or an error message if an error occurred.
+    def _configureProfile(self, profile: InstanceContainer, id_seed: str, new_name: str) -> Optional[str]:
         profile.setReadOnly(False)
         profile.setDirty(True)  # Ensure the profiles are correctly saved
 
@@ -257,15 +273,36 @@ class CuraContainerRegistry(ContainerRegistry):
         else:
             profile.addMetaDataEntry("type", "quality_changes")
 
+        quality_type = profile.getMetaDataEntry("quality_type")
+        if not quality_type:
+            return catalog.i18nc("@info:status", "Profile is missing a quality type.")
+
+        quality_type_criteria = {"quality_type": quality_type}
         if self._machineHasOwnQualities():
             profile.setDefinition(self._activeQualityDefinition())
             if self._machineHasOwnMaterials():
-                profile.addMetaDataEntry("material", self._activeMaterialId())
+                active_material_id = self._activeMaterialId()
+                if active_material_id:  # only update if there is an active material
+                    profile.addMetaDataEntry("material", active_material_id)
+                    quality_type_criteria["material"] = active_material_id
+
+            quality_type_criteria["definition"] = profile.getDefinition().getId()
+
         else:
             profile.setDefinition(ContainerRegistry.getInstance().findDefinitionContainers(id="fdmprinter")[0])
+            quality_type_criteria["definition"] = "fdmprinter"
+
+        # Check to make sure the imported profile actually makes sense in context of the current configuration.
+        # This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as
+        # successfully imported but then fail to show up.
+        qualities = self.findInstanceContainers(**quality_type_criteria)
+        if not qualities:
+            return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type)
 
         ContainerRegistry.getInstance().addContainer(profile)
 
+        return None
+
     ##  Gets a list of profile writer plugins
     #   \return List of tuples of (plugin_id, meta_data).
     def _getIOPlugins(self, io_type):

cura/Settings/CuraContainerStack.py

@@ -5,7 +5,7 @@ import os.path
 
 from typing import Any, Optional
 
-from PyQt5.QtCore import pyqtProperty, pyqtSignal
+from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject
 from UM.FlameProfiler import pyqtSlot
 
 from UM.Decorators import override
@@ -250,7 +250,7 @@ class CuraContainerStack(ContainerStack):
     ##  Get the definition container.
     #
     #   \return The definition container. Should always be a valid container, but can be equal to the empty InstanceContainer.
-    @pyqtProperty(DefinitionContainer, fset = setDefinition, notify = pyqtContainersChanged)
+    @pyqtProperty(QObject, fset = setDefinition, notify = pyqtContainersChanged)
     def definition(self) -> DefinitionContainer:
         return self._containers[_ContainerIndexes.Definition]
 

cura/Settings/CuraStackBuilder.py

@@ -30,6 +30,11 @@ class CuraStackBuilder:
 
         machine_definition = definitions[0]
         name = registry.createUniqueName("machine", "", name, machine_definition.name)
+        # Make sure the new name does not collide with any definition or (quality) profile
+        # createUniqueName() only looks at other stacks, but not at definitions or quality profiles
+        # Note that we don't go for uniqueName() immediately because that function matches with ignore_case set to true
+        if registry.findContainers(id = name):
+            name = registry.uniqueName(name)
 
         new_global_stack = cls.createGlobalStack(
             new_stack_id = name,

cura/Settings/ExtruderManager.py

@@ -15,7 +15,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry #Finding containers
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.SettingFunction import SettingFunction
 from UM.Settings.ContainerStack import ContainerStack
-from UM.Settings.DefinitionContainer import DefinitionContainer
+from UM.Settings.Interfaces import DefinitionContainerInterface
 from typing import Optional, List, TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
@@ -74,7 +74,7 @@ class ExtruderManager(QObject):
         except KeyError:
             return 0
 
-    @pyqtProperty("QVariantMap", notify=extrudersChanged)
+    @pyqtProperty("QVariantMap", notify = extrudersChanged)
     def extruderIds(self):
         map = {}
         global_stack_id = Application.getInstance().getGlobalContainerStack().getId()
@@ -151,14 +151,14 @@ class ExtruderManager(QObject):
                     selected_nodes.append(node)
 
             # Then, figure out which nodes are used by those selected nodes.
+            global_stack = Application.getInstance().getGlobalContainerStack()
+            current_extruder_trains = self._extruder_trains.get(global_stack.getId())
             for node in selected_nodes:
                 extruder = node.callDecoration("getActiveExtruder")
                 if extruder:
                     object_extruders.add(extruder)
-                else:
-                    global_stack = Application.getInstance().getGlobalContainerStack()
-                    if global_stack.getId() in self._extruder_trains:
-                        object_extruders.add(self._extruder_trains[global_stack.getId()]["0"].getId())
+                elif current_extruder_trains:
+                    object_extruders.add(current_extruder_trains["0"].getId())
 
             self._selected_object_extruders = list(object_extruders)
 
@@ -203,7 +203,7 @@ class ExtruderManager(QObject):
     #   \param machine_definition   The machine definition to add the extruders for.
     #   \param machine_id           The machine_id to add the extruders for.
     @deprecated("Use CuraStackBuilder", "2.6")
-    def addMachineExtruders(self, machine_definition: DefinitionContainer, machine_id: str) -> None:
+    def addMachineExtruders(self, machine_definition: DefinitionContainerInterface, machine_id: str) -> None:
         changed = False
         machine_definition_id = machine_definition.getId()
         if machine_id not in self._extruder_trains:
@@ -237,6 +237,13 @@ class ExtruderManager(QObject):
         if machine_id not in self._extruder_trains:
             self._extruder_trains[machine_id] = {}
             changed = True
+
+        # do not register if an extruder has already been registered at the position on this machine
+        if any(item.getId() == extruder_train.getId() for item in self._extruder_trains[machine_id].values()):
+            Logger.log("w", "Extruder [%s] has already been registered on machine [%s], not doing anything",
+                       extruder_train.getId(), machine_id)
+            return
+
         if extruder_train:
             self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train
             changed = True
@@ -256,7 +263,7 @@ class ExtruderManager(QObject):
     #   \param position             The position of this extruder train in the extruder slots of the machine.
     #   \param machine_id           The id of the "global" stack this extruder is linked to.
     @deprecated("Use CuraStackBuilder::createExtruderStack", "2.6")
-    def createExtruderTrain(self, extruder_definition: DefinitionContainer, machine_definition: DefinitionContainer,
+    def createExtruderTrain(self, extruder_definition: DefinitionContainerInterface, machine_definition: DefinitionContainerInterface,
                             position, machine_id: str) -> None:
         # Cache some things.
         container_registry = ContainerRegistry.getInstance()
@@ -463,7 +470,8 @@ class ExtruderManager(QObject):
         for extruder in self.getMachineExtruders(machine_id):
             ContainerRegistry.getInstance().removeContainer(extruder.userChanges.getId())
             ContainerRegistry.getInstance().removeContainer(extruder.getId())
-        del self._extruder_trains[machine_id]
+        if machine_id in self._extruder_trains:
+            del self._extruder_trains[machine_id]
 
     ##  Returns extruders for a specific machine.
     #
@@ -517,7 +525,7 @@ class ExtruderManager(QObject):
     #
     #   This is exposed to SettingFunction so it can be used in value functions.
     #
-    #   \param key The key of the setting to retieve values for.
+    #   \param key The key of the setting to retrieve values for.
     #
     #   \return A list of values for all extruders. If an extruder does not have a value, it will not be in the list.
     #           If no extruder has the value, the list will contain the global value.

cura/Settings/ExtruderStack.py

@@ -64,9 +64,10 @@ class ExtruderStack(CuraContainerStack):
 
         limit_to_extruder = super().getProperty(key, "limit_to_extruder")
         if (limit_to_extruder is not None and limit_to_extruder != "-1") and self.getMetaDataEntry("position") != str(limit_to_extruder):
-            result = self.getNextStack().extruders[str(limit_to_extruder)].getProperty(key, property_name)
-            if result is not None:
-                return result
+            if str(limit_to_extruder) in self.getNextStack().extruders:
+                result = self.getNextStack().extruders[str(limit_to_extruder)].getProperty(key, property_name)
+                if result is not None:
+                    return result
 
         return super().getProperty(key, property_name)
 

cura/Settings/ExtrudersModel.py

@@ -1,12 +1,15 @@
-# Copyright (c) 2016 Ultimaker B.V.
+# Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the AGPLv3 or higher.
 
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty, QTimer
+from typing import Iterable
 
 import UM.Qt.ListModel
 from UM.Application import Application
 import UM.FlameProfiler
 from cura.Settings.ExtruderManager import ExtruderManager
+from cura.Settings.ExtruderStack import ExtruderStack #To listen to changes on the extruders.
+from cura.Settings.MachineManager import MachineManager #To listen to changes on the extruders of the currently active machine.
 
 ##  Model that holds extruders.
 #
@@ -66,16 +69,13 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
         self._add_global = False
         self._simple_names = False
 
-        self._active_extruder_stack = None
+        self._active_machine_extruders = [] # type: Iterable[ExtruderStack]
+        self._add_optional_extruder = False
 
         #Listen to changes.
-        Application.getInstance().globalContainerStackChanged.connect(self._updateExtruders)
-        manager = ExtruderManager.getInstance()
-
-        self._updateExtruders()
-
-        manager.activeExtruderChanged.connect(self._onActiveExtruderChanged)
-        self._onActiveExtruderChanged()
+        Application.getInstance().globalContainerStackChanged.connect(self._extrudersChanged) #When the machine is swapped we must update the active machine extruders.
+        ExtruderManager.getInstance().extrudersChanged.connect(self._extrudersChanged) #When the extruders change we must link to the stack-changed signal of the new extruder.
+        self._extrudersChanged() #Also calls _updateExtruders.
 
     def setAddGlobal(self, add):
         if add != self._add_global:
@@ -89,6 +89,18 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
     def addGlobal(self):
         return self._add_global
 
+    addOptionalExtruderChanged = pyqtSignal()
+
+    def setAddOptionalExtruder(self, add_optional_extruder):
+        if add_optional_extruder != self._add_optional_extruder:
+            self._add_optional_extruder = add_optional_extruder
+            self.addOptionalExtruderChanged.emit()
+            self._updateExtruders()
+
+    @pyqtProperty(bool, fset = setAddOptionalExtruder, notify = addOptionalExtruderChanged)
+    def addOptionalExtruder(self):
+        return self._add_optional_extruder
+
     ##  Set the simpleNames property.
     def setSimpleNames(self, simple_names):
         if simple_names != self._simple_names:
@@ -104,17 +116,31 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
     def simpleNames(self):
         return self._simple_names
 
-    def _onActiveExtruderChanged(self):
-        manager = ExtruderManager.getInstance()
-        active_extruder_stack = manager.getActiveExtruderStack()
-        if self._active_extruder_stack != active_extruder_stack:
-            if self._active_extruder_stack:
-                self._active_extruder_stack.containersChanged.disconnect(self._onExtruderStackContainersChanged)
+    ##  Links to the stack-changed signal of the new extruders when an extruder
+    #   is swapped out or added in the current machine.
+    #
+    #   \param machine_id The machine for which the extruders changed. This is
+    #   filled by the ExtruderManager.extrudersChanged signal when coming from
+    #   that signal. Application.globalContainerStackChanged doesn't fill this
+    #   signal; it's assumed to be the current printer in that case.
+    def _extrudersChanged(self, machine_id = None):
+        if machine_id is not None:
+            if Application.getInstance().getGlobalContainerStack() is None:
+                return #No machine, don't need to update the current machine's extruders.
+            if machine_id != Application.getInstance().getGlobalContainerStack().getId():
+                return #Not the current machine.
+        #Unlink from old extruders.
+        for extruder in self._active_machine_extruders:
+            extruder.containersChanged.disconnect(self._onExtruderStackContainersChanged)
 
-            if active_extruder_stack:
-                # Update the model when the material container is changed
-                active_extruder_stack.containersChanged.connect(self._onExtruderStackContainersChanged)
-            self._active_extruder_stack = active_extruder_stack
+        #Link to new extruders.
+        self._active_machine_extruders = []
+        extruder_manager = ExtruderManager.getInstance()
+        for extruder in extruder_manager.getExtruderStacks():
+            extruder.containersChanged.connect(self._onExtruderStackContainersChanged)
+            self._active_machine_extruders.append(extruder)
+
+        self._updateExtruders() #Since the new extruders may have different properties, update our own model.
 
     def _onExtruderStackContainersChanged(self, container):
         # Update when there is an empty container or material change
@@ -184,5 +210,16 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
 
         if changed:
             items.sort(key = lambda i: i["index"])
+            # We need optional extruder to be last, so add it after we do sorting.
+            # This way we can simply intrepret the -1 of the index as the last item (which it now always is)
+            if self._add_optional_extruder:
+                item = {
+                    "id": "",
+                    "name": "Not overridden",
+                    "color": "#ffffff",
+                    "index": -1,
+                    "definition": ""
+                }
+                items.append(item)
             self.setItems(items)
             self.modelChanged.emit()

cura/Settings/GlobalStack.py

@@ -52,12 +52,16 @@ class GlobalStack(CuraContainerStack):
         extruder_count = self.getProperty("machine_extruder_count", "value")
         if extruder_count and len(self._extruders) + 1 > extruder_count:
             Logger.log("w", "Adding extruder {meta} to {id} but its extruder count is {count}".format(id = self.id, count = extruder_count, meta = str(extruder.getMetaData())))
+            return
 
         position = extruder.getMetaDataEntry("position")
         if position is None:
             Logger.log("w", "No position defined for extruder {extruder}, cannot add it to stack {stack}", extruder = extruder.id, stack = self.id)
             return
 
+        if any(item.getId() == extruder.id for item in self._extruders.values()):
+            Logger.log("w", "Extruder [%s] has already been added to this stack [%s]", extruder.id, self._id)
+            return
         self._extruders[position] = extruder
 
     ##  Overridden from ContainerStack

cura/Settings/MachineManager.py

@@ -16,7 +16,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.SettingFunction import SettingFunction
-from UM.Signal import postponeSignals
+from UM.Signal import postponeSignals, CompressTechnique
 import UM.FlameProfiler
 
 from cura.QualityManager import QualityManager
@@ -220,6 +220,7 @@ class MachineManager(QObject):
 
             if old_index is not None:
                 extruder_manager.setActiveExtruderIndex(old_index)
+        self._auto_materials_changed = {} #Processed all of them now.
 
     def _autoUpdateHotends(self):
         extruder_manager = ExtruderManager.getInstance()
@@ -236,6 +237,7 @@ class MachineManager(QObject):
 
             if old_index is not None:
                 extruder_manager.setActiveExtruderIndex(old_index)
+        self._auto_hotends_changed = {} #Processed all of them now.
 
     def _onGlobalContainerChanged(self):
         if self._global_container_stack:
@@ -468,7 +470,7 @@ class MachineManager(QObject):
 
         return ""
 
-    @pyqtProperty("QObject", notify = globalContainerChanged)
+    @pyqtProperty(QObject, notify = globalContainerChanged)
     def activeMachine(self) -> "GlobalStack":
         return self._global_container_stack
 
@@ -703,7 +705,7 @@ class MachineManager(QObject):
     #  Depending on from/to material+current variant, a quality profile is chosen and set.
     @pyqtSlot(str)
     def setActiveMaterial(self, material_id: str):
-        with postponeSignals(*self._getContainerChangedSignals(), compress = True):
+        with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue):
             containers = ContainerRegistry.getInstance().findInstanceContainers(id = material_id)
             if not containers or not self._active_container_stack:
                 return
@@ -768,7 +770,7 @@ class MachineManager(QObject):
 
     @pyqtSlot(str)
     def setActiveVariant(self, variant_id: str):
-        with postponeSignals(*self._getContainerChangedSignals(), compress = True):
+        with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue):
             containers = ContainerRegistry.getInstance().findInstanceContainers(id = variant_id)
             if not containers or not self._active_container_stack:
                 return
@@ -779,7 +781,7 @@ class MachineManager(QObject):
                 self.blurSettings.emit()
                 self._active_container_stack.variant = containers[0]
                 Logger.log("d", "Active variant changed to {active_variant_id}".format(active_variant_id = containers[0].getId()))
-                preferred_material = None
+                preferred_material_name = None
                 if old_material:
                     preferred_material_name = old_material.getName()
 
@@ -791,7 +793,7 @@ class MachineManager(QObject):
     #   \param quality_id The quality_id of either a quality or a quality_changes
     @pyqtSlot(str)
     def setActiveQuality(self, quality_id: str):
-        with postponeSignals(*self._getContainerChangedSignals(), compress = True):
+        with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue):
             self.blurSettings.emit()
 
             containers = ContainerRegistry.getInstance().findInstanceContainers(id = quality_id)

cura/Settings/SettingInheritanceManager.py

@@ -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.
 
 from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal
@@ -35,7 +35,7 @@ class SettingInheritanceManager(QObject):
     ##  Get the keys of all children settings with an override.
     @pyqtSlot(str, result = "QStringList")
     def getChildrenKeysWithOverride(self, key):
-        definitions = self._global_container_stack.getBottom().findDefinitions(key=key)
+        definitions = self._global_container_stack.definition.findDefinitions(key=key)
         if not definitions:
             Logger.log("w", "Could not find definition for key [%s]", key)
             return []
@@ -55,7 +55,7 @@ class SettingInheritanceManager(QObject):
             Logger.log("w", "Unable to find extruder for current machine with index %s", extruder_index)
             return []
 
-        definitions = self._global_container_stack.getBottom().findDefinitions(key=key)
+        definitions = self._global_container_stack.definition.findDefinitions(key=key)
         if not definitions:
             Logger.log("w", "Could not find definition for key [%s] (2)", key)
             return []
@@ -93,7 +93,7 @@ class SettingInheritanceManager(QObject):
 
     def _onPropertyChanged(self, key, property_name):
         if (property_name == "value" or property_name == "enabled") and self._global_container_stack:
-            definitions = self._global_container_stack.getBottom().findDefinitions(key = key)
+            definitions = self._global_container_stack.definition.findDefinitions(key = key)
             if not definitions:
                 return
 
@@ -198,6 +198,10 @@ class SettingInheritanceManager(QObject):
     def _update(self):
         self._settings_with_inheritance_warning = []  # Reset previous data.
 
+        # Make sure that the GlobalStack is not None. sometimes the globalContainerChanged signal gets here late.
+        if self._global_container_stack is None:
+            return
+
         # Check all setting keys that we know of and see if they are overridden.
         for setting_key in self._global_container_stack.getAllKeys():
             override = self._settingIsOverwritingInheritance(setting_key)
@@ -205,7 +209,7 @@ class SettingInheritanceManager(QObject):
                 self._settings_with_inheritance_warning.append(setting_key)
 
         # Check all the categories if any of their children have their inheritance overwritten.
-        for category in self._global_container_stack.getBottom().findDefinitions(type = "category"):
+        for category in self._global_container_stack.definition.findDefinitions(type = "category"):
             if self._recursiveCheck(category):
                 self._settings_with_inheritance_warning.append(category.key)
 

cura/ZOffsetDecorator.py

@@ -3,6 +3,7 @@ from UM.Scene.SceneNodeDecorator import SceneNodeDecorator
 ##  A decorator that stores the amount an object has been moved below the platform.
 class ZOffsetDecorator(SceneNodeDecorator):
     def __init__(self):
+        super().__init__()
         self._z_offset = 0
 
     def setZOffset(self, offset):

cura_app.py

@@ -5,6 +5,7 @@
 import os
 import sys
 import platform
+import faulthandler
 
 from UM.Platform import Platform
 
@@ -53,12 +54,14 @@ import Arcus #@UnusedImport
 import cura.CuraApplication
 import cura.Settings.CuraContainerRegistry
 
-if Platform.isWindows() and hasattr(sys, "frozen"):
+if hasattr(sys, "frozen"):
     dirpath = os.path.expanduser("~/AppData/Local/cura/")
     os.makedirs(dirpath, exist_ok = True)
     sys.stdout = open(os.path.join(dirpath, "stdout.log"), "w")
     sys.stderr = open(os.path.join(dirpath, "stderr.log"), "w")
 
+faulthandler.enable()
+
 # Force an instance of CuraContainerRegistry to be created and reused later.
 cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance()
 

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -312,31 +312,20 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         return WorkspaceReader.PreReadResult.accepted
 
     ## Overrides an ExtruderStack in the given GlobalStack and returns the new ExtruderStack.
-    def _overrideExtruderStack(self, global_stack, extruder_index, extruder_file_content):
-        extruder_stack = global_stack.extruders[extruder_index]
-        machine_extruder_count = len(global_stack.extruders)
+    def _overrideExtruderStack(self, global_stack, extruder_file_content):
+        # get extruder position first
+        extruder_config = configparser.ConfigParser()
+        extruder_config.read_string(extruder_file_content)
+        if not extruder_config.has_option("metadata", "position"):
+            msg = "Could not find 'metadata/position' in extruder stack file"
+            Logger.log("e", "Could not find 'metadata/position' in extruder stack file")
+            raise RuntimeError(msg)
+        extruder_position = extruder_config.get("metadata", "position")
 
-        old_extruder_stack_id = extruder_stack.getId()
-
-        # HACK: There are two cases:
-        #        - the new ExtruderStack has the same ID as the one we are overriding
-        #        - they don't have the same ID
-        # In the second case, directly overriding the existing ExtruderStack will leave the old stack file
-        # in the Cura directory, and this will cause a problem when we restart Cura. So, we always delete
-        # the existing file first.
-        self._container_registry._deleteFiles(extruder_stack)
+        extruder_stack = global_stack.extruders[extruder_position]
 
         # override the given extruder stack
         extruder_stack.deserialize(extruder_file_content)
-        # HACK: The deserialize() of ExtruderStack will add itself to the GlobalStack, which is redundant here.
-        #       So we need to remove the new entries in the GlobalStack.
-        global_stack._extruders = global_stack._extruders[:machine_extruder_count]
-
-        # HACK: clean and fill the container query cache again
-        if old_extruder_stack_id in self._container_registry._id_container_cache:
-            del self._container_registry._id_container_cache[old_extruder_stack_id]
-        new_extruder_stack_id = extruder_stack.getId()
-        self._container_registry._id_container_cache[new_extruder_stack_id] = extruder_stack
 
         # return the new ExtruderStack
         return extruder_stack
@@ -465,13 +454,13 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
             container_id = self._stripFileToId(instance_container_file)
             serialized = archive.open(instance_container_file).read().decode("utf-8")
 
-            # HACK! we ignore the "metadata/type = quality" instance containers!
+            # HACK! we ignore "quality" and "variant" instance containers!
             parser = configparser.ConfigParser()
             parser.read_string(serialized)
             if not parser.has_option("metadata", "type"):
                 Logger.log("w", "Cannot find metadata/type in %s, ignoring it", instance_container_file)
                 continue
-            if parser.get("metadata", "type") == "quality":
+            if parser.get("metadata", "type") in self._ignored_instance_container_types:
                 continue
 
             instance_container = InstanceContainer(container_id)
@@ -648,7 +637,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                     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, index, extruder_file_content)
+                        stack = self._overrideExtruderStack(global_stack, extruder_file_content)
 
                     elif self._resolve_strategies["machine"] == "new":
                         # create a new extruder stack from this one
@@ -679,7 +668,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                     # 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, index, extruder_file_content)
+                        stack = self._overrideExtruderStack(global_stack, extruder_file_content)
 
                     elif self._resolve_strategies["machine"] == "new":
                         # container not found, create a new one

plugins/3MFReader/__init__.py

@@ -16,7 +16,7 @@ from UM.Platform import Platform
 catalog = i18nCatalog("cura")
 
 def getMetaData() -> Dict:
-    # Workarround for osx not supporting double file extensions correclty.
+    # Workarround for osx not supporting double file extensions correctly.
     if Platform.isOSX():
         workspace_extension = "3mf"
     else:

plugins/3MFWriter/__init__.py

@@ -10,10 +10,17 @@ except ImportError:
 from . import ThreeMFWorkspaceWriter
 
 from UM.i18n import i18nCatalog
+from UM.Platform import Platform
 
 i18n_catalog = i18nCatalog("uranium")
 
 def getMetaData():
+    # Workarround for osx not supporting double file extensions correctly.
+    if Platform.isOSX():
+        workspace_extension = "3mf"
+    else:
+        workspace_extension = "curaproject.3mf"
+
     metaData = {
         "plugin": {
             "name": i18n_catalog.i18nc("@label", "3MF Writer"),
@@ -35,7 +42,7 @@ def getMetaData():
         }
         metaData["workspace_writer"] = {
             "output": [{
-                "extension": "curaproject.3mf",
+                "extension": workspace_extension,
                 "description": i18n_catalog.i18nc("@item:inlistbox", "Cura Project 3MF file"),
                 "mime_type": "application/x-curaproject+xml",
                 "mode": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter.OutputMode.BinaryMode

plugins/ChangeLogPlugin/ChangeLog.txt

@@ -1,3 +1,82 @@
+[2.6.0]
+*Cura versions
+Cura 2.6 beta has local version folders, which means the new version won’t overwrite the existing configuration and profiles from older versions, but can create a new folder instead. You can now safely check out new beta versions and, if necessary, start up an older version without the danger of losing your profiles.
+
+*Better support adhesion
+We’ve added extra support settings to allow the creation of improved support profiles with better PVA/PLA adhesion. The Support Interface settings, such as speed and density, are now split up into Support Roof and Support Floor settings.
+
+*Multi-extrusion support for custom FDM printers
+Custom third-party printers and Ultimaker modifications now have multi-extrusion support. Thanks to Aldo Hoeben for this feature.
+
+*Model auto-arrange
+We’ve improved placing multiple models or multiplying the same ones, making it easier to arrange your build plate. If there’s not enough build plate space or the model is placed beyond the build plate, you can rectify this by selecting ‘Arrange all models’ in the context menu or by pressing Command+R (MacOS) or Ctrl+R (Windows and Linux). Cura 2.6 beta will then find a better solution for model positioning.
+
+*Gradual infill
+You can now find the Gradual Infill button in Recommended mode. This setting makes the infill concentrated near the top of the model – so that we can save time and material for the lower parts of the model. This functionality is especially useful when printing with flexible materials.
+
+*Support meshes
+It’s now possible to load an extra model that will be used as a support structure.
+
+*Mold
+This is a bit of an experimental improvement. Users can use it to print a mold from a 3D model, which can be cast afterwards with the material that you would like your model to have.
+
+*Towers for tiny overhangs
+We’ve added a new support option allowing users to achieve more reliable results by creating towers to support even the smallest overhangs.
+
+*Cutting meshes
+Easily transform any model into a dual-extrusion print by applying a pattern for the second extruder. All areas of the original model, which also fall inside the pattern model, will be printed by the extruder selected for the pattern.
+
+*Extruder per model selection via the context menu or extruder buttons
+You can now select the necessary extruder in the right-click menu or extruder buttons. This is a quicker and more user-friendly process. The material color for each extruder will also be represented in the extruder icons.
+
+*Custom toggle
+We have made the interface a little bit cleaner and more user-friendly for switching from Recommended to Custom mode.
+
+*Plugin installer
+It used to be fairly tricky to install new plugins. We have now added a button to select and install new plugins with ease – you will find it in Preferences.
+
+*Project-based menu
+It’s a lot simpler to save and open files, and Cura will know if it’s a project, model, or gcode.
+
+*Theme picker
+If you have a custom theme, you can now apply it more easily in the preferences screen.
+
+*Time estimates per feature
+<<<<<<< HEAD
+You can hover over the print time estimate in the lower right corner to see how the printing time is divided over the printing features (walls, infill, etc.).
+=======
+You can hover over the print time estimate in the lower right corner to see how the printing time is divided over the printing features (walls, infill, etc.). Thanks to 14bitVoid for this feature.
+>>>>>>> 2.6
+
+*Invert the direction of camera zoom
+We’ve added an option to invert mouse direction for a better user experience.
+
+*Olsson block upgrade
+<<<<<<< HEAD
+Ultimaker 2 users can now specify if they have the Olsson block installed on their machine.
+
+*OctoPrint plugin
+Cura 2.6 beta allows users to send prints to OctoPrint.
+=======
+Ultimaker 2 users can now specify if they have the Olsson block installed on their machine. Thanks to Aldo Hoeben for this feature.
+
+*OctoPrint plugin
+Cura 2.6 beta allows users to send prints to OctoPrint. Thanks to Aldo Hoeben for this feature.
+>>>>>>> 2.6
+
+*Bug fixes
+- Post Processing plugin
+- Font rendering
+- Progress bar
+- Support Bottom Distance issues
+
+*3rd party printers
+- MAKEIT
+- Alya
+- Peopoly Moai
+- Rigid3D Zero
+- 3D maker
+
 [2.5.0]
 *Improved speed
 We’ve made changing printers, profiles, materials, and print cores even faster. 3MF processing is also much faster now. Opening a 3MF file now takes one tenth of the time.

plugins/CuraEngineBackend/ProcessSlicedLayersJob.py

@@ -31,6 +31,9 @@ catalog = i18nCatalog("cura")
 #
 #   \param color_code html color code, i.e. "#FF0000" -> red
 def colorCodeToRGBA(color_code):
+    if color_code is None:
+        Logger.log("w", "Unable to convert color code, returning default")
+        return [0, 0, 0, 1]
     return [
         int(color_code[1:3], 16) / 255,
         int(color_code[3:5], 16) / 255,
@@ -172,7 +175,7 @@ class ProcessSlicedLayersJob(Job):
             for extruder in extruders:
                 material = extruder.findContainer({"type": "material"})
                 position = int(extruder.getMetaDataEntry("position", default="0"))  # Get the position
-                color_code = material.getMetaDataEntry("color_code")
+                color_code = material.getMetaDataEntry("color_code", default="#e0e000")
                 color = colorCodeToRGBA(color_code)
                 material_color_map[position, :] = color
         else:

plugins/GCodeWriter/GCodeWriter.py

@@ -85,6 +85,7 @@ class GCodeWriter(MeshWriter):
 
         for key in instance_container1.getAllKeys():
             flat_container.setProperty(key, "value", instance_container1.getProperty(key, "value"))
+
         return flat_container
 
 
@@ -106,6 +107,9 @@ class GCodeWriter(MeshWriter):
             return ""
 
         flat_global_container = self._createFlattenedContainerInstance(stack.getTop(), container_with_profile)
+        # If the quality changes is not set, we need to set type manually
+        if flat_global_container.getMetaDataEntry("type", None) is None:
+            flat_global_container.addMetaDataEntry("type", "quality_changes")
 
         # Ensure that quality_type is set. (Can happen if we have empty quality changes).
         if flat_global_container.getMetaDataEntry("quality_type", None) is None:
@@ -120,6 +124,9 @@ class GCodeWriter(MeshWriter):
                 Logger.log("w", "No extruder quality profile found, not writing quality for extruder %s to file!", extruder.getId())
                 continue
             flat_extruder_quality = self._createFlattenedContainerInstance(extruder.getTop(), extruder_quality)
+            # If the quality changes is not set, we need to set type manually
+            if flat_extruder_quality.getMetaDataEntry("type", None) is None:
+                flat_extruder_quality.addMetaDataEntry("type", "quality_changes")
 
             # Ensure that extruder is set. (Can happen if we have empty quality changes).
             if flat_extruder_quality.getMetaDataEntry("extruder", None) is None:

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -94,6 +94,8 @@ Item {
                                         return settingComboBox
                                     case "extruder":
                                         return settingExtruder
+                                    case "optional_extruder":
+                                        return settingOptionalExtruder
                                     case "bool":
                                         return settingCheckBox
                                     case "str":
@@ -342,6 +344,13 @@ Item {
         Cura.SettingExtruder { }
     }
 
+    Component
+    {
+        id: settingOptionalExtruder
+
+        Cura.SettingOptionalExtruder { }
+    }
+
     Component
     {
         id: settingCheckBox;

plugins/UM3NetworkPrinting/DiscoverUM3Action.qml

@@ -12,7 +12,6 @@ Cura.MachineAction
     anchors.fill: parent;
     property var selectedPrinter: null
     property bool completeProperties: true
-    property var connectingToPrinter: null
 
     Connections
     {
@@ -33,9 +32,8 @@ Cura.MachineAction
         if(base.selectedPrinter && base.completeProperties)
         {
             var printerKey = base.selectedPrinter.getKey()
-            if(connectingToPrinter != printerKey) {
-                // prevent an infinite loop
-                connectingToPrinter = printerKey;
+            if(manager.getStoredKey() != printerKey)
+            {
                 manager.setKey(printerKey);
                 completed();
             }

plugins/UM3NetworkPrinting/MonitorItem.qml

@@ -0,0 +1,40 @@
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
+import QtQuick.Layouts 1.1
+import QtQuick.Dialogs 1.1
+
+import UM 1.3 as UM
+import Cura 1.0 as Cura
+
+Component
+{
+    Image
+    {
+        id: cameraImage
+        width: sourceSize.width
+        height: sourceSize.height * width / sourceSize.width
+        anchors.horizontalCenter: parent.horizontalCenter
+        //anchors.verticalCenter: parent.verticalCenter
+        //anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
+        //visible: base.monitoringPrint
+        onVisibleChanged:
+        {
+            if(visible)
+            {
+                OutputDevice.startCamera()
+            } else
+            {
+                OutputDevice.stopCamera()
+            }
+        }
+        source:
+        {
+            if(OutputDevice.cameraImage)
+            {
+                return OutputDevice.cameraImage;
+            }
+            return "";
+        }
+    }
+}

plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py

@@ -178,6 +178,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
         self._last_command = ""
 
         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"):
@@ -306,8 +307,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
     def _stopCamera(self):
         self._camera_timer.stop()
         if self._image_reply:
-            self._image_reply.abort()
-            self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
+            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
 

plugins/UltimakerMachineActions/UMOUpgradeSelection.py

@@ -52,7 +52,6 @@ class UMOUpgradeSelection(MachineAction):
         definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
 
         UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container)
-        # Insert definition_changes between the definition and the variant
-        global_container_stack.insertContainer(-1, definition_changes_container)
+        global_container_stack.definitionChanges = definition_changes_container
 
         return definition_changes_container

plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py

@@ -22,9 +22,10 @@ def getMetaData():
             ("preferences", 4000000):     ("preferences", 4000001,     upgrade.upgradePreferences),
             # NOTE: All the instance containers share the same general/version, so we have to update all of them
             #       if any is updated.
-            ("quality_changes", 2000000): ("quality_changes", 2000001, upgrade.upgradeInstanceContainer),
-            ("user", 2000000):            ("user", 2000001,            upgrade.upgradeInstanceContainer),
-            ("quality", 2000000):         ("quality", 2000001,         upgrade.upgradeInstanceContainer),
+            ("quality_changes", 2000000):       ("quality_changes", 2000001,    upgrade.upgradeInstanceContainer),
+            ("user", 2000000):                  ("user", 2000001,               upgrade.upgradeInstanceContainer),
+            ("quality", 2000000):               ("quality", 2000001,            upgrade.upgradeInstanceContainer),
+            ("definition_changes", 2000000):    ("definition_changes", 2000001, upgrade.upgradeInstanceContainer),
         },
         "sources": {
             "quality_changes": {
@@ -39,6 +40,10 @@ def getMetaData():
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./user"}
             },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            }
         }
     }
 

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -14,9 +14,14 @@ from cura.CuraApplication import CuraApplication
 import UM.Dictionary
 from UM.Settings.InstanceContainer import InstanceContainer, InvalidInstanceError
 from UM.Settings.ContainerRegistry import ContainerRegistry
+from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
+
 
 ##  Handles serializing and deserializing material containers from an XML file
 class XmlMaterialProfile(InstanceContainer):
+    CurrentFdmMaterialVersion = "1.3"
+    Version = 1
+
     def __init__(self, container_id, *args, **kwargs):
         super().__init__(container_id, *args, **kwargs)
         self._inherited_files = []
@@ -120,7 +125,9 @@ class XmlMaterialProfile(InstanceContainer):
 
         builder = ET.TreeBuilder()
 
-        root = builder.start("fdmmaterial", { "xmlns": "http://www.ultimaker.com/material"})
+        root = builder.start("fdmmaterial",
+                             {"xmlns": "http://www.ultimaker.com/material",
+                              "version": self.CurrentFdmMaterialVersion})
 
         ## Begin Metadata Block
         builder.start("metadata")
@@ -386,30 +393,31 @@ class XmlMaterialProfile(InstanceContainer):
         self._path = ""
 
     def getConfigurationTypeFromSerialized(self, serialized: str) -> Optional[str]:
-        return "material"
+        return "materials"
 
     def getVersionFromSerialized(self, serialized: str) -> Optional[int]:
-        version = None
         data = ET.fromstring(serialized)
-        metadata = data.iterfind("./um:metadata/*", self.__namespaces)
-        for entry in metadata:
-            tag_name = _tag_without_namespace(entry)
-            if tag_name == "version":
-                try:
-                    version = int(entry.text)
-                except Exception as e:
-                    raise InvalidInstanceError("Invalid version string '%s': %s" % (entry.text, e))
-                break
-        if version is None:
-            raise InvalidInstanceError("Missing version in metadata")
-        return version
+
+        version = 1
+        # get setting version
+        if "version" in data.attrib:
+            setting_version = self.xmlVersionToSettingVersion(data.attrib["version"])
+        else:
+            setting_version = self.xmlVersionToSettingVersion("1.2")
+
+        return version * 1000000 + setting_version
 
     ##  Overridden from InstanceContainer
     def deserialize(self, serialized):
         # update the serialized data first
         from UM.Settings.Interfaces import ContainerInterface
         serialized = ContainerInterface.deserialize(self, serialized)
-        data = ET.fromstring(serialized)
+
+        try:
+            data = ET.fromstring(serialized)
+        except:
+            Logger.logException("e", "An exception occured while parsing the material profile")
+            return
 
         # Reset previous metadata
         self.clearData() # Ensure any previous data is gone.
@@ -544,7 +552,7 @@ class XmlMaterialProfile(InstanceContainer):
                         variant_containers = ContainerRegistry.getInstance().findInstanceContainers(definition = definition.id, name = hotend_id)
 
                     if not variant_containers:
-                        Logger.log("d", "No variants found with ID or name %s for machine %s", hotend_id, definition.id)
+                        #Logger.log("d", "No variants found with ID or name %s for machine %s", hotend_id, definition.id)
                         continue
 
                     hotend_compatibility = machine_compatibility

plugins/XmlMaterialProfile/XmlMaterialUpgrader.py

@@ -0,0 +1,46 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+import xml.etree.ElementTree as ET
+
+from UM.VersionUpgrade import VersionUpgrade
+
+
+class XmlMaterialUpgrader(VersionUpgrade):
+    def getXmlVersion(self, serialized):
+        data = ET.fromstring(serialized)
+
+        version = 1
+        # get setting version
+        if "version" in data.attrib:
+            setting_version = self._xmlVersionToSettingVersion(data.attrib["version"])
+        else:
+            setting_version = self._xmlVersionToSettingVersion("1.2")
+
+        return version * 1000000 + setting_version
+
+    def _xmlVersionToSettingVersion(self, xml_version: str) -> int:
+        if xml_version == "1.3":
+            return 1
+        return 0 #Older than 1.3.
+
+    def upgradeMaterial(self, serialised, filename):
+        data = ET.fromstring(serialised)
+
+        # update version
+        metadata = data.iterfind("./um:metadata/*", {"um": "http://www.ultimaker.com/material"})
+        for entry in metadata:
+            if _tag_without_namespace(entry) == "version":
+                entry.text = "2"
+                break
+
+        data.attrib["version"] = "1.3"
+
+        # this makes sure that the XML header states encoding="utf-8"
+        new_serialised = ET.tostring(data, encoding="utf-8").decode("utf-8")
+
+        return [filename], [new_serialised]
+
+
+def _tag_without_namespace(element):
+    return element.tag[element.tag.rfind("}") + 1:]

plugins/XmlMaterialProfile/__init__.py

@@ -1,11 +1,16 @@
-# Copyright (c) 2016 Ultimaker B.V.
+# Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the AGPLv3 or higher.
 
 from . import XmlMaterialProfile
+from . import XmlMaterialUpgrader
 
 from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase
 from UM.i18n import i18nCatalog
+
+
 catalog = i18nCatalog("cura")
+upgrader = XmlMaterialUpgrader.XmlMaterialUpgrader()
+
 
 def getMetaData():
     return {
@@ -19,15 +24,36 @@ def getMetaData():
         "settings_container": {
             "type": "material",
             "mimetype": "application/x-ultimaker-material-profile"
+        },
+        "version_upgrade": {
+            ("materials", 1000000): ("materials", 1000001, upgrader.upgradeMaterial),
+        },
+        "sources": {
+            "materials": {
+                "get_version": upgrader.getXmlVersion,
+                "location": {"./materials"}
+            },
         }
     }
 
+
 def register(app):
+    # add Mime type
     mime_type = MimeType(
         name = "application/x-ultimaker-material-profile",
         comment = "Ultimaker Material Profile",
         suffixes = [ "xml.fdm_material" ]
     )
     MimeTypeDatabase.addMimeType(mime_type)
-    return { "settings_container": XmlMaterialProfile.XmlMaterialProfile("default_xml_material_profile") }
 
+    # add upgrade version
+    from cura.CuraApplication import CuraApplication
+    from UM.VersionUpgradeManager import VersionUpgradeManager
+    VersionUpgradeManager.getInstance().registerCurrentVersion(
+        ("materials", XmlMaterialProfile.XmlMaterialProfile.Version * 1000000 + CuraApplication.SettingVersion),
+        (CuraApplication.ResourceTypes.MaterialInstanceContainer, "application/x-uranium-instancecontainer")
+    )
+
+    return {"version_upgrade": upgrader,
+            "settings_container": XmlMaterialProfile.XmlMaterialProfile("default_xml_material_profile"),
+            }

resources/definitions/3dator.def.json

@@ -0,0 +1,62 @@
+{
+    "id": "3Dator",
+    "version": 2,
+    "name": "3Dator",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "3Dator GmbH",
+        "manufacturer": "3Dator GmbH",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker2",
+        "supports_usb_connection": true,
+        "platform": "3dator_platform.stl",
+        "machine_extruder_trains":
+        {
+            "0": "fdmextruder"
+        }
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "3Dator" },
+        "machine_nozzle_size": { "default_value": 0.5 },
+        "speed_travel": { "default_value": 120 },
+        "prime_tower_size": { "default_value": 8.660254037844387 },
+        "infill_sparse_density": { "default_value": 20 },
+        "speed_wall_x": { "default_value": 45 },
+        "speed_wall_0": { "default_value": 40 },
+        "speed_topbottom": { "default_value": 35 },
+        "layer_height": { "default_value": 0.2 },
+        "speed_print": { "default_value": 50 },
+        "speed_infill": { "default_value": 60 },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_height": { "default_value": 260 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_depth": { "default_value": 170 },
+        "machine_width": { "default_value": 180 },
+        "material_diameter": { "default_value": 1.75 },
+        "retraction_speed": {"default_value":100},
+        "cool_fan_speed_min": {"default_value": 20},
+        "cool_fan_speed_max": {"default_value": 70},
+        "adhesion_type": { "default_value": "none" },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-15, -25],
+                [-15, 35],
+                [40, 35],
+                [40, -25]
+            ]
+        },
+        "gantry_height": {
+            "default_value": 30
+        },
+        "machine_start_gcode": {
+            "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21  ;metric values\nG90  ;absolute positioning\nM82  ;set extruder to absolute mode\nM107  ;start with the fan off\nG28 Z0  ;move Z to min endstops\nG28 X0 Y0  ;move X/Y to min endstops\nG29  ;Auto Level\nG1 Z0.6 F{travel_speed} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0  ;zero the extruded length\nG1 X10 E30 F500  ;printing a Line from right to left\nG92 E0  ;zero the extruded length again\nG1 Z2\nG1 F{travel_speed}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white"      },
+        "machine_end_gcode": {
+            "default_value": "M104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28                          ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning"
+        }
+    }
+}

resources/definitions/fdmprinter.def.json

@@ -655,6 +655,7 @@
                             "value": "line_width",
                             "default_value": 0.4,
                             "type": "float",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -669,6 +670,7 @@
                                     "default_value": 0.4,
                                     "value": "wall_line_width",
                                     "type": "float",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "wall_line_width_x":
@@ -682,6 +684,7 @@
                                     "default_value": 0.4,
                                     "value": "wall_line_width",
                                     "type": "float",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -697,6 +700,7 @@
                             "default_value": 0.4,
                             "type": "float",
                             "value": "line_width",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "infill_line_width":
@@ -711,6 +715,7 @@
                             "type": "float",
                             "value": "line_width",
                             "enabled": "infill_sparse_density > 0",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "skirt_brim_line_width":
@@ -773,7 +778,7 @@
                                     "type": "float",
                                     "enabled": "support_enable and support_roof_enable",
                                     "limit_to_extruder": "support_roof_extruder_nr",
-                                    "value": "support_interface_line_width",
+                                    "value": "extruderValue(support_roof_extruder_nr, 'support_interface_line_width')",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
                                 },
@@ -789,7 +794,7 @@
                                     "type": "float",
                                     "enabled": "support_enable and support_bottom_enable",
                                     "limit_to_extruder": "support_bottom_extruder_nr",
-                                    "value": "support_interface_line_width",
+                                    "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_line_width')",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
                                 }
@@ -822,16 +827,59 @@
             "type": "category",
             "children":
             {
+                "wall_extruder_nr":
+                {
+                    "label": "Wall Extruder",
+                    "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,
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1",
+                    "children":
+                    {
+                        "wall_0_extruder_nr":
+                        {
+                            "label": "Outer Wall Extruder",
+                            "description": "The extruder train used for printing the outer wall. This is used in multi-extrusion.",
+                            "type": "optional_extruder",
+                            "default_value": "-1",
+                            "value": "wall_extruder_nr",
+                            "settable_per_mesh": true,
+                            "settable_per_extruder": false,
+                            "settable_per_meshgroup": true,
+                            "settable_globally": true,
+                            "enabled": "machine_extruder_count > 1"
+                        },
+                        "wall_x_extruder_nr":
+                        {
+                            "label": "Inner Walls Extruder",
+                            "description": "The extruder train used for printing the inner walls. This is used in multi-extrusion.",
+                            "type": "optional_extruder",
+                            "default_value": "-1",
+                            "value": "wall_extruder_nr",
+                            "settable_per_mesh": true,
+                            "settable_per_extruder": false,
+                            "settable_per_meshgroup": true,
+                            "settable_globally": true,
+                            "enabled": "machine_extruder_count > 1"
+                        }
+                    }
+                },
                 "wall_thickness":
                 {
                     "label": "Wall Thickness",
-                    "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.",
+                    "description": "The thickness of the walls in the horizontal direction. This value divided by the wall line width defines the number of walls.",
                     "unit": "mm",
                     "default_value": 0.8,
                     "minimum_value": "0",
                     "minimum_value_warning": "line_width",
                     "maximum_value_warning": "10 * line_width",
                     "type": "float",
+                    "limit_to_extruder": "wall_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -845,6 +893,7 @@
                             "maximum_value_warning": "10",
                             "type": "int",
                             "value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -859,8 +908,22 @@
                     "value": "machine_nozzle_size / 2",
                     "minimum_value": "0",
                     "maximum_value_warning": "machine_nozzle_size",
+                    "limit_to_extruder": "wall_0_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,
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1"
+                },
                 "top_bottom_thickness":
                 {
                     "label": "Top/Bottom Thickness",
@@ -871,6 +934,7 @@
                     "minimum_value_warning": "0.6",
                     "maximum_value": "machine_height",
                     "type": "float",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -885,6 +949,7 @@
                             "maximum_value": "machine_height",
                             "type": "float",
                             "value": "top_bottom_thickness",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -898,6 +963,7 @@
                                     "type": "int",
                                     "minimum_value_warning": "2",
                                     "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))",
+                                    "limit_to_extruder": "top_bottom_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -913,6 +979,7 @@
                             "type": "float",
                             "value": "top_bottom_thickness",
                             "maximum_value": "machine_height",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -925,6 +992,7 @@
                                     "default_value": 6,
                                     "type": "int",
                                     "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))",
+                                    "limit_to_extruder": "top_bottom_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -943,6 +1011,7 @@
                         "zigzag": "Zig Zag"
                     },
                     "default_value": "lines",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "top_bottom_pattern_0":
@@ -958,6 +1027,7 @@
                     },
                     "default_value": "lines",
                     "value": "top_bottom_pattern",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "skin_angles":
@@ -967,6 +1037,7 @@
                     "type": "[int]",
                     "default_value": "[ ]",
                     "enabled": "top_bottom_pattern != 'concentric'",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "wall_0_inset":
@@ -979,6 +1050,7 @@
                     "value": "(machine_nozzle_size - wall_line_width_0) / 2 if (wall_line_width_0 < machine_nozzle_size and not outer_inset_first) else 0",
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "machine_nozzle_size",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "outer_inset_first":
@@ -987,6 +1059,7 @@
                     "description": "Prints walls in order of outside to inside when enabled. This can help improve dimensional accuracy in X and Y when using a high viscosity plastic like ABS; however it can decrease outer surface print quality, especially on overhangs.",
                     "type": "bool",
                     "default_value": false,
+                    "enabled": "wall_0_extruder_nr == wall_x_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "optimize_wall_printing_order":
@@ -1003,6 +1076,7 @@
                     "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.",
                     "type": "bool",
                     "default_value": false,
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "travel_compensate_overlapping_walls_enabled":
@@ -1011,6 +1085,7 @@
                     "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.",
                     "type": "bool",
                     "default_value": true,
+                    "limit_to_extruder": "wall_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1021,6 +1096,7 @@
                             "type": "bool",
                             "default_value": true,
                             "value": "travel_compensate_overlapping_walls_enabled",
+                            "limit_to_extruder": "wall_0_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "travel_compensate_overlapping_walls_x_enabled":
@@ -1030,6 +1106,7 @@
                             "type": "bool",
                             "default_value": true,
                             "value": "travel_compensate_overlapping_walls_enabled",
+                            "limit_to_extruder": "wall_x_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -1043,6 +1120,7 @@
                         "everywhere": "Everywhere"
                     },
                     "default_value": "everywhere",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "xy_offset":
@@ -1054,6 +1132,7 @@
                     "minimum_value_warning": "-1",
                     "maximum_value_warning": "1",
                     "default_value": 0,
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "z_seam_type":
@@ -1068,6 +1147,7 @@
                         "random": "Random"
                     },
                     "default_value": "shortest",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "z_seam_x":
@@ -1079,6 +1159,7 @@
                     "default_value": 100.0,
                     "value": "machine_width / 2",
                     "enabled": "z_seam_type == 'back'",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "z_seam_y":
@@ -1090,6 +1171,7 @@
                     "default_value": 100.0,
                     "value": "machine_depth * 3",
                     "enabled": "z_seam_type == 'back'",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "skin_no_small_gaps_heuristic":
@@ -1098,6 +1180,7 @@
                     "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting.",
                     "type": "bool",
                     "default_value": true,
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 }
             }
@@ -1110,6 +1193,19 @@
             "type": "category",
             "children":
             {
+                "infill_extruder_nr":
+                {
+                    "label": "Infill Extruder",
+                    "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,
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1"
+                },
                 "infill_sparse_density":
                 {
                     "label": "Infill Density",
@@ -1119,6 +1215,7 @@
                     "default_value": 20,
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1132,6 +1229,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "infill_line_width",
                             "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' else 1)))",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -1156,6 +1254,7 @@
                     "default_value": "grid",
                     "enabled": "infill_sparse_density > 0",
                     "value": "'lines' if infill_sparse_density > 25 else 'grid'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_angles":
@@ -1164,66 +1263,8 @@
                     "description": "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).",
                     "type": "[int]",
                     "default_value": "[ ]",
-                    "enabled": "infill_pattern != 'concentric' and infill_pattern != 'concentric_3d' and infill_pattern != 'cubicsubdiv'",
-                    "enabled": "infill_sparse_density > 0",
-                    "settable_per_mesh": true
-                },
-                "spaghetti_infill_enabled":
-                {
-                    "label": "Spaghetti Infill",
-                    "description": "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.",
-                    "type": "bool",
-                    "default_value": false,
-                    "enabled": "infill_sparse_density > 0",
-                    "settable_per_mesh": true
-                },
-                "spaghetti_max_infill_angle":
-                {
-                    "label": "Spaghetti Maximum Infill Angle",
-                    "description": "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.",
-                    "unit": "°",
-                    "type": "float",
-                    "default_value": 10,
-                    "minimum_value": "0",
-                    "maximum_value": "90",
-                    "maximum_value_warning": "45",
-                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
-                    "settable_per_mesh": true
-                },
-                "spaghetti_max_height":
-                {
-                    "label": "Spaghetti Infill Maximum Height",
-                    "description": "The maximum height of inside space which can be combined and filled from the top.",
-                    "unit": "mm",
-                    "type": "float",
-                    "default_value": 2.0,
-                    "minimum_value": "layer_height",
-                    "maximum_value_warning": "10.0",
-                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
-                    "settable_per_mesh": true
-                },
-                "spaghetti_inset":
-                {
-                    "label": "Spaghetti Inset",
-                    "description": "The offset from the walls from where the spaghetti infill will be printed.",
-                    "unit": "mm",
-                    "type": "float",
-                    "default_value": 0.2,
-                    "minimum_value_warning": "0",
-                    "maximum_value_warning": "5.0",
-                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
-                    "settable_per_mesh": true
-                },
-                "spaghetti_flow":
-                {
-                    "label": "Spaghetti Flow",
-                    "description": "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.",
-                    "unit": "%",
-                    "type": "float",
-                    "default_value": 20,
-                    "minimum_value": "0",
-                    "maximum_value_warning": "100",
-                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "enabled": "infill_pattern != 'concentric' and infill_pattern != 'concentric_3d' and infill_pattern != 'cubicsubdiv' and infill_sparse_density > 0",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "sub_div_rad_add":
@@ -1237,6 +1278,7 @@
                     "minimum_value_warning": "-1 * infill_line_distance",
                     "maximum_value_warning": "5 * infill_line_distance",
                     "enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_overlap":
@@ -1250,6 +1292,7 @@
                     "minimum_value_warning": "-50",
                     "maximum_value_warning": "100",
                     "enabled": "infill_sparse_density > 0 and infill_pattern != 'concentric'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1262,7 +1305,7 @@
                             "default_value": 0.04,
                             "minimum_value_warning": "-0.5 * machine_nozzle_size",
                             "maximum_value_warning": "machine_nozzle_size",
-                            "value": "infill_line_width * infill_overlap / 100 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0",
+                            "value": "0.5 * ( infill_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0) ) * infill_overlap / 100 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0",
                             "enabled": "infill_sparse_density > 0 and infill_pattern != 'concentric'",
                             "settable_per_mesh": true
                         }
@@ -1279,6 +1322,7 @@
                     "maximum_value_warning": "100",
                     "value": "5 if top_bottom_pattern != 'concentric' else 0",
                     "enabled": "top_bottom_pattern != 'concentric'",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1291,7 +1335,7 @@
                             "default_value": 0.02,
                             "minimum_value_warning": "-0.5 * machine_nozzle_size",
                             "maximum_value_warning": "machine_nozzle_size",
-                            "value": "skin_line_width * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0",
+                            "value": "0.5 * ( skin_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0) ) * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0",
                             "enabled": "top_bottom_pattern != 'concentric'",
                             "settable_per_mesh": true
                         }
@@ -1308,6 +1352,7 @@
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "machine_nozzle_size",
                     "enabled": "infill_sparse_density > 0",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_sparse_thickness":
@@ -1322,6 +1367,7 @@
                     "maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8)",
                     "value": "resolveOrValue('layer_height')",
                     "enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "gradual_infill_steps":
@@ -1334,6 +1380,7 @@
                     "maximum_value_warning": "5",
                     "maximum_value": "0 if spaghetti_infill_enabled else (999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2)))",
                     "enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "gradual_infill_step_height":
@@ -1347,6 +1394,7 @@
                     "minimum_value_warning": "3 * resolveOrValue('layer_height')",
                     "maximum_value_warning": "100",
                     "enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_before_walls":
@@ -1355,7 +1403,7 @@
                     "description": "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface.",
                     "type": "bool",
                     "default_value": true,
-                    "enabled": "infill_sparse_density > 0",
+                    "enabled": "infill_sparse_density > 0 and wall_extruder_nr == infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "min_infill_area":
@@ -1366,6 +1414,7 @@
                     "type": "float",
                     "minimum_value": "0",
                     "default_value": 0,
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "expand_skins_into_infill":
@@ -1374,6 +1423,7 @@
                     "description": "Expand skin areas of top and/or bottom skin of flat surfaces. By default, skins stop under the wall lines that surround infill but this can lead to holes appearing when the infill density is low. This setting extends the skins beyond the wall lines so that the infill on the next layer rests on skin.",
                     "type": "bool",
                     "default_value": false,
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1384,6 +1434,7 @@
                             "type": "bool",
                             "default_value": false,
                             "value": "expand_skins_into_infill",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "expand_lower_skins":
@@ -1392,6 +1443,7 @@
                             "description": "Expand the bottom skin areas (areas with air below) so that they are anchored by the infill layers above and below.",
                             "type": "bool",
                             "default_value": false,
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -1406,6 +1458,7 @@
                     "value": "infill_line_distance * 1.4",
                     "minimum_value": "0",
                     "enabled": "expand_upper_skins or expand_lower_skins",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "max_skin_angle_for_expansion":
@@ -1420,6 +1473,7 @@
                     "maximum_value": "90",
                     "default_value": 20,
                     "enabled": "expand_upper_skins or expand_lower_skins",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1433,6 +1487,7 @@
                             "value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))",
                             "minimum_value": "0",
                             "enabled": "expand_upper_skins or expand_lower_skins",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -1861,6 +1916,7 @@
                             "default_value": 60,
                             "value": "speed_print",
                             "enabled": "infill_sparse_density > 0",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "speed_wall":
@@ -1874,6 +1930,7 @@
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -1888,6 +1945,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 30,
                                     "value": "speed_wall",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "speed_wall_x":
@@ -1901,6 +1959,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 60,
                                     "value": "speed_wall * 2",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -1916,6 +1975,7 @@
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "speed_support":
@@ -1980,7 +2040,7 @@
                                             "maximum_value_warning": "150",
                                             "enabled": "support_roof_enable and support_enable",
                                             "limit_to_extruder": "support_roof_extruder_nr",
-                                            "value": "speed_support_interface",
+                                            "value": "extruderValue(support_roof_extruder_nr, 'speed_support_interface')",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
                                         },
@@ -1996,7 +2056,7 @@
                                             "maximum_value_warning": "150",
                                             "enabled": "support_bottom_enable and support_enable",
                                             "limit_to_extruder": "support_bottom_extruder_nr",
-                                            "value": "speed_support_interface",
+                                            "value": "extruderValue(support_bottom_extruder_nr, 'speed_support_interface')",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
                                         }
@@ -2178,6 +2238,7 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled') and infill_sparse_density > 0",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "acceleration_wall":
@@ -2192,6 +2253,7 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled')",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -2207,6 +2269,7 @@
                                     "default_value": 3000,
                                     "value": "acceleration_wall",
                                     "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "acceleration_wall_x":
@@ -2221,6 +2284,7 @@
                                     "default_value": 3000,
                                     "value": "acceleration_wall",
                                     "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -2237,6 +2301,7 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled')",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "acceleration_support":
@@ -2296,11 +2361,11 @@
                                             "unit": "mm/s²",
                                             "type": "float",
                                             "default_value": 3000,
-                                            "value": "acceleration_support_interface",
+                                            "value": "extruderValue(support_roof_extruder_nr, 'acceleration_support_interface')",
                                             "minimum_value": "0.1",
                                             "minimum_value_warning": "100",
                                             "maximum_value_warning": "10000",
-                                            "enabled": "resolveOrValue('acceleration_enabled') and support_roof_enable and support_enable",
+                                            "enabled": "acceleration_enabled and support_roof_enable and support_enable",
                                             "limit_to_extruder": "support_roof_extruder_nr",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
@@ -2312,11 +2377,11 @@
                                             "unit": "mm/s²",
                                             "type": "float",
                                             "default_value": 3000,
-                                            "value": "acceleration_support_interface",
+                                            "value": "extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface')",
                                             "minimum_value": "0.1",
                                             "minimum_value_warning": "100",
                                             "maximum_value_warning": "10000",
-                                            "enabled": "resolveOrValue('acceleration_enabled') and support_bottom_enable and support_enable",
+                                            "enabled": "acceleration_enabled and support_bottom_enable and support_enable",
                                             "limit_to_extruder": "support_bottom_extruder_nr",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
@@ -2450,6 +2515,7 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled') and infill_sparse_density > 0",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "jerk_wall":
@@ -2463,6 +2529,7 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled')",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -2477,6 +2544,7 @@
                                     "default_value": 20,
                                     "value": "jerk_wall",
                                     "enabled": "resolveOrValue('jerk_enabled')",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "jerk_wall_x":
@@ -2490,6 +2558,7 @@
                                     "default_value": 20,
                                     "value": "jerk_wall",
                                     "enabled": "resolveOrValue('jerk_enabled')",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -2505,6 +2574,7 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled')",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "jerk_support":
@@ -2561,7 +2631,7 @@
                                             "unit": "mm/s",
                                             "type": "float",
                                             "default_value": 20,
-                                            "value": "jerk_support_interface",
+                                            "value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
                                             "minimum_value": "0.1",
                                             "maximum_value_warning": "50",
                                             "enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and support_enable",
@@ -2576,7 +2646,7 @@
                                             "unit": "mm/s",
                                             "type": "float",
                                             "default_value": 20,
-                                            "value": "jerk_support_interface",
+                                            "value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
                                             "minimum_value": "0.1",
                                             "maximum_value_warning": "50",
                                             "enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and support_enable",
@@ -3164,7 +3234,7 @@
                             "default_value": 0.1,
                             "type": "float",
                             "enabled": "support_enable",
-                            "value": "support_z_distance",
+                            "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')",
                             "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr",
                             "settable_per_mesh": true
                         },
@@ -3176,7 +3246,7 @@
                             "minimum_value": "0",
                             "maximum_value_warning": "machine_nozzle_size",
                             "default_value": 0.1,
-                            "value": "support_z_distance if support_type == 'everywhere' else 0",
+                            "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0",
                             "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr",
                             "type": "float",
                             "enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'",
@@ -3295,7 +3365,7 @@
                             "description": "Generate a dense slab of material between the top of support and the model. This will create a skin between the model and support.",
                             "type": "bool",
                             "default_value": false,
-                            "value": "support_interface_enable",
+                            "value": "extruderValue(support_roof_extruder_nr, 'support_interface_enable')",
                             "limit_to_extruder": "support_roof_extruder_nr",
                             "enabled": "support_enable",
                             "settable_per_mesh": true
@@ -3306,7 +3376,7 @@
                             "description": "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support.",
                             "type": "bool",
                             "default_value": false,
-                            "value": "support_interface_enable",
+                            "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_enable')",
                             "limit_to_extruder": "support_bottom_extruder_nr",
                             "enabled": "support_enable",
                             "settable_per_mesh": true
@@ -3338,7 +3408,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "0.2 + layer_height",
                             "maximum_value_warning": "10",
-                            "value": "support_interface_height",
+                            "value": "extruderValue(support_roof_extruder_nr, 'support_interface_height')",
                             "limit_to_extruder": "support_roof_extruder_nr",
                             "enabled": "support_roof_enable and support_enable",
                             "settable_per_mesh": true
@@ -3350,7 +3420,7 @@
                             "unit": "mm",
                             "type": "float",
                             "default_value": 1,
-                            "value": "support_interface_height",
+                            "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_height')",
                             "minimum_value": "0",
                             "minimum_value_warning": "min(0.2 + layer_height, support_bottom_stair_step_height)",
                             "maximum_value_warning": "10",
@@ -3398,6 +3468,7 @@
                             "maximum_value": "100",
                             "limit_to_extruder": "support_roof_extruder_nr",
                             "enabled": "support_roof_enable and support_enable",
+                            "value": "extruderValue(support_roof_extruder_nr, 'support_interface_density')",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
                             "children":
@@ -3430,6 +3501,7 @@
                             "maximum_value": "100",
                             "limit_to_extruder": "support_bottom_extruder_nr",
                             "enabled": "support_bottom_enable and support_enable",
+                            "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_density')",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
                             "children":
@@ -3489,7 +3561,7 @@
                                 "zigzag": "Zig Zag"
                             },
                             "default_value": "concentric",
-                            "value": "support_interface_pattern",
+                            "value": "extruderValue(support_roof_extruder_nr, 'support_interface_pattern')",
                             "limit_to_extruder": "support_roof_extruder_nr",
                             "enabled": "support_roof_enable and support_enable",
                             "settable_per_mesh": false,
@@ -3510,7 +3582,7 @@
                                 "zigzag": "Zig Zag"
                             },
                             "default_value": "concentric",
-                            "value": "support_interface_pattern",
+                            "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_pattern')",
                             "limit_to_extruder": "support_bottom_extruder_nr",
                             "enabled": "support_bottom_enable and support_enable",
                             "settable_per_mesh": false,
@@ -4406,6 +4478,7 @@
                     "default_value": 0.15,
                     "minimum_value": "0",
                     "maximum_value_warning": "1.0",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "carve_multiple_volumes":
@@ -4512,6 +4585,18 @@
                     "settable_per_mesh": true,
                     "enabled": "mold_enabled"
                 },
+                "mold_roof_height":
+                {
+                    "label": "Mold Roof Height",
+                    "description": "The height above horizontal parts in your model which to print mold.",
+                    "unit": "mm",
+                    "type": "float",
+                    "minimum_value": "0",
+                    "maximum_value_warning": "5",
+                    "default_value": 0.5,
+                    "settable_per_mesh": true,
+                    "enabled": "mold_enabled"
+                },
                 "mold_angle":
                 {
                     "label": "Mold Angle",
@@ -4731,6 +4816,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "10",
                     "type": "int",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "skin_alternate_rotation":
@@ -4740,6 +4826,70 @@
                     "type": "bool",
                     "default_value": false,
                     "enabled": "top_bottom_pattern != 'concentric'",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "spaghetti_infill_enabled":
+                {
+                    "label": "Spaghetti Infill",
+                    "description": "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.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "infill_sparse_density > 0",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "spaghetti_max_infill_angle":
+                {
+                    "label": "Spaghetti Maximum Infill Angle",
+                    "description": "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.",
+                    "unit": "°",
+                    "type": "float",
+                    "default_value": 10,
+                    "minimum_value": "0",
+                    "maximum_value": "90",
+                    "maximum_value_warning": "45",
+                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "spaghetti_max_height":
+                {
+                    "label": "Spaghetti Infill Maximum Height",
+                    "description": "The maximum height of inside space which can be combined and filled from the top.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 2.0,
+                    "minimum_value": "layer_height",
+                    "maximum_value_warning": "10.0",
+                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "spaghetti_inset":
+                {
+                    "label": "Spaghetti Inset",
+                    "description": "The offset from the walls from where the spaghetti infill will be printed.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 0.2,
+                    "minimum_value_warning": "0",
+                    "maximum_value_warning": "5.0",
+                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "spaghetti_flow":
+                {
+                    "label": "Spaghetti Flow",
+                    "description": "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.",
+                    "unit": "%",
+                    "type": "float",
+                    "default_value": 20,
+                    "minimum_value": "0",
+                    "maximum_value_warning": "100",
+                    "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "support_conical_enabled":
@@ -4795,6 +4945,7 @@
                     "description": "Randomly jitter while printing the outer wall, so that the surface has a rough and fuzzy look.",
                     "type": "bool",
                     "default_value": false,
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "magic_fuzzy_skin_thickness":
@@ -4807,6 +4958,7 @@
                     "minimum_value": "0.001",
                     "maximum_value_warning": "wall_line_width_0",
                     "enabled": "magic_fuzzy_skin_enabled",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "magic_fuzzy_skin_point_density":
@@ -4821,6 +4973,7 @@
                     "maximum_value_warning": "10",
                     "maximum_value": "2 / magic_fuzzy_skin_thickness",
                     "enabled": "magic_fuzzy_skin_enabled",
+                    "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -4836,6 +4989,7 @@
                             "maximum_value_warning": "10",
                             "value": "10000 if magic_fuzzy_skin_point_density == 0 else 1 / magic_fuzzy_skin_point_density",
                             "enabled": "magic_fuzzy_skin_enabled",
+                            "limit_to_extruder": "wall_0_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }

resources/definitions/rigidbot.def.json

@@ -39,7 +39,7 @@
             "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_start_gcode": {
-            "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..."
+            "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..."
         },
         "machine_end_gcode": {
             "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning"

resources/definitions/tam.def.json

@@ -0,0 +1,68 @@
+{
+    "id": "typeamachines",
+    "version": 2,
+    "name": "Type A Machines Series 1 2014",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "typeamachines",
+        "manufacturer": "typeamachines",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "platform": "tam_series1.stl",
+        "platform_offset": [-580.0, -6.23, 253.5],
+        "has_materials": false,
+        "supported_actions":["UpgradeFirmware"]
+    },
+    "overrides": {
+        "machine_name": { "default_value": "TypeAMachines" },
+
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.3 },
+        "infill_sparse_density": { "default_value": 5 },
+        "wall_thickness": { "default_value": 1 },
+        "top_bottom_thickness": { "default_value": 1 },
+
+        "infill_pattern": { "value": "'tetrahedral'" },
+
+        "machine_width": { "default_value": 305 },
+        "machine_depth": { "default_value": 305 },
+        "machine_height": { "default_value": 305 },
+
+        "machine_heated_bed": { "default_value": true },
+        "machine_head_with_fans_polygon": { "default_value": [ [ -35, 65 ], [ -35, -55 ], [ 55, 65 ], [ 55, -55 ] ] },
+        "gantry_height": { "default_value": 35 },
+				"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_center_is_zero": { "default_value": false },
+
+        "speed_print": { "default_value": 60 },
+        "speed_travel": { "default_value": 200 },
+
+        "retraction_amount": { "default_value": 0.4 },
+        "retraction_speed": { "default_value": 35},
+
+        "xy_offset": { "default_value": -0.01 },
+
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
+
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_tip_outer_diameter": { "default_value": 1 },
+        "machine_nozzle_head_distance": { "default_value": 3 },
+        "machine_nozzle_expansion_angle": { "default_value": 45 },
+
+        "machine_max_acceleration_x": { "default_value": 6000 },
+        "machine_max_acceleration_y": { "default_value": 6000 },
+        "machine_max_acceleration_z": { "default_value": 12000 },
+        "machine_max_acceleration_e": { "default_value": 175 },
+
+        "machine_start_gcode": {
+            "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150  Z25 F12000 ;recenter and begin\nG1 F9000"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        }
+    }
+}

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

@@ -1,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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

@@ -1,12 +1,19 @@
-#, fuzzy
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
+"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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"Language-Team: TEAM\n"
+"Language: LANGUAGE\n"
+"Lang-Code: xx\n"
+"Country-Code: XX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,6 +38,18 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr ""
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid ""
+"The inner diameter of the nozzle. Change this setting when using a non-"
+"standard nozzle size."
+msgstr ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x label"
 msgid "Nozzle X Offset"

resources/i18n/fdmprinter.def.json.pot

@@ -1,12 +1,19 @@
-#, fuzzy
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
+"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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"Language-Team: TEAM\n"
+"Language: LANGUAGE\n"
+"Lang-Code: xx\n"
+"Country-Code: XX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -724,7 +731,27 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_line_width description"
-msgid "Width of a single support interface line."
+msgid "Width of a single line of support roof or floor."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width label"
+msgid "Support Roof Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width description"
+msgid "Width of a single support roof line."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width label"
+msgid "Support Floor Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width description"
+msgid "Width of a single support floor line."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -1194,16 +1221,65 @@ msgid ""
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult label"
-msgid "Cubic Subdivision Radius"
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult description"
+msgctxt "spaghetti_infill_enabled description"
 msgid ""
-"A multiplier on the radius from the center of each cube to check for the "
-"boundary of the model, as to decide whether this cube should be subdivided. "
-"Larger values lead to more subdivisions, i.e. more small cubes."
+"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
@@ -1358,26 +1434,26 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins label"
-msgid "Expand Upper Skins"
+msgid "Expand Top Skins Into Infill"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins description"
 msgid ""
-"Expand upper skin areas (areas with air above) so that they support infill "
+"Expand the top skin areas (areas with air above) so that they support infill "
 "above."
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins label"
-msgid "Expand Lower Skins"
+msgid "Expand Bottom Skins Into Infill"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins description"
 msgid ""
-"Expand lower skin areas (areas with air below) so that they are anchored by "
-"the infill layers above and below."
+"Expand the bottom skin areas (areas with air below) so that they are "
+"anchored by the infill layers above and below."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -1857,8 +1933,32 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "speed_support_interface description"
 msgid ""
-"The speed at which the roofs and bottoms of support are printed. Printing "
-"the them at lower speeds can improve overhang quality."
+"The speed at which the roofs and floors of support are printed. Printing "
+"them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof label"
+msgid "Support Roof Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof description"
+msgid ""
+"The speed at which the roofs of support are printed. Printing them at lower "
+"speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom label"
+msgid "Support Floor Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom description"
+msgid ""
+"The speed at which the floor of support is printed. Printing it at lower "
+"speed can improve adhesion of support on top of your model."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2085,8 +2185,32 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "acceleration_support_interface description"
 msgid ""
-"The acceleration with which the roofs and bottoms of support are printed. "
-"Printing them at lower accelerations can improve overhang quality."
+"The acceleration with which the roofs and floors of support are printed. "
+"Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof label"
+msgid "Support Roof Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof description"
+msgid ""
+"The acceleration with which the roofs of support are printed. Printing them "
+"at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom label"
+msgid "Support Floor Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom description"
+msgid ""
+"The acceleration with which the floors of support are printed. Printing them "
+"at lower acceleration can improve adhesion of support on top of your model."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2264,8 +2388,32 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "jerk_support_interface description"
 msgid ""
-"The maximum instantaneous velocity change with which the roofs and bottoms "
-"of support are printed."
+"The maximum instantaneous velocity change with which the roofs and floors of "
+"support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof label"
+msgid "Support Roof Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof description"
+msgid ""
+"The maximum instantaneous velocity change with which the roofs of support "
+"are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom label"
+msgid "Support Floor Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom description"
+msgid ""
+"The maximum instantaneous velocity change with which the floors of support "
+"are printed."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2659,14 +2807,14 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_enable label"
-msgid "Enable Support"
+msgid "Generate Support"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_enable description"
 msgid ""
-"Enable support structures. These structures support parts of the model with "
-"severe overhangs."
+"Generate structures to support parts of the model which have overhangs. "
+"Without these structures, such parts would collapse during printing."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2713,10 +2861,34 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "support_interface_extruder_nr description"
 msgid ""
-"The extruder train to use for printing the roofs and bottoms of the support. "
+"The extruder train to use for printing the roofs and floors of the support. "
 "This is used in multi-extrusion."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr label"
+msgid "Support Roof Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr description"
+msgid ""
+"The extruder train to use for printing the roofs of the support. This is "
+"used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr label"
+msgid "Support Floor Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr description"
+msgid ""
+"The extruder train to use for printing the floors of the support. This is "
+"used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -2918,7 +3090,21 @@ msgctxt "support_bottom_stair_step_height description"
 msgid ""
 "The height of the steps of the stair-like bottom of support resting on the "
 "model. A low value makes the support harder to remove, but too high values "
-"can lead to unstable support structures."
+"can lead to unstable support structures. Set to zero to turn off the stair-"
+"like behaviour."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width label"
+msgid "Support Stair Step Maximum Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width description"
+msgid ""
+"The maximum width of the steps of the stair-like bottom of support resting "
+"on the model. A low value makes the support harder to remove, but too high "
+"values can lead to unstable support structures."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2959,6 +3145,30 @@ msgid ""
 "the bottom of the support, where it rests on the model."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_roof_enable label"
+msgid "Enable Support Roof"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_enable description"
+msgid ""
+"Generate a dense slab of material between the top of support and the model. "
+"This will create a skin between the model and support."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable label"
+msgid "Enable Support Floor"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable description"
+msgid ""
+"Generate a dense slab of material between the bottom of the support and the "
+"model. This will create a skin between the model and support."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_height label"
 msgid "Support Interface Thickness"
@@ -2985,14 +3195,14 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height label"
-msgid "Support Bottom Thickness"
+msgid "Support Floor Thickness"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height description"
 msgid ""
-"The thickness of the support bottoms. This controls the number of dense "
-"layers are printed on top of places of a model on which support rests."
+"The thickness of the support floors. This controls the number of dense "
+"layers that are printed on top of places of a model on which support rests."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3003,10 +3213,10 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height description"
 msgid ""
-"When checking where there's model above the support, take steps of the given "
-"height. Lower values will slice slower, while higher values may cause normal "
-"support to be printed in some places where there should have been support "
-"interface."
+"When checking where there's model above and below the support, take steps of "
+"the given height. Lower values will slice slower, while higher values may "
+"cause normal support to be printed in some places where there should have "
+"been support interface."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3017,21 +3227,57 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "support_interface_density description"
 msgid ""
-"Adjusts the density of the roofs and bottoms of the support structure. A "
+"Adjusts the density of the roofs and floors of the support structure. A "
 "higher value results in better overhangs, but the supports are harder to "
 "remove."
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance label"
-msgid "Support Interface Line Distance"
+msgctxt "support_roof_density label"
+msgid "Support Roof Density"
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance description"
+msgctxt "support_roof_density description"
 msgid ""
-"Distance between the printed support interface lines. This setting is "
-"calculated by the Support Interface Density, but can be adjusted separately."
+"The density of the roofs of the support structure. A higher value results in "
+"better overhangs, but the supports are harder to remove."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance label"
+msgid "Support Roof Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance description"
+msgid ""
+"Distance between the printed support roof lines. This setting is calculated "
+"by the Support Roof Density, but can be adjusted separately."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density label"
+msgid "Support Floor Density"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density description"
+msgid ""
+"The density of the floors of the support structure. A higher value results "
+"in better adhesion of the support on top of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance label"
+msgid "Support Floor Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance description"
+msgid ""
+"Distance between the printed support floor lines. This setting is calculated "
+"by the Support Floor Density, but can be adjusted separately."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -3076,6 +3322,86 @@ msgctxt "support_interface_pattern option zigzag"
 msgid "Zig Zag"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern label"
+msgid "Support Roof Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern description"
+msgid "The pattern with which the roofs of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern label"
+msgid "Support Floor Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern description"
+msgid "The pattern with which the floors of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_use_towers label"
 msgid "Use Towers"
@@ -3133,6 +3459,20 @@ msgctxt "platform_adhesion description"
 msgid "Adhesion"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable label"
+msgid "Enable Prime Blob"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable description"
+msgid ""
+"Whether to prime the filament with a blob before printing. Turning this "
+"setting on will ensure that the extruder will have material ready at the "
+"nozzle before printing. Printing Brim or Skirt can act like priming too, in "
+"which case turning this setting off saves some time."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
@@ -3918,6 +4258,66 @@ msgid ""
 "lower order and normal meshes."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "cutting_mesh label"
+msgid "Cutting Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "cutting_mesh description"
+msgid ""
+"Limit the volume of this mesh to within other meshes. You can use this to "
+"make certain areas of one mesh print with different settings and with a "
+"whole different extruder."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled label"
+msgid "Mold"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled description"
+msgid ""
+"Print models as a mold, which can be cast in order to get a model which "
+"resembles the models on the build plate."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width label"
+msgid "Minimal Mold Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width description"
+msgid ""
+"The minimal distance between the ouside of the mold and the outside of the "
+"model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height label"
+msgid "Mold Roof Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height description"
+msgid "The height above horizontal parts in your model which to print mold."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle label"
+msgid "Mold Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle description"
+msgid ""
+"The angle of overhang of the outer walls created for the mold. 0° will make "
+"the outer shell of the mold vertical, while 90° will make the outside of the "
+"model follow the contour of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_mesh label"
 msgid "Support Mesh"
@@ -3930,6 +4330,18 @@ msgid ""
 "structure."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down label"
+msgid "Drop Down Support Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down description"
+msgid ""
+"Make support everywhere below the support mesh, so that there's no overhang "
+"in the support mesh."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "anti_overhang_mesh label"
 msgid "Anti Overhang Mesh"
@@ -3982,8 +4394,21 @@ msgctxt "magic_spiralize description"
 msgid ""
 "Spiralize smooths out the Z move of the outer edge. This will create a "
 "steady Z increase over the whole print. This feature turns a solid model "
-"into a single walled print with a solid bottom. This feature used to be "
-"called Joris in older versions."
+"into a single walled print with a solid bottom. This feature should only be "
+"enabled when each layer only contains a single part."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours label"
+msgid "Smooth Spiralized Contours"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours description"
+msgid ""
+"Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-"
+"seam should be barely visible on the print but will still be visible in the "
+"layer view). Note that smoothing will tend to blur fine surface details."
 msgstr ""
 
 #: fdmprinter.def.json

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

@@ -1,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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

@@ -0,0 +1,189 @@
+# 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-03-27 17:27+0000\n"
+"Last-Translator: None\n"
+"Language-Team: None\n"
+"Language: Japanese\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"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs description"
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr ""
+
+#: 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 ""

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

@@ -1,12 +1,19 @@
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-05-12 10:53+0900\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ja\n"
+"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-03-27 17:27+0000\n"
+"Last-Translator: None\n"
+"Language-Team: None\n"
+"Language: Japanese\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"
@@ -676,8 +683,28 @@ msgstr "Support Interface Line Width"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_line_width description"
-msgid "Width of a single support interface line."
-msgstr "単一のサポートインタフェースラインの幅。"
+msgid "Width of a single line of support roof or floor."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width label"
+msgid "Support Roof Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width description"
+msgid "Width of a single support roof line."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width label"
+msgid "Support Floor Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width description"
+msgid "Width of a single support floor line."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_line_width label"
@@ -1082,14 +1109,54 @@ msgid "A list of integer line directions to use. Elements from the list are used
 msgstr "使用する整数線の方向のリスト。リストの要素は、レイヤの層に合わせて順番に使用され、リストの末尾に達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは空のリストです。これは、従来のデフォルト角度（線とジグザグのパターンでは45と135度、他のすべてのパターンでは45度）を使用することを意味します。"
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult label"
-msgid "Cubic Subdivision Radius"
-msgstr "Cubic Subdivision Radius"
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult description"
-msgid "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes."
-msgstr "各立方体の中心からの半径上の乗数で、モデルの境界をチェックし、この立方体を細分するかどうかを決定します。値を大きくすると細分化が増えます。つまり、より小さなキューブになります。"
+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"
@@ -1215,23 +1282,23 @@ msgstr "平らな面の上部または底部のスキン部の及びその領域
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins label"
-msgid "Expand Upper Skins"
-msgstr "Expand Upper Skins"
+msgid "Expand Top Skins Into Infill"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins description"
-msgid "Expand upper skin areas (areas with air above) so that they support infill above."
-msgstr "上部のインフィルをサポートするので、スキン面 (上記の空気を含んだ領域) を展開します。"
+msgid "Expand the top skin areas (areas with air above) so that they support infill above."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins label"
-msgid "Expand Lower Skins"
-msgstr "Expand Lower Skins"
+msgid "Expand Bottom Skins Into Infill"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins description"
-msgid "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below."
-msgstr "彼らは上と下の面材のレイヤーによって固定されますので、低い肌の部分 (空気を含んだ領域) を展開します。"
+msgid "Expand the bottom skin areas (areas with air below) so that they are anchored by the infill layers above and below."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_skins_expand_distance label"
@@ -1643,8 +1710,28 @@ msgstr "Support Interface Speed"
 
 #: fdmprinter.def.json
 msgctxt "speed_support_interface description"
-msgid "The speed at which the roofs and bottoms of support are printed. Printing the them at lower speeds can improve overhang quality."
-msgstr "天井と底面のサポート材をプリントする速度　これらを低速でプリントするとオーバーハング部分の品質を向上できます。"
+msgid "The speed at which the roofs and floors of support are printed. Printing them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof label"
+msgid "Support Roof Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof description"
+msgid "The speed at which the roofs of support are printed. Printing them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom label"
+msgid "Support Floor Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom description"
+msgid "The speed at which the floor of support is printed. Printing it at lower speed can improve adhesion of support on top of your model."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "speed_prime_tower label"
@@ -1843,8 +1930,28 @@ msgstr "Support Interface Acceleration"
 
 #: fdmprinter.def.json
 msgctxt "acceleration_support_interface description"
-msgid "The acceleration with which the roofs and bottoms of support are printed. Printing them at lower accelerations can improve overhang quality."
-msgstr "サポート材の上面と底面が印刷されるスピード　低速度で印刷するとオーバーハングの品質が向上します。"
+msgid "The acceleration with which the roofs and floors of support are printed. Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof label"
+msgid "Support Roof Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof description"
+msgid "The acceleration with which the roofs of support are printed. Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom label"
+msgid "Support Floor Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom description"
+msgid "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "acceleration_prime_tower label"
@@ -2003,8 +2110,28 @@ msgstr "Support Interface Jerk"
 
 #: fdmprinter.def.json
 msgctxt "jerk_support_interface description"
-msgid "The maximum instantaneous velocity change with which the roofs and bottoms of support are printed."
-msgstr "サポート材の屋根とボトムのプリント時、最大瞬間速度の変更。"
+msgid "The maximum instantaneous velocity change with which the roofs and floors of support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof label"
+msgid "Support Roof Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof description"
+msgid "The maximum instantaneous velocity change with which the roofs of support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom label"
+msgid "Support Floor Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom description"
+msgid "The maximum instantaneous velocity change with which the floors of support are printed."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "jerk_prime_tower label"
@@ -2336,13 +2463,13 @@ msgstr "サポート"
 
 #: fdmprinter.def.json
 msgctxt "support_enable label"
-msgid "Enable Support"
-msgstr "Enable Support"
+msgid "Generate Support"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_enable description"
-msgid "Enable support structures. These structures support parts of the model with severe overhangs."
-msgstr "サポート材を印刷可能にします。これは、モデル上のオーバーハング部分にサポート材を構築します。"
+msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_extruder_nr label"
@@ -2381,8 +2508,28 @@ msgstr "Support Interface Extruder"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_extruder_nr description"
-msgid "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion."
-msgstr "サポートの天井とボトム部分を印刷する際のエクストルーダー。複数のエクストルーダーがある場合に使用される。"
+msgid "The extruder train to use for printing the roofs and floors of the support. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr label"
+msgid "Support Roof Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr description"
+msgid "The extruder train to use for printing the roofs of the support. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr label"
+msgid "Support Floor Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr description"
+msgid "The extruder train to use for printing the floors of the support. This is used in multi-extrusion."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_type label"
@@ -2561,8 +2708,18 @@ msgstr "Support Stair Step Height"
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height description"
-msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
-msgstr "モデルにかかる階段形サポートの下部の高さです。低い値のサポートの除去は難しく、高すぎる値は不安定なサポート構造につながります。"
+msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures. Set to zero to turn off the stair-like behaviour."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width label"
+msgid "Support Stair Step Maximum Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width description"
+msgid "The maximum width of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
@@ -2594,6 +2751,26 @@ msgctxt "support_interface_enable description"
 msgid "Generate a dense interface between the model and the support. This will create a skin at the top of the support on which the model is printed and at the bottom of the support, where it rests on the model."
 msgstr "モデルとサポートの間に密なインターフェースを生成します。これにより、モデルが印刷されているサポートの上部、モデル上のサポートの下部にスキンが作成されます。"
 
+#: fdmprinter.def.json
+msgctxt "support_roof_enable label"
+msgid "Enable Support Roof"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_enable description"
+msgid "Generate a dense slab of material between the top of support and the model. This will create a skin between the model and support."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable label"
+msgid "Enable Support Floor"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable description"
+msgid "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_height label"
 msgid "Support Interface Thickness"
@@ -2616,13 +2793,13 @@ msgstr "サポートの屋根の厚さ。これは、モデルの下につくサ
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height label"
-msgid "Support Bottom Thickness"
-msgstr "Support Bottom Thickness"
+msgid "Support Floor Thickness"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height description"
-msgid "The thickness of the support bottoms. This controls the number of dense layers are printed on top of places of a model on which support rests."
-msgstr "サポート材の底部の厚さ。これは、サモデルの上に印刷されるサポートの積層密度を制御します。"
+msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height label"
@@ -2631,8 +2808,8 @@ msgstr "Support Interface Resolution"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height description"
-msgid "When checking where there's model above the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
-msgstr "サポート上にモデルがあることを確認するときは、指定された高さのステップを実行します。値が小さいほどスライスが遅くなりますが、値が大きくなるとサポートインターフェイスが必要な場所で通常のサポートが印刷されることがあります。"
+msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_density label"
@@ -2641,18 +2818,48 @@ msgstr "Support Interface Density"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_density description"
-msgid "Adjusts the density of the roofs and bottoms of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
-msgstr "サポート材の屋根と底部の密度を調整します　大きな値ではオーバーハングでの成功率があがりますが、サポート材が除去しにくくなります"
+msgid "Adjusts the density of the roofs and floors of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance label"
-msgid "Support Interface Line Distance"
-msgstr "Support Interface Line Distance"
+msgctxt "support_roof_density label"
+msgid "Support Roof Density"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance description"
-msgid "Distance between the printed support interface lines. This setting is calculated by the Support Interface Density, but can be adjusted separately."
-msgstr "印刷されたサポートインタフェースラインの間隔。この設定はSupport Interface Densityで計算されますが、個別に調整することができます。"
+msgctxt "support_roof_density description"
+msgid "The density of the roofs of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance label"
+msgid "Support Roof Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance description"
+msgid "Distance between the printed support roof lines. This setting is calculated by the Support Roof Density, but can be adjusted separately."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density label"
+msgid "Support Floor Density"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density description"
+msgid "The density of the floors of the support structure. A higher value results in better adhesion of the support on top of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance label"
+msgid "Support Floor Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance description"
+msgid "Distance between the printed support floor lines. This setting is calculated by the Support Floor Density, but can be adjusted separately."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_pattern label"
@@ -2694,6 +2901,86 @@ msgctxt "support_interface_pattern option zigzag"
 msgid "Zig Zag"
 msgstr "Zig Zag"
 
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern label"
+msgid "Support Roof Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern description"
+msgid "The pattern with which the roofs of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern label"
+msgid "Support Floor Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern description"
+msgid "The pattern with which the floors of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_use_towers label"
 msgid "Use Towers"
@@ -2744,6 +3031,16 @@ msgctxt "platform_adhesion description"
 msgid "Adhesion"
 msgstr "密着性"
 
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable label"
+msgid "Enable Prime Blob"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable description"
+msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
@@ -3416,6 +3713,56 @@ msgctxt "infill_mesh_order description"
 msgid "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
 msgstr "他のインフィルメッシュのインフィル内にあるインフィルメッシュを決定します。優先度の高いのインフィルメッシュは、低いメッシュと通常のメッシュのインフィルを変更します"
 
+#: fdmprinter.def.json
+msgctxt "cutting_mesh label"
+msgid "Cutting Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "cutting_mesh description"
+msgid "Limit the volume of this mesh to within other meshes. You can use this to make certain areas of one mesh print with different settings and with a whole different extruder."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled label"
+msgid "Mold"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled description"
+msgid "Print models as a mold, which can be cast in order to get a model which resembles the models on the build plate."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width label"
+msgid "Minimal Mold Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width description"
+msgid "The minimal distance between the ouside of the mold and the outside of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height label"
+msgid "Mold Roof Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height description"
+msgid "The height above horizontal parts in your model which to print mold."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle label"
+msgid "Mold Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle description"
+msgid "The angle of overhang of the outer walls created for the mold. 0° will make the outer shell of the mold vertical, while 90° will make the outside of the model follow the contour of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_mesh label"
 msgid "Support Mesh"
@@ -3426,6 +3773,16 @@ msgctxt "support_mesh description"
 msgid "Use this mesh to specify support areas. This can be used to generate support structure."
 msgstr "このメッシュを使用してサポート領域を指定します。これは、サポート構造を生成するために使用できます。"
 
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down label"
+msgid "Drop Down Support Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down description"
+msgid "Make support everywhere below the support mesh, so that there's no overhang in the support mesh."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "anti_overhang_mesh label"
 msgid "Anti Overhang Mesh"
@@ -3468,8 +3825,18 @@ msgstr "Spiralize Outer Contour"
 
 #: fdmprinter.def.json
 msgctxt "magic_spiralize description"
-msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions."
-msgstr "Spiralizeは外縁のZ移動を平滑化します。これにより、プリント全体にわたって安定したZ値が得られます。この機能は、ソリッドモデルを単一のウォールプリントに変換し、底面と側面のみ印刷します。この機能は以前のバージョンではJorisと呼ばれていました。"
+msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature should only be enabled when each layer only contains a single part."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours label"
+msgid "Smooth Spiralized Contours"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours description"
+msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "experimental label"
@@ -4007,3 +4374,87 @@ msgstr "Mesh Rotation Matrix"
 msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。"
+
+#~ msgctxt "support_interface_line_width description"
+#~ msgid "Width of a single support interface line."
+#~ msgstr "単一のサポートインタフェースラインの幅。"
+
+#~ msgctxt "sub_div_rad_mult label"
+#~ msgid "Cubic Subdivision Radius"
+#~ msgstr "Cubic Subdivision Radius"
+
+#~ msgctxt "sub_div_rad_mult description"
+#~ msgid "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes."
+#~ msgstr "各立方体の中心からの半径上の乗数で、モデルの境界をチェックし、この立方体を細分するかどうかを決定します。値を大きくすると細分化が増えます。つまり、より小さなキューブになります。"
+
+#~ msgctxt "expand_upper_skins label"
+#~ msgid "Expand Upper Skins"
+#~ msgstr "Expand Upper Skins"
+
+#~ msgctxt "expand_upper_skins description"
+#~ msgid "Expand upper skin areas (areas with air above) so that they support infill above."
+#~ msgstr "上部のインフィルをサポートするので、スキン面 (上記の空気を含んだ領域) を展開します。"
+
+#~ msgctxt "expand_lower_skins label"
+#~ msgid "Expand Lower Skins"
+#~ msgstr "Expand Lower Skins"
+
+#~ msgctxt "expand_lower_skins description"
+#~ msgid "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below."
+#~ msgstr "彼らは上と下の面材のレイヤーによって固定されますので、低い肌の部分 (空気を含んだ領域) を展開します。"
+
+#~ msgctxt "speed_support_interface description"
+#~ msgid "The speed at which the roofs and bottoms of support are printed. Printing the them at lower speeds can improve overhang quality."
+#~ msgstr "天井と底面のサポート材をプリントする速度　これらを低速でプリントするとオーバーハング部分の品質を向上できます。"
+
+#~ msgctxt "acceleration_support_interface description"
+#~ msgid "The acceleration with which the roofs and bottoms of support are printed. Printing them at lower accelerations can improve overhang quality."
+#~ msgstr "サポート材の上面と底面が印刷されるスピード　低速度で印刷するとオーバーハングの品質が向上します。"
+
+#~ msgctxt "jerk_support_interface description"
+#~ msgid "The maximum instantaneous velocity change with which the roofs and bottoms of support are printed."
+#~ msgstr "サポート材の屋根とボトムのプリント時、最大瞬間速度の変更。"
+
+#~ msgctxt "support_enable label"
+#~ msgid "Enable Support"
+#~ msgstr "Enable Support"
+
+#~ msgctxt "support_enable description"
+#~ msgid "Enable support structures. These structures support parts of the model with severe overhangs."
+#~ msgstr "サポート材を印刷可能にします。これは、モデル上のオーバーハング部分にサポート材を構築します。"
+
+#~ msgctxt "support_interface_extruder_nr description"
+#~ msgid "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion."
+#~ msgstr "サポートの天井とボトム部分を印刷する際のエクストルーダー。複数のエクストルーダーがある場合に使用される。"
+
+#~ msgctxt "support_bottom_stair_step_height description"
+#~ msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
+#~ msgstr "モデルにかかる階段形サポートの下部の高さです。低い値のサポートの除去は難しく、高すぎる値は不安定なサポート構造につながります。"
+
+#~ msgctxt "support_bottom_height label"
+#~ msgid "Support Bottom Thickness"
+#~ msgstr "Support Bottom Thickness"
+
+#~ msgctxt "support_bottom_height description"
+#~ msgid "The thickness of the support bottoms. This controls the number of dense layers are printed on top of places of a model on which support rests."
+#~ msgstr "サポート材の底部の厚さ。これは、サモデルの上に印刷されるサポートの積層密度を制御します。"
+
+#~ msgctxt "support_interface_skip_height description"
+#~ msgid "When checking where there's model above the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
+#~ msgstr "サポート上にモデルがあることを確認するときは、指定された高さのステップを実行します。値が小さいほどスライスが遅くなりますが、値が大きくなるとサポートインターフェイスが必要な場所で通常のサポートが印刷されることがあります。"
+
+#~ msgctxt "support_interface_density description"
+#~ msgid "Adjusts the density of the roofs and bottoms of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+#~ msgstr "サポート材の屋根と底部の密度を調整します　大きな値ではオーバーハングでの成功率があがりますが、サポート材が除去しにくくなります"
+
+#~ msgctxt "support_interface_line_distance label"
+#~ msgid "Support Interface Line Distance"
+#~ msgstr "Support Interface Line Distance"
+
+#~ msgctxt "support_interface_line_distance description"
+#~ msgid "Distance between the printed support interface lines. This setting is calculated by the Support Interface Density, but can be adjusted separately."
+#~ msgstr "印刷されたサポートインタフェースラインの間隔。この設定はSupport Interface Densityで計算されますが、個別に調整することができます。"
+
+#~ msgctxt "magic_spiralize description"
+#~ msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions."
+#~ msgstr "Spiralizeは外縁のZ移動を平滑化します。これにより、プリント全体にわたって安定したZ値が得られます。この機能は、ソリッドモデルを単一のウォールプリントに変換し、底面と側面のみ印刷します。この機能は以前のバージョンではJorisと呼ばれていました。"

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

@@ -0,0 +1,190 @@
+# 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-03-27 17:27+0000\n"
+"Last-Translator: None\n"
+"Language-Team: None\n"
+"Language: Korean\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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs description"
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr ""
+
+#: 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 ""
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr ""
+
+#: 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 ""

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

@@ -1,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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 geprimet 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 geprimet 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 geprimet 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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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 geprimet 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 geprimet 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 geprimet aan het begin van het printen."

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

@@ -1,13 +1,19 @@
-#, fuzzy
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
+"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-04-10 09:05-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
-"Language-Team: LANGUAGE\n"
-"Language: ptbr\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"
@@ -33,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_size label"
+msgid "Nozzle Diameter"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x label"
 msgid "Nozzle X Offset"

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

@@ -1,12 +1,19 @@
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
+"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-04-10 19:00-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
-"Language-Team: LANGUAGE\n"
-"Language: ptbr\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"
@@ -678,8 +685,28 @@ msgstr "Largura de Extrusão da Interface do Suporte"
 
 #: fdmprinter.def.json
 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."
+msgid "Width of a single line of support roof or floor."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width label"
+msgid "Support Roof Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width description"
+msgid "Width of a single support roof line."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width label"
+msgid "Support Floor Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width description"
+msgid "Width of a single support floor line."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_line_width label"
@@ -1082,14 +1109,54 @@ msgid "A list of integer line directions to use. Elements from the list are used
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult label"
-msgid "Cubic Subdivision Radius"
-msgstr "Raio de Subdivisão Cúbica"
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult description"
-msgid "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes."
-msgstr "Um multiplicador do raio do centro de cada cubo para verificar a borda do modelo, de modo a decidir se este cubo deve ser subdividido. Valores maiores levam a maiores subdivisões, isto é, mais cubos pequenos."
+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"
@@ -1213,23 +1280,23 @@ msgstr "Expandir áreas de perímetro das partes superiores e inferiores de supe
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins label"
-msgid "Expand Upper Skins"
-msgstr "Expandir Contornos Superiores"
+msgid "Expand Top Skins Into Infill"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins description"
-msgid "Expand upper skin areas (areas with air above) so that they support infill above."
-msgstr "Expandir as áreas de contorno superiores (áreas com ar acima) de modo que suportem o preenchimento acima."
+msgid "Expand the top skin areas (areas with air above) so that they support infill above."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins label"
-msgid "Expand Lower Skins"
-msgstr "Expandir Contornos Inferiores"
+msgid "Expand Bottom Skins Into Infill"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins description"
-msgid "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below."
-msgstr "Expandir as áreas de contorno inferiores (áreas com ar abaixo) de modo que fiquem ancoradas pelas camadas de preenchimento acima e abaixo."
+msgid "Expand the bottom skin areas (areas with air below) so that they are anchored by the infill layers above and below."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_skins_expand_distance label"
@@ -1638,8 +1705,28 @@ msgstr "Velocidade da Interface de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "speed_support_interface description"
-msgid "The speed at which the roofs and bottoms of support are printed. Printing the them at lower speeds can improve overhang quality."
-msgstr "A velocidade em que o topo e base dos suportes são impressos. Imprimi-lo a menores velocidade pode melhor a qualidade das seções pendentes."
+msgid "The speed at which the roofs and floors of support are printed. Printing them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof label"
+msgid "Support Roof Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof description"
+msgid "The speed at which the roofs of support are printed. Printing them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom label"
+msgid "Support Floor Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom description"
+msgid "The speed at which the floor of support is printed. Printing it at lower speed can improve adhesion of support on top of your model."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "speed_prime_tower label"
@@ -1838,8 +1925,28 @@ msgstr "Aceleração da Interface de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "acceleration_support_interface description"
-msgid "The acceleration with which the roofs and bottoms of support are printed. Printing them at lower accelerations can improve overhang quality."
-msgstr "Aceleração com que o topo e base dos suportes são impressos. Imprimi-lo a menores acelerações pode aprimorar a qualidade das seções pendentes."
+msgid "The acceleration with which the roofs and floors of support are printed. Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof label"
+msgid "Support Roof Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof description"
+msgid "The acceleration with which the roofs of support are printed. Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom label"
+msgid "Support Floor Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom description"
+msgid "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "acceleration_prime_tower label"
@@ -1998,8 +2105,28 @@ msgstr "Jerk da Interface de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "jerk_support_interface description"
-msgid "The maximum instantaneous velocity change with which the roofs and bottoms of support are printed."
-msgstr "A mudança instantânea máxima de velocidade em uma direção com que a base e o topo dos suporte é impresso."
+msgid "The maximum instantaneous velocity change with which the roofs and floors of support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof label"
+msgid "Support Roof Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof description"
+msgid "The maximum instantaneous velocity change with which the roofs of support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom label"
+msgid "Support Floor Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom description"
+msgid "The maximum instantaneous velocity change with which the floors of support are printed."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "jerk_prime_tower label"
@@ -2328,13 +2455,13 @@ msgstr "Suporte"
 
 #: fdmprinter.def.json
 msgctxt "support_enable label"
-msgid "Enable Support"
-msgstr "Habilitar Suportes"
+msgid "Generate Support"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_enable description"
-msgid "Enable support structures. These structures support parts of the model with severe overhangs."
-msgstr "Habilita as estruturas de suporte. Essas estruturas apóiam partes do modelo que tenham seções pendentes."
+msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_extruder_nr label"
@@ -2373,8 +2500,28 @@ msgstr "Extrusor da Interface de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_extruder_nr description"
-msgid "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion."
-msgstr "O extrusor a usar para imprimir o topo e base dos suportes. Isto é usado em multi-extrusão."
+msgid "The extruder train to use for printing the roofs and floors of the support. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr label"
+msgid "Support Roof Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr description"
+msgid "The extruder train to use for printing the roofs of the support. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr label"
+msgid "Support Floor Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr description"
+msgid "The extruder train to use for printing the floors of the support. This is used in multi-extrusion."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_type label"
@@ -2553,8 +2700,18 @@ msgstr "Altura do Passo de Escada de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height description"
-msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
-msgstr "A altura dos passos da base tipo escada do suporte em cima do modelo. Um valor baixo faz o suporte ser mais difícil de remover, mas valores muito altos podem criar estruturas de suporte instáveis."
+msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures. Set to zero to turn off the stair-like behaviour."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width label"
+msgid "Support Stair Step Maximum Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width description"
+msgid "The maximum width of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
@@ -2586,6 +2743,26 @@ msgctxt "support_interface_enable description"
 msgid "Generate a dense interface between the model and the support. This will create a skin at the top of the support on which the model is printed and at the bottom of the support, where it rests on the model."
 msgstr "Gera uma interface densa entre o modelo e o suporte. Isto criará um contorno no topo do suporte em que o modelo é impresso e na base do suporte, onde ele fica sobre o modelo."
 
+#: fdmprinter.def.json
+msgctxt "support_roof_enable label"
+msgid "Enable Support Roof"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_enable description"
+msgid "Generate a dense slab of material between the top of support and the model. This will create a skin between the model and support."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable label"
+msgid "Enable Support Floor"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable description"
+msgid "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_height label"
 msgid "Support Interface Thickness"
@@ -2608,13 +2785,13 @@ msgstr "A espessura do topo do suporte. Isto controla a quantidade de camadas de
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height label"
-msgid "Support Bottom Thickness"
-msgstr "Espessura da Base do Suporte"
+msgid "Support Floor Thickness"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height description"
-msgid "The thickness of the support bottoms. This controls the number of dense layers are printed on top of places of a model on which support rests."
-msgstr "A espessura da base do suporte. Isto controla o número de camadas densas que são impressas no topo de lugares do modelo em que o suporte se assenta."
+msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height label"
@@ -2623,8 +2800,8 @@ msgstr "Resolução da Interface de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height description"
-msgid "When checking where there's model above the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
-msgstr "Quando se verificar onde há modelo sobre suporte, use passos da altura dada. Valores baixos vão fatiar mais lentamente, enquanto valores altos podem fazer o suporte normal ser impresso em lugares onde deveria haver interface de suporte."
+msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_density label"
@@ -2633,18 +2810,48 @@ msgstr "Densidade da Interface de Suporte"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_density description"
-msgid "Adjusts the density of the roofs and bottoms of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
-msgstr "Ajusta a densidade dos topos e bases das estruturas de suporte. Um valor mais alto resulta em seções pendentes melhores, mas os suportes são mais difíceis de remover."
+msgid "Adjusts the density of the roofs and floors of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance label"
-msgid "Support Interface Line Distance"
-msgstr "Distância entre Linhas da Interface de Suporte"
+msgctxt "support_roof_density label"
+msgid "Support Roof Density"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance description"
-msgid "Distance between the printed support interface lines. This setting is calculated by the Support Interface Density, but can be adjusted separately."
-msgstr "Distância entre as linhas impressas da interface de suporte. Este ajuste é calculado pela Densidade de Interface de Suporte, mas pode ser ajustado separadamente."
+msgctxt "support_roof_density description"
+msgid "The density of the roofs of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance label"
+msgid "Support Roof Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance description"
+msgid "Distance between the printed support roof lines. This setting is calculated by the Support Roof Density, but can be adjusted separately."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density label"
+msgid "Support Floor Density"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density description"
+msgid "The density of the floors of the support structure. A higher value results in better adhesion of the support on top of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance label"
+msgid "Support Floor Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance description"
+msgid "Distance between the printed support floor lines. This setting is calculated by the Support Floor Density, but can be adjusted separately."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_pattern label"
@@ -2686,6 +2893,86 @@ msgctxt "support_interface_pattern option zigzag"
 msgid "Zig Zag"
 msgstr "Ziguezague"
 
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern label"
+msgid "Support Roof Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern description"
+msgid "The pattern with which the roofs of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern label"
+msgid "Support Floor Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern description"
+msgid "The pattern with which the floors of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_use_towers label"
 msgid "Use Towers"
@@ -2736,6 +3023,16 @@ msgctxt "platform_adhesion description"
 msgid "Adhesion"
 msgstr "Aderência"
 
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable label"
+msgid "Enable Prime Blob"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable description"
+msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
@@ -3410,6 +3707,56 @@ msgctxt "infill_mesh_order description"
 msgid "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
 msgstr "Determina que malha de preenchimento está dentro do preenchimento de outra malha de preenchimento. Uma malha de preenchimento com ordem mais alta modificará o preenchimento de malhas de preenchimento com ordem mais baixa e malhas normais."
 
+#: fdmprinter.def.json
+msgctxt "cutting_mesh label"
+msgid "Cutting Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "cutting_mesh description"
+msgid "Limit the volume of this mesh to within other meshes. You can use this to make certain areas of one mesh print with different settings and with a whole different extruder."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled label"
+msgid "Mold"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled description"
+msgid "Print models as a mold, which can be cast in order to get a model which resembles the models on the build plate."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width label"
+msgid "Minimal Mold Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width description"
+msgid "The minimal distance between the ouside of the mold and the outside of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height label"
+msgid "Mold Roof Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height description"
+msgid "The height above horizontal parts in your model which to print mold."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle label"
+msgid "Mold Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle description"
+msgid "The angle of overhang of the outer walls created for the mold. 0° will make the outer shell of the mold vertical, while 90° will make the outside of the model follow the contour of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_mesh label"
 msgid "Support Mesh"
@@ -3420,6 +3767,16 @@ msgctxt "support_mesh description"
 msgid "Use this mesh to specify support areas. This can be used to generate support structure."
 msgstr "Use esta malha para especificar áreas obrigatoriamente suportadas. Isto será usado para gerar estruturas de suporte."
 
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down label"
+msgid "Drop Down Support Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down description"
+msgid "Make support everywhere below the support mesh, so that there's no overhang in the support mesh."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "anti_overhang_mesh label"
 msgid "Anti Overhang Mesh"
@@ -3462,8 +3819,18 @@ msgstr "Espiralizar o Contorno Externo"
 
 #: fdmprinter.def.json
 msgctxt "magic_spiralize description"
-msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions."
-msgstr "Este modo, também chamado de Modo Vaso ou Joris, transforma a trajetória do filete de plástico de impressão em uma espiral ascendente, com o Z lentamente subindo. Para isso, torna um modelo sólido em uma casca de parede única com a base sólida. Nem toda forma funciona corretamente com o modo vaso."
+msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature should only be enabled when each layer only contains a single part."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours label"
+msgid "Smooth Spiralized Contours"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours description"
+msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "experimental label"
@@ -4004,6 +4371,90 @@ 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 "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."
+
+#~ msgctxt "sub_div_rad_mult label"
+#~ msgid "Cubic Subdivision Radius"
+#~ msgstr "Raio de Subdivisão Cúbica"
+
+#~ msgctxt "sub_div_rad_mult description"
+#~ msgid "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes."
+#~ msgstr "Um multiplicador do raio do centro de cada cubo para verificar a borda do modelo, de modo a decidir se este cubo deve ser subdividido. Valores maiores levam a maiores subdivisões, isto é, mais cubos pequenos."
+
+#~ msgctxt "expand_upper_skins label"
+#~ msgid "Expand Upper Skins"
+#~ msgstr "Expandir Contornos Superiores"
+
+#~ msgctxt "expand_upper_skins description"
+#~ msgid "Expand upper skin areas (areas with air above) so that they support infill above."
+#~ msgstr "Expandir as áreas de contorno superiores (áreas com ar acima) de modo que suportem o preenchimento acima."
+
+#~ msgctxt "expand_lower_skins label"
+#~ msgid "Expand Lower Skins"
+#~ msgstr "Expandir Contornos Inferiores"
+
+#~ msgctxt "expand_lower_skins description"
+#~ msgid "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below."
+#~ msgstr "Expandir as áreas de contorno inferiores (áreas com ar abaixo) de modo que fiquem ancoradas pelas camadas de preenchimento acima e abaixo."
+
+#~ msgctxt "speed_support_interface description"
+#~ msgid "The speed at which the roofs and bottoms of support are printed. Printing the them at lower speeds can improve overhang quality."
+#~ msgstr "A velocidade em que o topo e base dos suportes são impressos. Imprimi-lo a menores velocidade pode melhor a qualidade das seções pendentes."
+
+#~ msgctxt "acceleration_support_interface description"
+#~ msgid "The acceleration with which the roofs and bottoms of support are printed. Printing them at lower accelerations can improve overhang quality."
+#~ msgstr "Aceleração com que o topo e base dos suportes são impressos. Imprimi-lo a menores acelerações pode aprimorar a qualidade das seções pendentes."
+
+#~ msgctxt "jerk_support_interface description"
+#~ msgid "The maximum instantaneous velocity change with which the roofs and bottoms of support are printed."
+#~ msgstr "A mudança instantânea máxima de velocidade em uma direção com que a base e o topo dos suporte é impresso."
+
+#~ msgctxt "support_enable label"
+#~ msgid "Enable Support"
+#~ msgstr "Habilitar Suportes"
+
+#~ msgctxt "support_enable description"
+#~ msgid "Enable support structures. These structures support parts of the model with severe overhangs."
+#~ msgstr "Habilita as estruturas de suporte. Essas estruturas apóiam partes do modelo que tenham seções pendentes."
+
+#~ msgctxt "support_interface_extruder_nr description"
+#~ msgid "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion."
+#~ msgstr "O extrusor a usar para imprimir o topo e base dos suportes. Isto é usado em multi-extrusão."
+
+#~ msgctxt "support_bottom_stair_step_height description"
+#~ msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
+#~ msgstr "A altura dos passos da base tipo escada do suporte em cima do modelo. Um valor baixo faz o suporte ser mais difícil de remover, mas valores muito altos podem criar estruturas de suporte instáveis."
+
+#~ msgctxt "support_bottom_height label"
+#~ msgid "Support Bottom Thickness"
+#~ msgstr "Espessura da Base do Suporte"
+
+#~ msgctxt "support_bottom_height description"
+#~ msgid "The thickness of the support bottoms. This controls the number of dense layers are printed on top of places of a model on which support rests."
+#~ msgstr "A espessura da base do suporte. Isto controla o número de camadas densas que são impressas no topo de lugares do modelo em que o suporte se assenta."
+
+#~ msgctxt "support_interface_skip_height description"
+#~ msgid "When checking where there's model above the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
+#~ msgstr "Quando se verificar onde há modelo sobre suporte, use passos da altura dada. Valores baixos vão fatiar mais lentamente, enquanto valores altos podem fazer o suporte normal ser impresso em lugares onde deveria haver interface de suporte."
+
+#~ msgctxt "support_interface_density description"
+#~ msgid "Adjusts the density of the roofs and bottoms of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+#~ msgstr "Ajusta a densidade dos topos e bases das estruturas de suporte. Um valor mais alto resulta em seções pendentes melhores, mas os suportes são mais difíceis de remover."
+
+#~ msgctxt "support_interface_line_distance label"
+#~ msgid "Support Interface Line Distance"
+#~ msgstr "Distância entre Linhas da Interface de Suporte"
+
+#~ msgctxt "support_interface_line_distance description"
+#~ msgid "Distance between the printed support interface lines. This setting is calculated by the Support Interface Density, but can be adjusted separately."
+#~ msgstr "Distância entre as linhas impressas da interface de suporte. Este ajuste é calculado pela Densidade de Interface de Suporte, mas pode ser ajustado separadamente."
+
+#~ msgctxt "magic_spiralize description"
+#~ msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions."
+#~ msgstr "Este modo, também chamado de Modo Vaso ou Joris, transforma a trajetória do filete de plástico de impressão em uma espiral ascendente, com o Z lentamente subindo. Para isso, torna um modelo sólido em uma casca de parede única com a base sólida. Nem toda forma funciona corretamente com o modo vaso."
+
 #~ msgctxt "material_print_temperature description"
 #~ msgid "The temperature used for printing. Set at 0 to pre-heat the printer manually."
 #~ msgstr "Temperatura usada para a impressão. COloque em '0' para pré-aquecer a impressora manualmente."

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

@@ -1,12 +1,19 @@
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
+"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-01-08 04:33+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
-"Language-Team: \n"
-"Language: ru_RU\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"
@@ -33,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_size label"
+msgid "Nozzle Diameter"
+msgstr "Диаметр сопла"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
+msgstr "Внутренний диаметр сопла. Измените эту настройку при использовании сопла нестандартного размера."
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_offset_x label"
 msgid "Nozzle X Offset"
@@ -173,14 +190,6 @@ msgctxt "extruder_prime_pos_y description"
 msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
 msgstr "Y координата позиции, в которой сопло начинает печать."
 
-#~ msgctxt "machine_nozzle_size label"
-#~ msgid "Nozzle Diameter"
-#~ msgstr "Диаметр сопла"
-
-#~ msgctxt "machine_nozzle_size description"
-#~ msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
-#~ msgstr "Внутренний диаметр сопла. Измените эту настройку при использовании сопла нестандартного размера."
-
 #~ msgctxt "resolution label"
 #~ msgid "Quality"
 #~ msgstr "Качество"

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

@@ -1,12 +1,19 @@
+# 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: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
+"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-03-30 15:05+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
-"Language-Team: \n"
-"Language: ru_RU\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"
@@ -678,8 +685,28 @@ msgstr "Ширина линии поддерживающей крыши"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_line_width description"
-msgid "Width of a single support interface line."
-msgstr "Ширина одной линии поддерживающей крыши."
+msgid "Width of a single line of support roof or floor."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width label"
+msgid "Support Roof Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_width description"
+msgid "Width of a single support roof line."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width label"
+msgid "Support Floor Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_width description"
+msgid "Width of a single support floor line."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "prime_tower_line_width label"
@@ -1082,14 +1109,54 @@ msgid "A list of integer line directions to use. Elements from the list are used
 msgstr "Список направлений линии при печати слоёв. Элементы списка используются последовательно по мере печати слоёв и когда конец списка будет достигнут, он начнётся сначала. Элементы списка отделяются запятыми и сам список заключён в квадратные скобки. По умолчанию, он пустой, что означает использование стандартных углов (45 и 135 градусов для линий из зигзага и 45 градусов для всех остальных шаблонов)."
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult label"
-msgid "Cubic Subdivision Radius"
-msgstr "Радиус динамического куба"
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "sub_div_rad_mult description"
-msgid "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes."
-msgstr "Коэффициент для радиуса от центра каждого куба для проверки границ модели, используется для принятия решения о разделении куба. Большие значения приводят к увеличению делений, т.е. к более мелким кубам."
+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"
@@ -1213,23 +1280,23 @@ msgstr "Расширять области оболочки на верхних
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins label"
-msgid "Expand Upper Skins"
-msgstr "Расширять верхние оболочки"
+msgid "Expand Top Skins Into Infill"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_upper_skins description"
-msgid "Expand upper skin areas (areas with air above) so that they support infill above."
-msgstr "Расширять области верхней оболочки (над ними будет воздух) так, что они поддерживают заполнение над ними."
+msgid "Expand the top skin areas (areas with air above) so that they support infill above."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins label"
-msgid "Expand Lower Skins"
-msgstr "Расширять нижние оболочки"
+msgid "Expand Bottom Skins Into Infill"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_lower_skins description"
-msgid "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below."
-msgstr "Расширять области нижней оболочки (под ними будет воздух) так, что они сцепляются с слоями заполнения сверху и снизу."
+msgid "Expand the bottom skin areas (areas with air below) so that they are anchored by the infill layers above and below."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "expand_skins_expand_distance label"
@@ -1638,8 +1705,28 @@ msgstr "Скорость границы поддержек"
 
 #: fdmprinter.def.json
 msgctxt "speed_support_interface description"
-msgid "The speed at which the roofs and bottoms of support are printed. Printing the them at lower speeds can improve overhang quality."
-msgstr "Скорость, на которой происходит печать верха и низа поддержек. Печать верха поддержек на пониженных скоростях может улучшить качество печати нависающих краёв модели."
+msgid "The speed at which the roofs and floors of support are printed. Printing them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof label"
+msgid "Support Roof Speed"
+msgstr "Скорость печати крыши поддержек"
+
+#: fdmprinter.def.json
+msgctxt "speed_support_roof description"
+msgid "The speed at which the roofs of support are printed. Printing them at lower speeds can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom label"
+msgid "Support Floor Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_support_bottom description"
+msgid "The speed at which the floor of support is printed. Printing it at lower speed can improve adhesion of support on top of your model."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "speed_prime_tower label"
@@ -1838,8 +1925,28 @@ msgstr "Ускорение края поддержек"
 
 #: fdmprinter.def.json
 msgctxt "acceleration_support_interface description"
-msgid "The acceleration with which the roofs and bottoms of support are printed. Printing them at lower accelerations can improve overhang quality."
-msgstr "Ускорение, с которым печатаются верх и низ поддержек. Их печать с пониженными ускорениями может улучшить качество печати нависающих частей."
+msgid "The acceleration with which the roofs and floors of support are printed. Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof label"
+msgid "Support Roof Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_roof description"
+msgid "The acceleration with which the roofs of support are printed. Printing them at lower acceleration can improve overhang quality."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom label"
+msgid "Support Floor Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_support_bottom description"
+msgid "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "acceleration_prime_tower label"
@@ -1998,8 +2105,28 @@ msgstr "Рывок связи поддержек"
 
 #: fdmprinter.def.json
 msgctxt "jerk_support_interface description"
-msgid "The maximum instantaneous velocity change with which the roofs and bottoms of support are printed."
-msgstr "Изменение максимальной мгновенной скорости, с которой печатается связующие слои поддержек."
+msgid "The maximum instantaneous velocity change with which the roofs and floors of support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof label"
+msgid "Support Roof Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_roof description"
+msgid "The maximum instantaneous velocity change with which the roofs of support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom label"
+msgid "Support Floor Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_support_bottom description"
+msgid "The maximum instantaneous velocity change with which the floors of support are printed."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "jerk_prime_tower label"
@@ -2328,13 +2455,13 @@ msgstr "Поддержки"
 
 #: fdmprinter.def.json
 msgctxt "support_enable label"
-msgid "Enable Support"
-msgstr "Разрешить поддержки"
+msgid "Generate Support"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_enable description"
-msgid "Enable support structures. These structures support parts of the model with severe overhangs."
-msgstr "Разрешить печать поддержек. Такие структуры поддерживают части моделей со значительными навесаниями."
+msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_extruder_nr label"
@@ -2373,8 +2500,28 @@ msgstr "Экструдер связующего слоя поддержек"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_extruder_nr description"
-msgid "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion."
-msgstr "Этот экструдер используется для печати верха и низа поддержек. Используется при наличии нескольких экструдеров."
+msgid "The extruder train to use for printing the roofs and floors of the support. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr label"
+msgid "Support Roof Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_extruder_nr description"
+msgid "The extruder train to use for printing the roofs of the support. This is used in multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr label"
+msgid "Support Floor Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_extruder_nr description"
+msgid "The extruder train to use for printing the floors of the support. This is used in multi-extrusion."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_type label"
@@ -2553,8 +2700,18 @@ msgstr "Высота шага лестничной поддержки"
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_stair_step_height description"
-msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
-msgstr "Высота шагов лестнично-подобного низа поддержек, лежащих на модели. Малое значение усложняет последующее удаление поддержек, но слишком большое значение может сделать структуру поддержек нестабильной."
+msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures. Set to zero to turn off the stair-like behaviour."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width label"
+msgid "Support Stair Step Maximum Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_width description"
+msgid "The maximum width of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
@@ -2586,6 +2743,26 @@ msgctxt "support_interface_enable description"
 msgid "Generate a dense interface between the model and the support. This will create a skin at the top of the support on which the model is printed and at the bottom of the support, where it rests on the model."
 msgstr "Генерирует плотный слой между моделью и поддержкой. Создаёт поверхность сверху поддержек, на которой печатается модель, и снизу, при печати поддержек на модели."
 
+#: fdmprinter.def.json
+msgctxt "support_roof_enable label"
+msgid "Enable Support Roof"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_enable description"
+msgid "Generate a dense slab of material between the top of support and the model. This will create a skin between the model and support."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable label"
+msgid "Enable Support Floor"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_enable description"
+msgid "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_height label"
 msgid "Support Interface Thickness"
@@ -2608,13 +2785,13 @@ msgstr "Толщина крыши поддержек. Управляет вел
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height label"
-msgid "Support Bottom Thickness"
-msgstr "Толщина низа поддержек"
+msgid "Support Floor Thickness"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_bottom_height description"
-msgid "The thickness of the support bottoms. This controls the number of dense layers are printed on top of places of a model on which support rests."
-msgstr "Толщина низа поддержек. Управляет количеством плотных слоёв, которые будут напечатаны на верхних частях модели, где располагаются поддержки."
+msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height label"
@@ -2623,8 +2800,8 @@ msgstr "Разрешение связующего слоя поддержек."
 
 #: fdmprinter.def.json
 msgctxt "support_interface_skip_height description"
-msgid "When checking where there's model above the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
-msgstr "Если выбрано, то поддержки печатаются с учётом указанной высоты шага. Меньшие значения нарезаются дольше, в то время как большие значения могут привести к печати обычных поддержек в таких местах, где должен быть связующий слой."
+msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_density label"
@@ -2633,18 +2810,48 @@ msgstr "Плотность связующего слоя поддержки"
 
 #: fdmprinter.def.json
 msgctxt "support_interface_density description"
-msgid "Adjusts the density of the roofs and bottoms of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
-msgstr "Настройте плотность верха и низа структуры поддержек. Большее значение приведёт к улучшению нависаний, но такие поддержки будет труднее удалять."
+msgid "Adjusts the density of the roofs and floors of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance label"
-msgid "Support Interface Line Distance"
-msgstr "Дистанция между линиями связующего слоя"
+msgctxt "support_roof_density label"
+msgid "Support Roof Density"
+msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "support_interface_line_distance description"
-msgid "Distance between the printed support interface lines. This setting is calculated by the Support Interface Density, but can be adjusted separately."
-msgstr "Расстояние между линиями связующего слоя поддержки. Этот параметр вычисляется из \"Плотности связующего слоя\", но также может быть указан самостоятельно."
+msgctxt "support_roof_density description"
+msgid "The density of the roofs of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance label"
+msgid "Support Roof Line Distance"
+msgstr "Дистанция линии крыши"
+
+#: fdmprinter.def.json
+msgctxt "support_roof_line_distance description"
+msgid "Distance between the printed support roof lines. This setting is calculated by the Support Roof Density, but can be adjusted separately."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density label"
+msgid "Support Floor Density"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_density description"
+msgid "The density of the floors of the support structure. A higher value results in better adhesion of the support on top of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance label"
+msgid "Support Floor Line Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_line_distance description"
+msgid "Distance between the printed support floor lines. This setting is calculated by the Support Floor Density, but can be adjusted separately."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "support_interface_pattern label"
@@ -2686,6 +2893,86 @@ msgctxt "support_interface_pattern option zigzag"
 msgid "Zig Zag"
 msgstr "Зигзаг"
 
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern label"
+msgid "Support Roof Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern description"
+msgid "The pattern with which the roofs of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option lines"
+msgid "Lines"
+msgstr "Линии"
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option grid"
+msgid "Grid"
+msgstr "Сетка"
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option triangles"
+msgid "Triangles"
+msgstr "Треугольники"
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric"
+msgid "Concentric"
+msgstr "Концентрический"
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_roof_pattern option zigzag"
+msgid "Zig Zag"
+msgstr "Зигзаг"
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern label"
+msgid "Support Floor Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern description"
+msgid "The pattern with which the floors of the support are printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option grid"
+msgid "Grid"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option triangles"
+msgid "Triangles"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option concentric_3d"
+msgid "Concentric 3D"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_use_towers label"
 msgid "Use Towers"
@@ -2736,6 +3023,16 @@ msgctxt "platform_adhesion description"
 msgid "Adhesion"
 msgstr "Прилипание"
 
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable label"
+msgid "Enable Prime Blob"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_blob_enable description"
+msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
@@ -3410,6 +3707,56 @@ msgctxt "infill_mesh_order description"
 msgid "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
 msgstr "Определяет какой заполняющий объект находится внутри заполнения другого заполняющего объекта. Заполняющий объект с более высоким порядком будет модифицировать заполнение объектов с более низким порядком или обычных объектов."
 
+#: fdmprinter.def.json
+msgctxt "cutting_mesh label"
+msgid "Cutting Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "cutting_mesh description"
+msgid "Limit the volume of this mesh to within other meshes. You can use this to make certain areas of one mesh print with different settings and with a whole different extruder."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled label"
+msgid "Mold"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_enabled description"
+msgid "Print models as a mold, which can be cast in order to get a model which resembles the models on the build plate."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width label"
+msgid "Minimal Mold Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_width description"
+msgid "The minimal distance between the ouside of the mold and the outside of the model."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height label"
+msgid "Mold Roof Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_roof_height description"
+msgid "The height above horizontal parts in your model which to print mold."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle label"
+msgid "Mold Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "mold_angle description"
+msgid "The angle of overhang of the outer walls created for the mold. 0° will make the outer shell of the mold vertical, while 90° will make the outside of the model follow the contour of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_mesh label"
 msgid "Support Mesh"
@@ -3420,6 +3767,16 @@ msgctxt "support_mesh description"
 msgid "Use this mesh to specify support areas. This can be used to generate support structure."
 msgstr "Используйте этот объект для указания области поддержек. Может использоваться при генерации структуры поддержек."
 
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down label"
+msgid "Drop Down Support Mesh"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_mesh_drop_down description"
+msgid "Make support everywhere below the support mesh, so that there's no overhang in the support mesh."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "anti_overhang_mesh label"
 msgid "Anti Overhang Mesh"
@@ -3462,8 +3819,18 @@ msgstr "Спирально печатать внешний контур"
 
 #: fdmprinter.def.json
 msgctxt "magic_spiralize description"
-msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions."
-msgstr "Спирально сглаживать движение по оси Z, печатая внешний контур. Приводит к постоянному увеличению Z координаты во время печати. Этот параметр превращает сплошной объект в одностенную модель с твёрдым дном. Раньше этот параметр назывался Joris."
+msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature should only be enabled when each layer only contains a single part."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours label"
+msgid "Smooth Spiralized Contours"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "smooth_spiralized_contours description"
+msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "experimental label"
@@ -4004,6 +4371,90 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Матрица преобразования, применяемая к модели при её загрузки из файла."
 
+#~ msgctxt "support_interface_line_width description"
+#~ msgid "Width of a single support interface line."
+#~ msgstr "Ширина одной линии поддерживающей крыши."
+
+#~ msgctxt "sub_div_rad_mult label"
+#~ msgid "Cubic Subdivision Radius"
+#~ msgstr "Радиус динамического куба"
+
+#~ msgctxt "sub_div_rad_mult description"
+#~ msgid "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes."
+#~ msgstr "Коэффициент для радиуса от центра каждого куба для проверки границ модели, используется для принятия решения о разделении куба. Большие значения приводят к увеличению делений, т.е. к более мелким кубам."
+
+#~ msgctxt "expand_upper_skins label"
+#~ msgid "Expand Upper Skins"
+#~ msgstr "Расширять верхние оболочки"
+
+#~ msgctxt "expand_upper_skins description"
+#~ msgid "Expand upper skin areas (areas with air above) so that they support infill above."
+#~ msgstr "Расширять области верхней оболочки (над ними будет воздух) так, что они поддерживают заполнение над ними."
+
+#~ msgctxt "expand_lower_skins label"
+#~ msgid "Expand Lower Skins"
+#~ msgstr "Расширять нижние оболочки"
+
+#~ msgctxt "expand_lower_skins description"
+#~ msgid "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below."
+#~ msgstr "Расширять области нижней оболочки (под ними будет воздух) так, что они сцепляются с слоями заполнения сверху и снизу."
+
+#~ msgctxt "speed_support_interface description"
+#~ msgid "The speed at which the roofs and bottoms of support are printed. Printing the them at lower speeds can improve overhang quality."
+#~ msgstr "Скорость, на которой происходит печать верха и низа поддержек. Печать верха поддержек на пониженных скоростях может улучшить качество печати нависающих краёв модели."
+
+#~ msgctxt "acceleration_support_interface description"
+#~ msgid "The acceleration with which the roofs and bottoms of support are printed. Printing them at lower accelerations can improve overhang quality."
+#~ msgstr "Ускорение, с которым печатаются верх и низ поддержек. Их печать с пониженными ускорениями может улучшить качество печати нависающих частей."
+
+#~ msgctxt "jerk_support_interface description"
+#~ msgid "The maximum instantaneous velocity change with which the roofs and bottoms of support are printed."
+#~ msgstr "Изменение максимальной мгновенной скорости, с которой печатается связующие слои поддержек."
+
+#~ msgctxt "support_enable label"
+#~ msgid "Enable Support"
+#~ msgstr "Разрешить поддержки"
+
+#~ msgctxt "support_enable description"
+#~ msgid "Enable support structures. These structures support parts of the model with severe overhangs."
+#~ msgstr "Разрешить печать поддержек. Такие структуры поддерживают части моделей со значительными навесаниями."
+
+#~ msgctxt "support_interface_extruder_nr description"
+#~ msgid "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion."
+#~ msgstr "Этот экструдер используется для печати верха и низа поддержек. Используется при наличии нескольких экструдеров."
+
+#~ msgctxt "support_bottom_stair_step_height description"
+#~ msgid "The height of the steps of the stair-like bottom of support resting on the model. A low value makes the support harder to remove, but too high values can lead to unstable support structures."
+#~ msgstr "Высота шагов лестнично-подобного низа поддержек, лежащих на модели. Малое значение усложняет последующее удаление поддержек, но слишком большое значение может сделать структуру поддержек нестабильной."
+
+#~ msgctxt "support_bottom_height label"
+#~ msgid "Support Bottom Thickness"
+#~ msgstr "Толщина низа поддержек"
+
+#~ msgctxt "support_bottom_height description"
+#~ msgid "The thickness of the support bottoms. This controls the number of dense layers are printed on top of places of a model on which support rests."
+#~ msgstr "Толщина низа поддержек. Управляет количеством плотных слоёв, которые будут напечатаны на верхних частях модели, где располагаются поддержки."
+
+#~ msgctxt "support_interface_skip_height description"
+#~ msgid "When checking where there's model above the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
+#~ msgstr "Если выбрано, то поддержки печатаются с учётом указанной высоты шага. Меньшие значения нарезаются дольше, в то время как большие значения могут привести к печати обычных поддержек в таких местах, где должен быть связующий слой."
+
+#~ msgctxt "support_interface_density description"
+#~ msgid "Adjusts the density of the roofs and bottoms of the support structure. A higher value results in better overhangs, but the supports are harder to remove."
+#~ msgstr "Настройте плотность верха и низа структуры поддержек. Большее значение приведёт к улучшению нависаний, но такие поддержки будет труднее удалять."
+
+#~ msgctxt "support_interface_line_distance label"
+#~ msgid "Support Interface Line Distance"
+#~ msgstr "Дистанция между линиями связующего слоя"
+
+#~ msgctxt "support_interface_line_distance description"
+#~ msgid "Distance between the printed support interface lines. This setting is calculated by the Support Interface Density, but can be adjusted separately."
+#~ msgstr "Расстояние между линиями связующего слоя поддержки. Этот параметр вычисляется из \"Плотности связующего слоя\", но также может быть указан самостоятельно."
+
+#~ msgctxt "magic_spiralize description"
+#~ msgid "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions."
+#~ msgstr "Спирально сглаживать движение по оси Z, печатая внешний контур. Приводит к постоянному увеличению Z координаты во время печати. Этот параметр превращает сплошной объект в одностенную модель с твёрдым дном. Раньше этот параметр назывался Joris."
+
 #~ msgctxt "material_print_temperature description"
 #~ msgid "The temperature used for printing. Set at 0 to pre-heat the printer manually."
 #~ msgstr "Температура при печати. Установите 0 для предварительного разогрева вручную."
@@ -4108,10 +4559,6 @@ msgstr "Матрица преобразования, применяемая к
 #~ msgid "Line Distance"
 #~ msgstr "Дистанция заполнения"
 
-#~ msgctxt "speed_support_roof label"
-#~ msgid "Support Roof Speed"
-#~ msgstr "Скорость печати крыши поддержек"
-
 #~ msgctxt "retraction_combing label"
 #~ msgid "Enable Combing"
 #~ msgstr "Разрешить комбинг"
@@ -4148,30 +4595,6 @@ msgstr "Матрица преобразования, применяемая к
 #~ msgid "The thickness of the support roofs."
 #~ msgstr "Толщина поддерживающей крыши."
 
-#~ msgctxt "support_roof_line_distance label"
-#~ msgid "Support Roof Line Distance"
-#~ msgstr "Дистанция линии крыши"
-
-#~ msgctxt "support_roof_pattern option lines"
-#~ msgid "Lines"
-#~ msgstr "Линии"
-
-#~ msgctxt "support_roof_pattern option grid"
-#~ msgid "Grid"
-#~ msgstr "Сетка"
-
-#~ msgctxt "support_roof_pattern option triangles"
-#~ msgid "Triangles"
-#~ msgstr "Треугольники"
-
-#~ msgctxt "support_roof_pattern option concentric"
-#~ msgid "Concentric"
-#~ msgstr "Концентрический"
-
-#~ msgctxt "support_roof_pattern option zigzag"
-#~ msgid "Zig Zag"
-#~ msgstr "Зигзаг"
-
 #~ msgctxt "support_conical_angle label"
 #~ msgid "Cone Angle"
 #~ msgstr "Угол конуса"

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

@@ -1,178 +1,189 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Cura 2.5\n"
-"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n"
-"POT-Creation-Date: 2017-03-27 17:27+0000\n"
-"PO-Revision-Date: 2017-04-04 11:27+0200\n"
-"Last-Translator: Bothof <info@bothof.nl>\n"
-"Language-Team: Bothof <info@bothof.nl>\n"
-"Language: 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_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.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-04-04 11:27+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 ""
+
+#: 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 ""
+
+#: 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/Cura.qml

@@ -260,6 +260,32 @@ UM.MainWindow
                 {
                     if (drop.urls.length > 0)
                     {
+                        // As the drop area also supports plugins, first check if it's a plugin that was dropped.
+                        if(drop.urls.length == 1)
+                        {
+                            if(PluginRegistry.isPluginFile(drop.urls[0]))
+                            {
+                                // Try to install plugin & close.
+                                var result = PluginRegistry.installPlugin(drop.urls[0]);
+                                pluginInstallDialog.text = result.message
+                                if(result.status == "ok")
+                                {
+                                    pluginInstallDialog.icon = StandardIcon.Information
+                                }
+                                else if(result.status == "duplicate")
+                                {
+                                    pluginInstallDialog.icon = StandardIcon.Warning
+                                }
+                                else
+                                {
+                                    pluginInstallDialog.icon = StandardIcon.Critical
+                                }
+                                pluginInstallDialog.open();
+                                return;
+                            }
+
+                        }
+
                         openDialog.handleOpenFileUrls(drop.urls);
                     }
                 }
@@ -400,41 +426,15 @@ UM.MainWindow
                 }
             }
 
-            Image
+            Loader
             {
-                id: cameraImage
-                width: Math.min(viewportOverlay.width, sourceSize.width)
-                height: sourceSize.height * width / sourceSize.width
+                sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null
+                visible: base.monitoringPrint
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
-                visible: base.monitoringPrint
-                onVisibleChanged:
-                {
-                    if(Cura.MachineManager.printerOutputDevices.length == 0 )
-                    {
-                        return;
-                    }
-                    if(visible)
-                    {
-                        Cura.MachineManager.printerOutputDevices[0].startCamera()
-                    } else
-                    {
-                        Cura.MachineManager.printerOutputDevices[0].stopCamera()
-                    }
-                }
-                source:
-                {
-                    if(!base.monitoringPrint)
-                    {
-                        return "";
-                    }
-                    if(Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage)
-                    {
-                        return Cura.MachineManager.printerOutputDevices[0].cameraImage;
-                    }
-                    return "";
-                }
+
+
             }
 
             UM.MessageStack
@@ -713,6 +713,14 @@ UM.MainWindow
         }
     }
 
+    MessageDialog
+    {
+        id: pluginInstallDialog
+        title: catalog.i18nc("@window:title", "Install Plugin");
+        standardButtons: StandardButton.Ok
+        modality: Qt.ApplicationModal
+    }
+
     MessageDialog {
         id: infoMultipleFilesWithGcodeDialog
         title: catalog.i18nc("@title:window", "Open File(s)")

resources/qml/ExtruderButton.qml

@@ -13,7 +13,7 @@ Button
 
     property var extruder;
 
-    text: catalog.i18ncp("@label", "Print Selected Model with %1", "Print Selected Models With %1", UM.Selection.selectionCount).arg(extruder.name)
+    text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name)
 
     style: UM.Theme.styles.tool_button;
     iconSource: checked ? UM.Theme.getIcon("material_selected") : UM.Theme.getIcon("material_not_selected");

resources/qml/Settings/SettingItem.qml

@@ -140,7 +140,7 @@ Item {
             {
                 id: linkedSettingIcon;
 
-                visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || definition.limit_to_extruder != "-1") && base.showLinkedSettingIcon
+                visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || globalPropertyProvider.properties.limit_to_extruder != "-1") && base.showLinkedSettingIcon
 
                 height: parent.height;
                 width: height;

resources/qml/Settings/SettingOptionalExtruder.qml

@@ -0,0 +1,153 @@
+// Copyright (c) 2016 Ultimaker B.V.
+// Uranium is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.1
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
+
+import UM 1.1 as UM
+import Cura 1.0 as Cura
+
+SettingItem
+{
+    id: base
+
+    contents: ComboBox
+    {
+        id: control
+        anchors.fill: parent
+
+        model: Cura.ExtrudersModel
+        {
+            onModelChanged: control.color = getItem(control.currentIndex).color
+            addOptionalExtruder: true
+        }
+
+        textRole: "name"
+
+        onActivated:
+        {
+            forceActiveFocus();
+            propertyProvider.setPropertyValue("value", model.getItem(index).index);
+        }
+
+        Binding
+        {
+            target: control
+            property: "currentIndex"
+            value:
+            {
+                if(propertyProvider.properties.value == -1)
+                {
+                    return control.model.items.length - 1
+                }
+                return propertyProvider.properties.value
+            }
+            // Sometimes when the value is already changed, the model is still being built.
+            // The when clause ensures that the current index is not updated when this happens.
+            when: control.model.items.length > 0
+        }
+
+        MouseArea
+        {
+            anchors.fill: parent
+            acceptedButtons: Qt.NoButton
+            onWheel: wheel.accepted = true;
+        }
+
+        property string color: "#fff"
+
+        Binding
+        {
+            // We override the color property's value when the ExtruderModel changes. So we need to use an
+            // explicit binding here otherwise we do not handle value changes after the model changes.
+            target: control
+            property: "color"
+            value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : ""
+        }
+
+        style: ComboBoxStyle
+        {
+            background: Rectangle
+            {
+                color:
+                {
+                    if (!enabled)
+                    {
+                        return UM.Theme.getColor("setting_control_disabled");
+                    }
+                    if(control.hovered || base.activeFocus)
+                    {
+                        return UM.Theme.getColor("setting_control_highlight");
+                    }
+                    else
+                    {
+                        return UM.Theme.getColor("setting_control");
+                    }
+                }
+                border.width: UM.Theme.getSize("default_lining").width
+                border.color:
+                {
+                    if(!enabled)
+                    {
+                        return UM.Theme.getColor("setting_control_disabled_border");
+                    }
+                    if(control.hovered || base.activeFocus)
+                    {
+                        UM.Theme.getColor("setting_control_border_highlight")
+                    }
+
+                    return UM.Theme.getColor("setting_control_border")
+                }
+            }
+            label: Item
+            {
+                Rectangle
+                {
+                    id: swatch
+                    height: UM.Theme.getSize("setting_control").height / 2
+                    width: height
+
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    border.width: UM.Theme.getSize("default_lining").width
+                    border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
+
+                    color: control.color
+                }
+                Label
+                {
+                    anchors
+                    {
+                        left: swatch.right;
+                        right: arrow.left;
+                        verticalCenter: parent.verticalCenter
+                        margins: UM.Theme.getSize("default_lining").width
+                    }
+                    width: parent.width - swatch.width;
+
+                    text: control.currentText
+                    font: UM.Theme.getFont("default")
+                    color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
+
+                    elide: Text.ElideRight
+                    verticalAlignment: Text.AlignVCenter
+                }
+                UM.RecolorImage
+                {
+                    id: arrow
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    source: UM.Theme.getIcon("arrow_bottom")
+                    width: UM.Theme.getSize("standard_arrow").width
+                    height: UM.Theme.getSize("standard_arrow").height
+                    sourceSize.width: width + 5
+                    sourceSize.height: width + 5
+
+                    color: UM.Theme.getColor("setting_control_text")
+                }
+            }
+        }
+    }
+}

resources/qml/Settings/SettingView.qml

@@ -195,7 +195,7 @@ Item
                 //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
                 //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
                 //causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
-                asynchronous: model.type != "enum" && model.type != "extruder"
+                asynchronous: model.type != "enum" && model.type != "extruder" && model.type != "optional_extruder"
                 active: model.type != undefined
 
                 source:
@@ -218,6 +218,8 @@ Item
                             return "SettingTextField.qml"
                         case "category":
                             return "SettingCategory.qml"
+                        case "optional_extruder":
+                            return "SettingOptionalExtruder.qml"
                         default:
                             return "SettingUnknown.qml"
                     }

resources/qml/SidebarHeader.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -159,10 +159,10 @@ Column
         visible: !extruderSelectionRow.visible
     }
 
-    Row
+    Item
     {
         id: variantRow
-
+        
         height: UM.Theme.getSize("sidebar_setup").height
         visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings
 
@@ -177,6 +177,14 @@ Column
         Text
         {
             id: variantLabel
+            width: parent.width * 0.30
+
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: variantRow.left
+
+            font: UM.Theme.getFont("default");
+            color: UM.Theme.getColor("text");
+
             text:
             {
                 var label;
@@ -194,16 +202,55 @@ Column
                 }
                 return "%1:".arg(label);
             }
+        }
 
+        Button
+        {
+            id: materialInfoButton
+            height: parent.height * 0.60
+            width: height
+
+            anchors.right: materialVariantContainer.left
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter
-            width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
-            font: UM.Theme.getFont("default");
-            color: UM.Theme.getColor("text");
+
+            visible: extrudersList.visible
+
+            text: "i"
+            style: UM.Theme.styles.info_button
+
+            onClicked:
+            {
+                // open the material URL with web browser
+                var version = UM.Application.version;
+                var machineName = Cura.MachineManager.activeMachine.definition.id;
+
+                var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName;
+                Qt.openUrlExternally(url);
+            }
+
+            onHoveredChanged:
+            {
+                if (hovered)
+                {
+                    var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
+                    base.showTooltip(
+                        extruderSelectionRow, Qt.point(0, extruderSelectionRow.height + variantRow.height / 2), catalog.i18nc("@tooltip", content)
+                    );
+                }
+                else
+                {
+                    base.hideTooltip();
+                }
+            }
         }
 
         Item
         {
+            id: materialVariantContainer
+
             anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
 
             width: parent.width * 0.55 + UM.Theme.getSize("default_margin").width
             height: UM.Theme.getSize("setting_control").height

resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fine
+name = Normal
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fine
+name = Normal
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Coarse Quality
+name = Coarse
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Coarse Quality
+name = Extra Coarse
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fine
+name = Normal
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fine
+name = Normal
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Coarse Quality
+name = Coarse
 definition = cartesio
 
 [metadata]

resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Coarse Quality
+name = Extra Coarse
 definition = cartesio
 
 [metadata]

resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]

resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fine
+name = Normal
 definition = cartesio
 
 [metadata]

resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fine
+name = Normal
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom

resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Extra Fine
+name = High
 definition = cartesio
 
 [metadata]
@@ -37,7 +37,6 @@ speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)
 speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3)
 speed_topbottom = =round(speed_print / 5 * 4)
-speed_slowdown_layers = 1
 speed_travel = =round(speed_print if magic_spiralize else 150)
 speed_travel_layer_0 = =speed_travel
 speed_support_interface = =speed_topbottom