Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -78,3 +78,5 @@ CuraEngine
 
 #Prevents import failures when plugin running tests
 plugins/__init__.py
+
+/venv

cura/API/Account.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 from datetime import datetime
-from typing import Optional, Dict, TYPE_CHECKING, Union
+from typing import Optional, Dict, TYPE_CHECKING, Callable
 
 from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty, QTimer, Q_ENUMS
 
@@ -56,6 +56,7 @@ class Account(QObject):
     lastSyncDateTimeChanged = pyqtSignal()
     syncStateChanged = pyqtSignal(int)  # because SyncState is an int Enum
     manualSyncEnabledChanged = pyqtSignal(bool)
+    updatePackagesEnabledChanged = pyqtSignal(bool)
 
     def __init__(self, application: "CuraApplication", parent = None) -> None:
         super().__init__(parent)
@@ -66,6 +67,8 @@ class Account(QObject):
         self._logged_in = False
         self._sync_state = SyncState.IDLE
         self._manual_sync_enabled = False
+        self._update_packages_enabled = False
+        self._update_packages_action = None  # type: Optional[Callable]
         self._last_sync_str = "-"
 
         self._callback_port = 32118
@@ -91,7 +94,7 @@ class Account(QObject):
         self._update_timer.setInterval(int(self.SYNC_INTERVAL * 1000))
         # The timer is restarted explicitly after an update was processed. This prevents 2 concurrent updates
         self._update_timer.setSingleShot(True)
-        self._update_timer.timeout.connect(self.syncRequested)
+        self._update_timer.timeout.connect(self.sync)
 
         self._sync_services = {}  # type: Dict[str, int]
         """contains entries "service_name" : SyncState"""
@@ -143,6 +146,18 @@ class Account(QObject):
                 if not self._update_timer.isActive():
                     self._update_timer.start()
 
+    def setUpdatePackagesAction(self, action: Callable) -> None:
+        """ Set the callback which will be invoked when the user clicks the update packages button
+
+        Should be invoked after your service sets the sync state to SYNCING and before setting the
+        sync state to SUCCESS.
+
+        Action will be reset to None when the next sync starts
+        """
+        self._update_packages_action = action
+        self._update_packages_enabled = True
+        self.updatePackagesEnabledChanged.emit(self._update_packages_enabled)
+
     def _onAccessTokenChanged(self):
         self.accessTokenChanged.emit()
 
@@ -185,6 +200,9 @@ class Account(QObject):
         sync is currently running, a sync will be requested.
         """
 
+        self._update_packages_action = None
+        self._update_packages_enabled = False
+        self.updatePackagesEnabledChanged.emit(self._update_packages_enabled)
         if self._update_timer.isActive():
             self._update_timer.stop()
         elif self._sync_state == SyncState.SYNCING:
@@ -251,6 +269,10 @@ class Account(QObject):
     def manualSyncEnabled(self) -> bool:
         return self._manual_sync_enabled
 
+    @pyqtProperty(bool, notify=updatePackagesEnabledChanged)
+    def updatePackagesEnabled(self) -> bool:
+        return self._update_packages_enabled
+
     @pyqtSlot()
     @pyqtSlot(bool)
     def sync(self, user_initiated: bool = False) -> None:
@@ -259,11 +281,14 @@ class Account(QObject):
 
         self._sync()
 
+    @pyqtSlot()
+    def onUpdatePackagesClicked(self) -> None:
+        if self._update_packages_action is not None:
+            self._update_packages_action()
+
     @pyqtSlot()
     def popupOpened(self) -> None:
         self._setManualSyncEnabled(True)
-        self._sync_state = SyncState.IDLE
-        self.syncStateChanged.emit(self._sync_state)
 
     @pyqtSlot()
     def logout(self) -> None:

cura/Backups/Backup.py

@@ -64,9 +64,9 @@ class Backup:
         files = archive.namelist()
 
         # Count the metadata items. We do this in a rather naive way at the moment.
-        machine_count = len([s for s in files if "machine_instances/" in s]) - 1
+        machine_count = max(len([s for s in files if "machine_instances/" in s]) - 1, 0)  # If people delete their profiles but not their preferences, it can still make a backup, and report -1 profiles. Server crashes on this.
-        material_count = len([s for s in files if "materials/" in s]) - 1
+        material_count = max(len([s for s in files if "materials/" in s]) - 1, 0)
-        profile_count = len([s for s in files if "quality_changes/" in s]) - 1
+        profile_count = max(len([s for s in files if "quality_changes/" in s]) - 1, 0)
         plugin_count = len([s for s in files if "plugin.json" in s])
 
         # Store the archive and metadata so the BackupManager can fetch them when needed.

cura/BuildVolume.py

@@ -781,7 +781,8 @@ class BuildVolume(SceneNode):
                     if prime_tower_collision:  # Already found a collision.
                         break
                     if self._global_container_stack.getProperty("prime_tower_brim_enable", "value") and self._global_container_stack.getProperty("adhesion_type", "value") != "raft":
-                        prime_tower_areas[extruder_id][area_index] = prime_tower_area.getMinkowskiHull(Polygon.approximatedCircle(disallowed_border_size))
+                        brim_size = self._calculateBedAdhesionSize(used_extruders, "brim")
+                        prime_tower_areas[extruder_id][area_index] = prime_tower_area.getMinkowskiHull(Polygon.approximatedCircle(brim_size))
                 if not prime_tower_collision:
                     result_areas[extruder_id].extend(prime_tower_areas[extruder_id])
                     result_areas_no_brim[extruder_id].extend(prime_tower_areas[extruder_id])
@@ -1038,16 +1039,23 @@ class BuildVolume(SceneNode):
                 all_values[i] = 0
         return all_values
 
-    def _calculateBedAdhesionSize(self, used_extruders):
+    def _calculateBedAdhesionSize(self, used_extruders, adhesion_override = None):
+        """Get the bed adhesion size for the global container stack and used extruders
+
+        :param adhesion_override: override adhesion type.
+          Use None to use the global stack default, "none" for no adhesion, "brim" for brim etc.
+        """
         if self._global_container_stack is None:
             return None
 
         container_stack = self._global_container_stack
-        adhesion_type = container_stack.getProperty("adhesion_type", "value")
+        adhesion_type = adhesion_override
+        if adhesion_type is None:
+            adhesion_type = container_stack.getProperty("adhesion_type", "value")
         skirt_brim_line_width = self._global_container_stack.getProperty("skirt_brim_line_width", "value")
         initial_layer_line_width_factor = self._global_container_stack.getProperty("initial_layer_line_width_factor", "value")
         # Use brim width if brim is enabled OR the prime tower has a brim.
-        if adhesion_type == "brim" or (self._global_container_stack.getProperty("prime_tower_brim_enable", "value") and adhesion_type != "raft"):
+        if adhesion_type == "brim":
             brim_line_count = self._global_container_stack.getProperty("brim_line_count", "value")
             bed_adhesion_size = skirt_brim_line_width * brim_line_count * initial_layer_line_width_factor / 100.0
 
@@ -1056,7 +1064,7 @@ class BuildVolume(SceneNode):
 
             # We don't create an additional line for the extruder we're printing the brim with.
             bed_adhesion_size -= skirt_brim_line_width * initial_layer_line_width_factor / 100.0
-        elif adhesion_type == "skirt":  # No brim? Also not on prime tower? Then use whatever the adhesion type is saying: Skirt, raft or none.
+        elif adhesion_type == "skirt":
             skirt_distance = self._global_container_stack.getProperty("skirt_gap", "value")
             skirt_line_count = self._global_container_stack.getProperty("skirt_line_count", "value")
 

cura/Machines/ContainerTree.py

@@ -171,7 +171,7 @@ class ContainerTree:
 
             The ``JobQueue`` will schedule this on a different thread.
             """
-
+            Logger.log("d", "Started background loading of MachineNodes")
             for stack in self.container_stacks:  # Load all currently-added containers.
                 if not isinstance(stack, GlobalStack):
                     continue
@@ -182,3 +182,4 @@ class ContainerTree:
                 definition_id = stack.definition.getId()
                 if not self.tree_root.machines.is_loaded(definition_id):
                     _ = self.tree_root.machines[definition_id]
+            Logger.log("d", "All MachineNode loading completed")

cura/Machines/Models/QualitySettingsModel.py

@@ -1,14 +1,17 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt
 from typing import Set
 
 import cura.CuraApplication
+from UM import i18nCatalog
 from UM.Logger import Logger
 from UM.Qt.ListModel import ListModel
 from UM.Settings.ContainerRegistry import ContainerRegistry
 
+import os
+
 
 class QualitySettingsModel(ListModel):
     """This model is used to show details settings of the selected quality in the quality management page."""
@@ -81,6 +84,12 @@ class QualitySettingsModel(ListModel):
         global_container_stack = self._application.getGlobalContainerStack()
         definition_container = global_container_stack.definition
 
+        # Try and find a translation catalog for the definition
+        for file_name in definition_container.getInheritedFiles():
+            catalog = i18nCatalog(os.path.basename(file_name))
+            if catalog.hasTranslationLoaded():
+                self._i18n_catalog = catalog
+
         quality_group = self._selected_quality_item["quality_group"]
         quality_changes_group = self._selected_quality_item["quality_changes_group"]
 

cura/PickingPass.py

@@ -54,7 +54,7 @@ class PickingPass(RenderPass):
         # Fill up the batch with objects that can be sliced. `
         for node in DepthFirstIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax.
             if node.callDecoration("isSliceable") and node.getMeshData() and node.isVisible():
-                batch.addItem(node.getWorldTransformation(copy = False), node.getMeshData())
+                batch.addItem(node.getWorldTransformation(copy = False), node.getMeshData(), normal_transformation=node.getCachedNormalMatrix())
 
         self.bind()
         batch.render(self._scene.getActiveCamera())

cura/PrinterOutput/Models/ExtruderConfigurationModel.py

@@ -74,11 +74,11 @@ class ExtruderConfigurationModel(QObject):
         # Empty materials should be ignored for comparison
         if self.activeMaterial is not None and other.activeMaterial is not None:
             if self.activeMaterial.guid != other.activeMaterial.guid:
-                if self.activeMaterial.guid != "" and other.activeMaterial.guid != "":
+                if self.activeMaterial.guid == "" and other.activeMaterial.guid == "":
-                    return False
-                else:
                     # At this point there is no material, so it doesn't matter what the hotend is.
                     return True
+                else:
+                    return False
 
         if self.hotendID != other.hotendID:
             return False

cura/PrinterOutput/Models/ExtruderOutputModel.py

@@ -99,7 +99,7 @@ class ExtruderOutputModel(QObject):
             self._is_preheating = pre_heating
             self.isPreheatingChanged.emit()
 
-    @pyqtProperty(bool, notify=isPreheatingChanged)
+    @pyqtProperty(bool, notify = isPreheatingChanged)
     def isPreheating(self) -> bool:
         return self._is_preheating
 

cura/Scene/ConvexHullNode.py

@@ -61,6 +61,7 @@ class ConvexHullNode(SceneNode):
                 if hull_mesh_builder.addConvexPolygon(
                     self._hull.getPoints()[::],  # bottom layer is reversed
                     self._mesh_height, color = self._color):
+                    hull_mesh_builder.resetNormals()
 
                     hull_mesh = hull_mesh_builder.build()
                     self.setMeshData(hull_mesh)
@@ -68,7 +69,7 @@ class ConvexHullNode(SceneNode):
                 if hull_mesh_builder.addConvexPolygonExtrusion(
                     self._hull.getPoints()[::-1],  # bottom layer is reversed
                     self._mesh_height - thickness, self._mesh_height, color = self._color):
-
+                    hull_mesh_builder.resetNormals()
                     hull_mesh = hull_mesh_builder.build()
                     self.setMeshData(hull_mesh)
 

cura/Settings/CuraContainerRegistry.py

@@ -45,7 +45,7 @@ class CuraContainerRegistry(ContainerRegistry):
         self.containerAdded.connect(self._onContainerAdded)
 
     @override(ContainerRegistry)
-    def addContainer(self, container: ContainerInterface) -> None:
+    def addContainer(self, container: ContainerInterface) -> bool:
         """Overridden from ContainerRegistry
 
         Adds a container to the registry.
@@ -64,9 +64,9 @@ class CuraContainerRegistry(ContainerRegistry):
             actual_setting_version = int(container.getMetaDataEntry("setting_version", default = 0))
             if required_setting_version != actual_setting_version:
                 Logger.log("w", "Instance container {container_id} is outdated. Its setting version is {actual_setting_version} but it should be {required_setting_version}.".format(container_id = container.getId(), actual_setting_version = actual_setting_version, required_setting_version = required_setting_version))
-                return  # Don't add.
+                return False  # Don't add.
 
-        super().addContainer(container)
+        return super().addContainer(container)
 
     def createUniqueName(self, container_type: str, current_name: str, new_name: str, fallback_name: str) -> str:
         """Create a name that is not empty and unique
@@ -348,6 +348,34 @@ class CuraContainerRegistry(ContainerRegistry):
         self._registerSingleExtrusionMachinesExtruderStacks()
         self._connectUpgradedExtruderStacksToMachines()
 
+    @override(ContainerRegistry)
+    def loadAllMetadata(self) -> None:
+        super().loadAllMetadata()
+        self._cleanUpInvalidQualityChanges()
+
+    def _cleanUpInvalidQualityChanges(self) -> None:
+        # We've seen cases where it was possible for quality_changes to be incorrectly added. This is to ensure that
+        # any such leftovers are purged from the registry.
+        quality_changes = ContainerRegistry.getInstance().findContainersMetadata(type="quality_changes")
+
+        profile_count_by_name = {}  # type: Dict[str, int]
+
+        for quality_change in quality_changes:
+            name = str(quality_change.get("name", ""))
+            if name == "empty":
+                continue
+            if name not in profile_count_by_name:
+                profile_count_by_name[name] = 0
+            profile_count_by_name[name] += 1
+
+        for profile_name, profile_count in profile_count_by_name.items():
+            if profile_count > 1:
+                continue
+            # Only one profile found, this should not ever be the case, so that profile needs to be removed!
+            Logger.log("d", "Found an invalid quality_changes profile with the name %s. Going to remove that now", profile_name)
+            invalid_quality_changes = ContainerRegistry.getInstance().findContainersMetadata(name=profile_name)
+            self.removeContainer(invalid_quality_changes[0]["id"])
+
     @override(ContainerRegistry)
     def _isMetadataValid(self, metadata: Optional[Dict[str, Any]]) -> bool:
         """Check if the metadata for a container is okay before adding it.
@@ -411,7 +439,8 @@ class CuraContainerRegistry(ContainerRegistry):
         if quality_type != empty_quality_container.getMetaDataEntry("quality_type") and quality_type not in quality_group_dict:
             return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type)
 
-        ContainerRegistry.getInstance().addContainer(profile)
+        if not self.addContainer(profile):
+            return catalog.i18nc("@info:status", "Unable to add the profile.")
 
         return None
 

cura/Settings/ExtruderManager.py

@@ -289,7 +289,7 @@ class ExtruderManager(QObject):
             return global_stack.getProperty("adhesion_extruder_nr", "value")
 
         # No adhesion? Well maybe there is still support brim.
-        if (global_stack.getProperty("support_enable", "value") or global_stack.getProperty("support_tree_enable", "value")) and global_stack.getProperty("support_brim_enable", "value"):
+        if (global_stack.getProperty("support_enable", "value") or global_stack.getProperty("support_structure", "value") == "tree") and global_stack.getProperty("support_brim_enable", "value"):
             return global_stack.getProperty("support_infill_extruder_nr", "value")
 
         # REALLY no adhesion? Use the first used extruder.

cura/UI/PrintInformation.py

@@ -202,7 +202,11 @@ class PrintInformation(QObject):
         self._material_costs[build_plate_number] = []
         self._material_names[build_plate_number] = []
 
-        material_preference_values = json.loads(self._application.getInstance().getPreferences().getValue("cura/material_settings"))
+        try:
+            material_preference_values = json.loads(self._application.getInstance().getPreferences().getValue("cura/material_settings"))
+        except json.JSONDecodeError:
+            Logger.warning("Material preference values are corrupt. Will revert to defaults!")
+            material_preference_values = {}
 
         for index, extruder_stack in enumerate(global_stack.extruderList):
             if index >= len(self._material_amounts):

cura/XRayPass.py

@@ -29,7 +29,7 @@ class XRayPass(RenderPass):
         batch = RenderBatch(self._shader, type = RenderBatch.RenderType.NoType, backface_cull = False, blend_mode = RenderBatch.BlendMode.Additive)
         for node in DepthFirstIterator(self._scene.getRoot()):
             if isinstance(node, CuraSceneNode) and node.getMeshData() and node.isVisible():
-                batch.addItem(node.getWorldTransformation(copy = False), node.getMeshData())
+                batch.addItem(node.getWorldTransformation(copy = False), node.getMeshData(), normal_transformation=node.getCachedNormalMatrix())
 
         self.bind()
 

cura_app.py

@@ -39,7 +39,7 @@ except ImportError:
 parser = argparse.ArgumentParser(prog = "cura",
                                  add_help = False)
 parser.add_argument("--debug",
-                    action="store_true",
+                    action = "store_true",
                     default = False,
                     help = "Turn on the debug mode by setting this option."
                     )
@@ -49,7 +49,7 @@ known_args = vars(parser.parse_known_args()[0])
 if with_sentry_sdk:
     sentry_env = "unknown"  # Start off with a "IDK"
     if hasattr(sys, "frozen"):
-        sentry_env = "production"  # A frozen build has the posibility to be a "real" distribution.
+        sentry_env = "production"  # A frozen build has the possibility to be a "real" distribution.
 
     if ApplicationMetadata.CuraVersion == "master":
         sentry_env = "development"  # Master is always a development version.

plugins/3MFReader/ThreeMFReader.py

@@ -3,7 +3,7 @@
 
 import os.path
 import zipfile
-from typing import List, Optional, Union, TYPE_CHECKING
+from typing import List, Optional, Union, TYPE_CHECKING, cast
 
 import Savitar
 import numpy
@@ -169,8 +169,16 @@ class ThreeMFReader(MeshReader):
                 setting_container.setProperty(key, "value", setting_value)
 
         if len(um_node.getChildren()) > 0 and um_node.getMeshData() is None:
-            group_decorator = GroupDecorator()
+            if len(um_node.getAllChildren()) == 1:
-            um_node.addDecorator(group_decorator)
+                # We don't want groups of one, so move the node up one "level"
+                child_node = um_node.getChildren()[0]
+                parent_transformation = um_node.getLocalTransformation()
+                child_transformation = child_node.getLocalTransformation()
+                child_node.setTransformation(parent_transformation.multiply(child_transformation))
+                um_node = cast(CuraSceneNode, um_node.getChildren()[0])
+            else:
+                group_decorator = GroupDecorator()
+                um_node.addDecorator(group_decorator)
         um_node.setSelectable(True)
         if um_node.getMeshData():
             # Assuming that all nodes with mesh data are printable objects
@@ -192,8 +200,8 @@ class ThreeMFReader(MeshReader):
                 um_node = self._convertSavitarNodeToUMNode(node, file_name)
                 if um_node is None:
                     continue
-                # compensate for original center position, if object(s) is/are not around its zero position
 
+                # compensate for original center position, if object(s) is/are not around its zero position
                 transform_matrix = Matrix()
                 mesh_data = um_node.getMeshData()
                 if mesh_data is not None:

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -5,7 +5,7 @@ from configparser import ConfigParser
 import zipfile
 import os
 import json
-from typing import cast, Dict, List, Optional, Tuple, Any
+from typing import cast, Dict, List, Optional, Tuple, Any, Set
 
 import xml.etree.ElementTree as ET
 
@@ -41,6 +41,18 @@ from .WorkspaceDialog import WorkspaceDialog
 i18n_catalog = i18nCatalog("cura")
 
 
+_ignored_machine_network_metadata = {
+    "um_cloud_cluster_id",
+    "um_network_key",
+    "um_linked_to_account",
+    "host_guid",
+    "removal_warning",
+    "group_name",
+    "group_size",
+    "connection_type"
+}  # type: Set[str]
+
+
 class ContainerInfo:
     def __init__(self, file_name: Optional[str], serialized: Optional[str], parser: Optional[ConfigParser]) -> None:
         self.file_name = file_name
@@ -248,7 +260,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         if machine_definition_container_count != 1:
             return WorkspaceReader.PreReadResult.failed  # Not a workspace file but ordinary 3MF.
 
-        material_labels = []
+        material_ids_to_names_map = {}
         material_conflict = False
         xml_material_profile = self._getXmlProfileClass()
         reverse_material_id_dict = {}
@@ -264,7 +276,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 reverse_map = {metadata["id"]: container_id for metadata in metadata_list}
                 reverse_material_id_dict.update(reverse_map)
 
-                material_labels.append(self._getMaterialLabelFromSerialized(serialized))
+                material_ids_to_names_map[container_id] = self._getMaterialLabelFromSerialized(serialized)
                 if self._container_registry.findContainersMetadata(id = container_id): #This material already exists.
                     containers_found_dict["material"] = True
                     if not self._container_registry.isReadOnly(container_id):  # Only non readonly materials can be in conflict
@@ -431,6 +443,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         QCoreApplication.processEvents()  # Ensure that the GUI does not freeze.
         Job.yieldThread()
 
+        materials_in_extruders_dict = {}  # Which material is in which extruder
+
         # if the global stack is found, we check if there are conflicts in the extruder stacks
         for extruder_stack_file in extruder_stack_files:
             serialized = archive.open(extruder_stack_file).read().decode("utf-8")
@@ -456,6 +470,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
             if material_id not in ("empty", "empty_material"):
                 root_material_id = reverse_material_id_dict[material_id]
                 extruder_info.root_material_id = root_material_id
+                materials_in_extruders_dict[position] = material_ids_to_names_map[reverse_material_id_dict[material_id]]
 
             definition_changes_id = parser["containers"][str(_ContainerIndexes.DefinitionChanges)]
             if definition_changes_id not in ("empty", "empty_definition_changes"):
@@ -471,7 +486,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 extruder_info.intent_info = instance_container_info_dict[intent_id]
 
             if not machine_conflict and containers_found_dict["machine"]:
-                if int(position) >= len(global_stack.extrurderList):
+                if int(position) >= len(global_stack.extruderList):
                     continue
 
                 existing_extruder_stack = global_stack.extruderList[int(position)]
@@ -484,6 +499,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                         machine_conflict = True
                         break
 
+        # Now we know which material is in which extruder. Let's use that to sort the material_labels according to
+        # their extruder position
+        material_labels = [material_name for pos, material_name in sorted(materials_in_extruders_dict.items())]
+
         num_visible_settings = 0
         try:
             temp_preferences = Preferences()
@@ -822,7 +841,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                         try:
                             extruder_stack = global_stack.extruderList[int(position)]
                         except IndexError:
-                            pass
+                            continue
                         intent_category = quality_changes_intent_category_per_extruder[position]
                     container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack)
                     container_info.container = container
@@ -887,7 +906,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                     try:
                         extruder_stack = global_stack.extruderList[int(position)]
                     except IndexError:
-                        extruder_stack = None
+                        continue
                     intent_category = quality_changes_intent_category_per_extruder[position]
                     container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack)
                     container_info.container = container
@@ -1069,7 +1088,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
         # Set metadata fields that are missing from the global stack
         for key, value in self._machine_info.metadata_dict.items():
-            global_stack.setMetaDataEntry(key, value)
+            if key not in _ignored_machine_network_metadata:
+                global_stack.setMetaDataEntry(key, value)
 
     def _updateActiveMachine(self, global_stack):
         # Actually change the active machine.
@@ -1080,7 +1100,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
         # Set metadata fields that are missing from the global stack
         for key, value in self._machine_info.metadata_dict.items():
-            if key not in global_stack.getMetaData():
+            if key not in global_stack.getMetaData() and key not in _ignored_machine_network_metadata:
                 global_stack.setMetaDataEntry(key, value)
 
         if self._quality_changes_to_apply:

plugins/3MFWriter/ThreeMFWorkspaceWriter.py

@@ -63,7 +63,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
         # Write preferences to archive
         original_preferences = Application.getInstance().getPreferences() #Copy only the preferences that we use to the workspace.
         temp_preferences = Preferences()
-        for preference in {"general/visible_settings", "cura/active_mode", "cura/categories_expanded"}:
+        for preference in {"general/visible_settings", "cura/active_mode", "cura/categories_expanded", "metadata/setting_version"}:
             temp_preferences.addPreference(preference, None)
             temp_preferences.setValue(preference, original_preferences.getValue(preference))
         preferences_string = StringIO()
@@ -127,15 +127,29 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
 
         file_name = "Cura/%s.%s" % (container.getId(), file_suffix)
 
-        if file_name in archive.namelist():
+        try:
-            return  # File was already saved, no need to do it again. Uranium guarantees unique ID's, so this should hold.
+            if file_name in archive.namelist():
+                return  # File was already saved, no need to do it again. Uranium guarantees unique ID's, so this should hold.
 
-        file_in_archive = zipfile.ZipInfo(file_name)
+            file_in_archive = zipfile.ZipInfo(file_name)
-        # For some reason we have to set the compress type of each file as well (it doesn't keep the type of the entire archive)
+            # For some reason we have to set the compress type of each file as well (it doesn't keep the type of the entire archive)
-        file_in_archive.compress_type = zipfile.ZIP_DEFLATED
+            file_in_archive.compress_type = zipfile.ZIP_DEFLATED
 
-        # Do not include the network authentication keys
+            # Do not include the network authentication keys
-        ignore_keys = {"network_authentication_id", "network_authentication_key", "octoprint_api_key"}
+            ignore_keys = {
-        serialized_data = container.serialize(ignored_metadata_keys = ignore_keys)
+                "um_cloud_cluster_id",
+                "um_network_key",
+                "um_linked_to_account",
+                "removal_warning",
+                "host_guid",
+                "group_name",
+                "group_size",
+                "connection_type",
+                "octoprint_api_key"
+            }
+            serialized_data = container.serialize(ignored_metadata_keys = ignore_keys)
 
-        archive.writestr(file_in_archive, serialized_data)
+            archive.writestr(file_in_archive, serialized_data)
+        except (FileNotFoundError, EnvironmentError):
+            Logger.error("File became inaccessible while writing to it: {archive_filename}".format(archive_filename = archive.fp.name))
+            return

plugins/GCodeGzReader/GCodeGzReader.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import gzip
@@ -19,7 +19,7 @@ class GCodeGzReader(MeshReader):
         MimeTypeDatabase.addMimeType(
             MimeType(
                 name = "application/x-cura-compressed-gcode-file",
-                comment = "Cura Compressed GCode File",
+                comment = "Cura Compressed G-code File",
                 suffixes = ["gcode.gz"]
             )
         )

plugins/GCodeProfileReader/GCodeProfileReader.py

@@ -1,7 +1,7 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-import re #Regular expressions for parsing escape characters in the settings.
+import re  # Regular expressions for parsing escape characters in the settings.
 import json
 from typing import Optional
 
@@ -9,9 +9,10 @@ from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Logger import Logger
 from UM.i18n import i18nCatalog
+from cura.ReaderWriters.ProfileReader import ProfileReader, NoProfileException
+
 catalog = i18nCatalog("cura")
 
-from cura.ReaderWriters.ProfileReader import ProfileReader, NoProfileException
 
 class GCodeProfileReader(ProfileReader):
     """A class that reads profile data from g-code files.
@@ -29,9 +30,9 @@ class GCodeProfileReader(ProfileReader):
     """
 
     escape_characters = {
-        re.escape("\\\\"): "\\", #The escape character.
+        re.escape("\\\\"): "\\",  # The escape character.
-        re.escape("\\n"): "\n",  #Newlines. They break off the comment.
+        re.escape("\\n"): "\n",   # Newlines. They break off the comment.
-        re.escape("\\r"): "\r"   #Carriage return. Windows users may need this for visualisation in their editors.
+        re.escape("\\r"): "\r"    # Carriage return. Windows users may need this for visualisation in their editors.
     }
     """Dictionary that defines how characters are escaped when embedded in
 
@@ -41,11 +42,6 @@ class GCodeProfileReader(ProfileReader):
     not.
     """
 
-    def __init__(self):
-        """Initialises the g-code reader as a profile reader."""
-
-        super().__init__()
-
     def read(self, file_name):
         """Reads a g-code file, loading the profile from it.
 
@@ -54,6 +50,7 @@ class GCodeProfileReader(ProfileReader):
             specified file was no g-code or contained no parsable profile,
             None  is returned.
         """
+        Logger.log("i", "Attempting to read a profile from the g-code")
 
         if file_name.split(".")[-1] != "gcode":
             return None
@@ -70,7 +67,7 @@ class GCodeProfileReader(ProfileReader):
                 for line in f:
                     if line.startswith(prefix):
                         # Remove the prefix and the newline from the line and add it to the rest.
-                        serialized += line[prefix_length : -1]
+                        serialized += line[prefix_length: -1]
         except IOError as e:
             Logger.log("e", "Unable to open file %s for reading: %s", file_name, str(e))
             return None
@@ -79,10 +76,10 @@ class GCodeProfileReader(ProfileReader):
         serialized = serialized.strip()
 
         if not serialized:
-            Logger.log("i", "No custom profile to import from this g-code: %s", file_name)
+            Logger.log("w", "No custom profile to import from this g-code: %s", file_name)
             raise NoProfileException()
 
-        # serialized data can be invalid JSON
+        # Serialized data can be invalid JSON
         try:
             json_data = json.loads(serialized)
         except Exception as e:

plugins/GCodeReader/FlavorParser.py

@@ -312,7 +312,7 @@ class FlavorParser:
     # F5, that gcode SceneNode will be removed because it doesn't have a file to be reloaded from.
     #
     def processGCodeStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]:
-        Logger.log("d", "Preparing to load GCode")
+        Logger.log("d", "Preparing to load g-code")
         self._cancelled = False
         # We obtain the filament diameter from the selected extruder to calculate line widths
         global_stack = CuraApplication.getInstance().getGlobalContainerStack()
@@ -352,7 +352,7 @@ class FlavorParser:
         self._message.setProgress(0)
         self._message.show()
 
-        Logger.log("d", "Parsing Gcode...")
+        Logger.log("d", "Parsing g-code...")
 
         current_position = Position(0, 0, 0, 0, [0])
         current_path = [] #type: List[List[float]]
@@ -363,7 +363,7 @@ class FlavorParser:
 
         for line in stream.split("\n"):
             if self._cancelled:
-                Logger.log("d", "Parsing Gcode file cancelled")
+                Logger.log("d", "Parsing g-code file cancelled.")
                 return None
             current_line += 1
 
@@ -482,7 +482,7 @@ class FlavorParser:
         gcode_dict = {active_build_plate_id: gcode_list}
         CuraApplication.getInstance().getController().getScene().gcode_dict = gcode_dict #type: ignore #Because gcode_dict is generated dynamically.
 
-        Logger.log("d", "Finished parsing Gcode")
+        Logger.log("d", "Finished parsing g-code.")
         self._message.hide()
 
         if self._layer_number == 0:
@@ -493,7 +493,7 @@ class FlavorParser:
             machine_depth = global_stack.getProperty("machine_depth", "value")
             scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2))
 
-        Logger.log("d", "GCode loading finished")
+        Logger.log("d", "G-code loading finished.")
 
         if CuraApplication.getInstance().getPreferences().getValue("gcodereader/show_caution"):
             caution_message = Message(catalog.i18nc(

plugins/GCodeReader/GCodeReader.py

@@ -1,5 +1,5 @@
 # Copyright (c) 2017 Aleph Objects, Inc.
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from typing import Optional, Union, List, TYPE_CHECKING
@@ -32,7 +32,7 @@ class GCodeReader(MeshReader):
         MimeTypeDatabase.addMimeType(
             MimeType(
                 name = "application/x-cura-gcode-file",
-                comment = "Cura GCode File",
+                comment = "Cura G-code File",
                 suffixes = ["gcode"]
             )
         )

plugins/GCodeWriter/GCodeWriter.py

@@ -143,6 +143,7 @@ class GCodeWriter(MeshWriter):
             if stack.getMetaDataEntry("position") is not None:  # For extruder stacks, the quality changes should include an intent category.
                 container_with_profile.setMetaDataEntry("intent_category", stack.intent.getMetaDataEntry("intent_category", "default"))
             container_with_profile.setDefinition(machine_definition_id_for_quality)
+            container_with_profile.setMetaDataEntry("setting_version", stack.quality.getMetaDataEntry("setting_version"))
 
         flat_global_container = self._createFlattenedContainerInstance(stack.userChanges, container_with_profile)
         # If the quality changes is not set, we need to set type manually
@@ -171,6 +172,7 @@ class GCodeWriter(MeshWriter):
                 extruder_quality.setMetaDataEntry("type", "quality_changes")
                 extruder_quality.setMetaDataEntry("quality_type", quality_type)
                 extruder_quality.setDefinition(machine_definition_id_for_quality)
+                extruder_quality.setMetaDataEntry("setting_version", stack.quality.getMetaDataEntry("setting_version"))
 
             flat_extruder_quality = self._createFlattenedContainerInstance(extruder.userChanges, extruder_quality)
             # If the quality changes is not set, we need to set type manually

plugins/ImageReader/ImageReaderUI.py

@@ -172,7 +172,7 @@ class ImageReaderUI(QObject):
 
     @pyqtSlot(int)
     def onColorModelChanged(self, value):
-        self.use_transparency_model = (value == 0)
+        self.use_transparency_model = (value == 1)
 
     @pyqtSlot(int)
     def onTransmittanceChanged(self, value):

plugins/MonitorStage/MonitorMain.qml

@@ -136,7 +136,7 @@ Rectangle
             {
                 id: externalLinkIcon
                 anchors.verticalCenter: parent.verticalCenter
-                color: UM.Theme.getColor("monitor_text_link")
+                color: UM.Theme.getColor("text_link")
                 source: UM.Theme.getIcon("external_link")
                 width: UM.Theme.getSize("monitor_external_link_icon").width
                 height: UM.Theme.getSize("monitor_external_link_icon").height
@@ -150,9 +150,8 @@ Rectangle
                     leftMargin: UM.Theme.getSize("narrow_margin").width
                     verticalCenter: externalLinkIcon.verticalCenter
                 }
-                color: UM.Theme.getColor("monitor_text_link")
+                color: UM.Theme.getColor("text_link")
                 font: UM.Theme.getFont("medium")
-                linkColor: UM.Theme.getColor("monitor_text_link")
                 text: catalog.i18nc("@label link to technical assistance", "View user manuals online")
                 renderType: Text.NativeRendering
             }

plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py

@@ -0,0 +1,130 @@
+# Cura PostProcessingPlugin
+# Author:   Mathias Lyngklip Kjeldgaard, Alexander Gee
+# Date:     July 31, 2019
+# Modified: May 22, 2020
+
+# Description:  This plugin displays progress on the LCD. It can output the estimated time remaining and the completion percentage.
+
+from ..Script import Script
+
+import re
+import datetime
+
+class DisplayProgressOnLCD(Script):
+
+    def __init__(self):
+        super().__init__()
+
+    def getSettingDataString(self):
+        return """{
+            "name": "Display Progress On LCD",
+            "key": "DisplayProgressOnLCD",
+            "metadata": {},
+            "version": 2,
+            "settings":
+            {
+                "time_remaining":
+                {
+                    "label": "Time Remaining",
+                    "description": "When enabled, write Time Left: HHMMSS on the display using M117. This is updated every layer.",
+                    "type": "bool",
+                    "default_value": false
+                },
+                "percentage":
+                {
+                    "label": "Percentage",
+                    "description": "When enabled, set the completion bar percentage on the LCD using Marlin's M73 command.",
+                    "type": "bool",
+                    "default_value": false
+                }
+            }
+        }"""
+
+    # Get the time value from a line as a float.
+    # Example line ;TIME_ELAPSED:1234.6789 or ;TIME:1337
+    def getTimeValue(self, line):
+        list_split = re.split(":", line)  # Split at ":" so we can get the numerical value
+        return float(list_split[1])  # Convert the numerical portion to a float
+
+    def outputTime(self, lines, line_index, time_left):
+        # Do some math to get the time left in seconds into the right format. (HH,MM,SS)
+        m, s = divmod(time_left, 60)
+        h, m = divmod(m, 60)
+        # Create the string
+        current_time_string = "{:d}h{:02d}m{:02d}s".format(int(h), int(m), int(s))
+        # And now insert that into the GCODE
+        lines.insert(line_index, "M117 Time Left {}".format(current_time_string))
+
+    def execute(self, data):
+        output_time = self.getSettingValueByKey("time_remaining")
+        output_percentage = self.getSettingValueByKey("percentage")
+        line_set = {}
+        if output_percentage or output_time:
+            total_time = -1
+            previous_layer_end_percentage = 0
+            for layer in data:
+                layer_index = data.index(layer)
+                lines = layer.split("\n")
+
+                for line in lines:
+                    if line.startswith(";TIME:") and total_time == -1:
+                        # This line represents the total time required to print the gcode
+                        total_time = self.getTimeValue(line)
+                        line_index = lines.index(line)
+
+                        if output_time:
+                            self.outputTime(lines, line_index, total_time)
+                        if output_percentage:
+                            # Emit 0 percent to sure Marlin knows we are overriding the completion percentage
+                            lines.insert(line_index, "M73 P0")
+
+                    elif line.startswith(";TIME_ELAPSED:"):
+                        # We've found one of the time elapsed values which are added at the end of layers
+                        
+                        # If we have seen this line before then skip processing it. We can see lines multiple times because we are adding
+                        # intermediate percentages before the line being processed. This can cause the current line to shift back and be
+                        # encountered more than once
+                        if line in line_set:
+                            continue
+                        line_set[line] = True
+
+                        # If total_time was not already found then noop
+                        if total_time == -1:
+                            continue
+
+                        current_time = self.getTimeValue(line)
+                        line_index = lines.index(line)
+                        
+                        if output_time:
+                            # Here we calculate remaining time
+                            self.outputTime(lines, line_index, total_time - current_time)
+
+                        if output_percentage:
+                            # Calculate percentage value this layer ends at
+                            layer_end_percentage = int((current_time / total_time) * 100)
+
+                            # Figure out how many percent of the total time is spent in this layer
+                            layer_percentage_delta = layer_end_percentage - previous_layer_end_percentage
+                            
+                            # If this layer represents less than 1 percent then we don't need to emit anything, continue to the next layer
+                            if layer_percentage_delta != 0:
+                                # Grab the index of the current line and figure out how many lines represent one percent
+                                step = line_index / layer_percentage_delta
+
+                                for percentage in range(1, layer_percentage_delta + 1):
+                                    # We add the percentage value here as while processing prior lines we will have inserted
+                                    # percentage lines before the current one. Failing to do this will upset the spacing
+                                    percentage_line_index = int((percentage * step) + percentage)
+
+                                    # Due to integer truncation of the total time value in the gcode the percentage we 
+                                    # calculate may slightly exceed 100, as that is not valid we cap the value here
+                                    output = min(percentage + previous_layer_end_percentage, 100)
+                                    
+                                    # Now insert the sanitized percentage into the GCODE
+                                    lines.insert(percentage_line_index, "M73 P{}".format(output))
+
+                                previous_layer_end_percentage = layer_end_percentage
+
+                # Join up the lines for this layer again and store them in the data array
+                data[layer_index] = "\n".join(lines)
+        return data

plugins/PostProcessingPlugin/scripts/DisplayRemainingTimeOnLCD.py

@@ -1,94 +0,0 @@
-# Cura PostProcessingPlugin
-# Author:   Mathias Lyngklip Kjeldgaard
-# Date:     July 31, 2019
-# Modified: November 26, 2019
-
-# Description:  This plugin displayes the remaining time on the LCD of the printer
-#               using the estimated print-time generated by Cura.
-
-
-
-
-from ..Script import Script
-
-import re
-import datetime
-
-
-class DisplayRemainingTimeOnLCD(Script):
-
-    def __init__(self):
-        super().__init__()
-
-
-    def getSettingDataString(self):
-        return """{
-            "name":"Display Remaining Time on LCD",
-            "key":"DisplayRemainingTimeOnLCD",
-            "metadata": {},
-            "version": 2,
-            "settings":
-            {
-                "TurnOn":
-                {
-                    "label": "Enable",
-                    "description": "When enabled, It will write Time Left: HHMMSS on the display. This is updated every layer.",
-                    "type": "bool",
-                    "default_value": false
-                }
-            }
-        }"""
-
-    def execute(self, data):
-        if self.getSettingValueByKey("TurnOn"):
-            total_time = 0
-            total_time_string = ""
-            for layer in data:
-                layer_index = data.index(layer)
-                lines = layer.split("\n")
-                for line in lines:
-                    if line.startswith(";TIME:"):
-                        # At this point, we have found a line in the GCODE with ";TIME:"
-                        # which is the indication of total_time. Looks like: ";TIME:1337", where
-                        # 1337 is the total print time in seconds.
-                        line_index = lines.index(line)          # We take a hold of that line
-                        split_string = re.split(":", line)      # Then we split it, so we can get the number
-
-                        string_with_numbers = "{}".format(split_string[1])      # Here we insert that number from the
-                                                                                # list into a string.
-                        total_time = int(string_with_numbers)                   # Only to contert it to a int.
-
-                        m, s = divmod(total_time, 60)    # Math to calculate
-                        h, m = divmod(m, 60)             # hours, minutes and seconds.
-                        total_time_string = "{:d}h{:02d}m{:02d}s".format(h, m, s)           # Now we put it into the string
-                        lines[line_index] = "M117 Time Left {}".format(total_time_string)   # And print that string instead of the original one
-
-
-
-
-                    elif line.startswith(";TIME_ELAPSED:"):
-
-                        # As we didnt find the total time (";TIME:"), we have found a elapsed time mark
-                        # This time represents the time the printer have printed. So with some math;
-                        # totalTime - printTime = RemainingTime.
-                        line_index = lines.index(line)          # We get a hold of the line
-                        list_split = re.split(":", line)        # Again, we split at ":" so we can get the number
-                        string_with_numbers = "{}".format(list_split[1])   # Then we put that number from the list, into a string
-
-                        current_time = float(string_with_numbers)       # This time we convert to a float, as the line looks something like:
-                                                                        # ;TIME_ELAPSED:1234.6789
-                                                                        # which is total time in seconds
-
-                        time_left = total_time - current_time   # Here we calculate remaining time
-                        m1, s1 = divmod(time_left, 60)          # And some math to get the total time in seconds into
-                        h1, m1 = divmod(m1, 60)                 # the right format. (HH,MM,SS)
-                        current_time_string = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1))   # Here we create the string holding our time
-                        lines[line_index] = "M117 Time Left {}".format(current_time_string)           # And now insert that into the GCODE
-
-
-                # Here we are OUT of the second for-loop
-                # Which means we have found and replaces all the occurences.
-                # Which also means we are ready to join the lines for that section of the GCODE file.
-                final_lines = "\n".join(lines)
-                data[layer_index] = final_lines
-        return data

plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
 # Created by Wayne Porter
 
 from ..Script import Script
@@ -24,8 +26,8 @@ class InsertAtLayerChange(Script):
                 },
                 "gcode_to_add":
                 {
-                    "label": "GCODE to insert.",
+                    "label": "G-code to insert.",
-                    "description": "GCODE to add before or after layer change.",
+                    "description": "G-code to add before or after layer change.",
                     "type": "str",
                     "default_value": ""
                 }

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from ..Script import Script
@@ -182,7 +182,22 @@ class PauseAtHeight(Script):
                         "Repetier": "Repetier"
                     },
                     "default_value": "RepRap (Marlin/Sprinter)",
-                    "enabled": false
+                    "enabled": false,
+                    "default_value": ""
+                },
+                "custom_gcode_before_pause":
+                {
+                    "label": "G-code Before Pause",
+                    "description": "Any custom g-code to run before the pause, for example, M300 S440 P200 to beep.",
+                    "type": "str",
+                    "default_value": ""
+                },
+                "custom_gcode_after_pause":
+                {
+                    "label": "G-code After Pause",
+                    "description": "Any custom g-code to run after the pause, for example, M300 S440 P200 to beep.",
+                    "type": "str",
+                    "default_value": ""
                 }
             }
         }"""
@@ -235,6 +250,8 @@ class PauseAtHeight(Script):
         control_temperatures = Application.getInstance().getGlobalContainerStack().getProperty("machine_nozzle_temp_enabled", "value")
         initial_layer_height = Application.getInstance().getGlobalContainerStack().getProperty("layer_height_0", "value")
         display_text = self.getSettingValueByKey("display_text")
+        gcode_before = self.getSettingValueByKey("custom_gcode_before_pause")
+        gcode_after = self.getSettingValueByKey("custom_gcode_after_pause")
 
         pause_method = self.getSettingValueByKey("pause_method")
         pause_command = {
@@ -411,9 +428,17 @@ class PauseAtHeight(Script):
                 if disarm_timeout > 0:
                     prepend_gcode += self.putValue(M = 18, S = disarm_timeout) + " ; Set the disarm timeout\n"
 
+                # Set a custom GCODE section before pause
+                if gcode_before:
+                    prepend_gcode += gcode_before + "\n"
+
                 # Wait till the user continues printing
                 prepend_gcode += pause_command + " ; Do the actual pause\n"
 
+                # Set a custom GCODE section before pause
+                if gcode_after:
+                    prepend_gcode += gcode_after + "\n"
+
                 if pause_method == "repetier":
                     #Push the filament back,
                     if retraction_amount != 0:

plugins/PostProcessingPlugin/scripts/TimeLapse.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
 # Created by Wayne Porter
 
 from ..Script import Script
@@ -18,7 +20,7 @@ class TimeLapse(Script):
                 "trigger_command":
                 {
                     "label": "Trigger camera command",
-                    "description": "Gcode command used to trigger camera.",
+                    "description": "G-code command used to trigger camera.",
                     "type": "str",
                     "default_value": "M240"
                 },

plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py

@@ -79,7 +79,7 @@ class RemovableDriveOutputDevice(OutputDevice):
 
         if extension:  # Not empty string.
             extension = "." + extension
-        file_name = os.path.join(self.getId(), os.path.splitext(file_name)[0] + extension)
+        file_name = os.path.join(self.getId(), file_name + extension)
 
         try:
             Logger.log("d", "Writing to %s", file_name)

plugins/SolidView/SolidView.py

@@ -244,7 +244,7 @@ class SolidView(View):
                     else:
                         renderer.queueNode(node, shader = self._non_printing_shader, transparent = True)
                 elif getattr(node, "_outside_buildarea", False):
-                    disabled_batch.addItem(node.getWorldTransformation(copy = False), node.getMeshData())
+                    disabled_batch.addItem(node.getWorldTransformation(copy = False), node.getMeshData(), normal_transformation = node.getCachedNormalMatrix())
                 elif per_mesh_stack and node.callDecoration("isSupportMesh"):
                     # Render support meshes with a vertical stripe that is darker
                     shade_factor = 0.6
@@ -256,7 +256,7 @@ class SolidView(View):
                     ]
                     renderer.queueNode(node, shader = self._support_mesh_shader, uniforms = uniforms)
                 else:
-                    normal_object_batch.addItem(node.getWorldTransformation(copy=False), node.getMeshData(), uniforms=uniforms)
+                    normal_object_batch.addItem(node.getWorldTransformation(copy=False), node.getMeshData(), uniforms=uniforms, normal_transformation = node.getCachedNormalMatrix())
             if node.callDecoration("isGroup") and Selection.isSelected(node):
                 renderer.queueNode(scene.getRoot(), mesh = node.getBoundingBoxMesh(), mode = RenderBatch.RenderMode.LineLoop)
 

plugins/Toolbox/resources/qml/components/RatingWidget.qml

@@ -1,106 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Controls 2.1
-import UM 1.0 as UM
-import Cura 1.1 as Cura
-Item
-{
-    id: ratingWidget
-
-    property real rating: 0
-    property int indexHovered: -1
-    property string packageId: ""
-
-    property int userRating: 0
-    property bool canRate: false
-
-    signal rated(int rating)
-
-    width: contentRow.width
-    height: contentRow.height
-    MouseArea
-    {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: ratingWidget.canRate
-        acceptedButtons: Qt.NoButton
-        onExited:
-        {
-            if(ratingWidget.canRate)
-            {
-                ratingWidget.indexHovered = -1
-            }
-        }
-
-        Row
-        {
-            id: contentRow
-            height: childrenRect.height
-            Repeater
-            {
-                model: 5 // We need to get 5 stars
-                Button
-                {
-                    id: control
-                    hoverEnabled: true
-                    onHoveredChanged:
-                    {
-                        if(hovered && ratingWidget.canRate)
-                        {
-                            indexHovered = index
-                        }
-                    }
-
-                    ToolTip.visible: control.hovered  && !ratingWidget.canRate
-                    ToolTip.text: !Cura.API.account.isLoggedIn ? catalog.i18nc("@label", "You need to login first before you can rate"): catalog.i18nc("@label", "You need to install the package before you can rate")
-
-                    property bool isStarFilled:
-                    {
-                        // If the entire widget is hovered, override the actual rating.
-                        if(ratingWidget.indexHovered >= 0)
-                        {
-                            return indexHovered >= index
-                        }
-
-                        if(ratingWidget.userRating > 0)
-                        {
-                            return userRating >= index +1
-                        }
-
-                        return rating >= index + 1
-                    }
-
-                    contentItem: Item {}
-                    height: UM.Theme.getSize("rating_star").height
-                    width: UM.Theme.getSize("rating_star").width
-                    background: UM.RecolorImage
-                    {
-                        source: UM.Theme.getIcon(control.isStarFilled ? "star_filled" : "star_empty")
-                        sourceSize.width: width
-                        sourceSize.height: height
-
-                        // Unfilled stars should always have the default color. Only filled stars should change on hover
-                        color:
-                        {
-                            if(!ratingWidget.canRate)
-                            {
-                                return UM.Theme.getColor("rating_star")
-                            }
-                            if((ratingWidget.indexHovered >= 0 || ratingWidget.userRating > 0) && isStarFilled)
-                            {
-                                return UM.Theme.getColor("primary")
-                            }
-                            return UM.Theme.getColor("rating_star")
-                        }
-                    }
-                    onClicked:
-                    {
-                        if(ratingWidget.canRate)
-                        {
-                            rated(index + 1)  // Notify anyone who cares about this.
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

plugins/Toolbox/resources/qml/components/SmallRatingWidget.qml

@@ -1,36 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.4
-import UM 1.1 as UM
-import Cura 1.1 as Cura
-
-Row
-{
-    id: rating
-    height: UM.Theme.getSize("rating_star").height
-    visible: model.average_rating > 0 //Has a rating at all.
-    spacing: UM.Theme.getSize("thick_lining").width
-    width: starIcon.width + spacing + numRatingsLabel.width
-    UM.RecolorImage
-    {
-        id: starIcon
-        source: UM.Theme.getIcon("star_filled")
-        color: model.user_rating == 0  ? UM.Theme.getColor("rating_star") : UM.Theme.getColor("primary")
-        height: UM.Theme.getSize("rating_star").height
-        width: UM.Theme.getSize("rating_star").width
-        sourceSize.height: height
-        sourceSize.width: width
-    }
-
-    Label
-    {
-        id: numRatingsLabel
-        text: model.average_rating != undefined ? model.average_rating.toFixed(1) + " (" + model.num_ratings + " " + catalog.i18nc("@label", "ratings") + ")": ""
-        verticalAlignment: Text.AlignVCenter
-        height: starIcon.height
-        width: contentWidth
-        anchors.verticalCenter: starIcon.verticalCenter
-        color: starIcon.color
-        font: UM.Theme.getFont("default")
-        renderType: Text.NativeRendering
-    }
-}

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

@@ -117,19 +117,9 @@ Item
             color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("default")
             anchors.top: name.bottom
-            anchors.bottom: rating.top
+            anchors.bottom: parent.bottom
             verticalAlignment: Text.AlignVCenter
             maximumLineCount: 2
         }
-        SmallRatingWidget
-        {
-            id: rating
-            anchors
-            {
-                bottom: parent.bottom
-                left: parent.left
-                right: parent.right
-            }
-        }
     }
 }

plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml

@@ -24,7 +24,7 @@ Rectangle
             Label
             {
                 id: heading
-                text: catalog.i18nc("@label", "Featured")
+                text: catalog.i18nc("@label", "Premium")
                 width: contentWidth
                 height: contentHeight
                 color: UM.Theme.getColor("text_medium")

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

@@ -13,7 +13,7 @@ Rectangle
     property int installedPackages: toolbox.viewCategory == "material" ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0)
     id: tileBase
     width: UM.Theme.getSize("toolbox_thumbnail_large").width + (2 * UM.Theme.getSize("default_lining").width)
-    height: thumbnail.height + packageName.height + rating.height + UM.Theme.getSize("default_margin").width
+    height: thumbnail.height + packageName.height + UM.Theme.getSize("default_margin").width
     border.width: UM.Theme.getSize("default_lining").width
     border.color: UM.Theme.getColor("lining")
     color: UM.Theme.getColor("main_background")
@@ -67,13 +67,6 @@ Rectangle
         source: "../../images/installed_check.svg"
     }
 
-    SmallRatingWidget
-    {
-        id: rating
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
     Rectangle
     {
         id: bottomBorder

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

@@ -33,7 +33,7 @@ Item
             width: UM.Theme.getSize("toolbox_thumbnail_medium").width
             height: UM.Theme.getSize("toolbox_thumbnail_medium").height
             fillMode: Image.PreserveAspectFit
-            source: details.icon_url || "../../images/placeholder.svg"
+            source: details && details.icon_url ? details.icon_url : "../../images/placeholder.svg"
             mipmap: true
             anchors
             {
@@ -56,8 +56,9 @@ Item
                 rightMargin: UM.Theme.getSize("wide_margin").width
                 bottomMargin: UM.Theme.getSize("default_margin").height
             }
-            text: details.name || ""
+            text: details && details.name ? details.name : ""
             font: UM.Theme.getFont("large_bold")
+            color: UM.Theme.getColor("text_medium")
             wrapMode: Text.WordWrap
             width: parent.width
             height: UM.Theme.getSize("toolbox_property_label").height
@@ -66,8 +67,9 @@ Item
         Label
         {
             id: description
-            text: details.description || ""
+            text: details && details.description ? details.description : ""
             font: UM.Theme.getFont("default")
+            color: UM.Theme.getColor("text_medium")
             anchors
             {
                 top: title.bottom
@@ -121,7 +123,7 @@ Item
             {
                 text:
                 {
-                    if (details.website)
+                    if (details && details.website)
                     {
                         return "<a href=\"" + details.website + "\">" + details.website + "</a>"
                     }
@@ -140,7 +142,7 @@ Item
             {
                 text:
                 {
-                    if (details.email)
+                    if (details && details.email)
                     {
                         return "<a href=\"mailto:" + details.email + "\">" + details.email + "</a>"
                     }

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

@@ -72,14 +72,6 @@ Item
             renderType: Text.NativeRendering
         }
 
-        SmallRatingWidget
-        {
-            anchors.left: title.right
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
-            anchors.verticalCenter: title.verticalCenter
-            property var model: details
-        }
-
         Column
         {
             id: properties
@@ -93,14 +85,6 @@ Item
             width: childrenRect.width
             height: childrenRect.height
             Label
-            {
-                text: catalog.i18nc("@label", "Your rating") + ":"
-                visible: details.type == "plugin"
-                font: UM.Theme.getFont("default")
-                color: UM.Theme.getColor("text_medium")
-                renderType: Text.NativeRendering
-            }
-            Label
             {
                 text: catalog.i18nc("@label", "Version") + ":"
                 font: UM.Theme.getFont("default")
@@ -116,7 +100,7 @@ Item
             }
             Label
             {
-                text: catalog.i18nc("@label", "Author") + ":"
+                text: catalog.i18nc("@label", "Brand") + ":"
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text_medium")
                 renderType: Text.NativeRendering
@@ -141,48 +125,6 @@ Item
             }
             spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
             height: childrenRect.height
-            RatingWidget
-            {
-                id: rating
-                visible: details.type == "plugin"
-                packageId: details.id != undefined ? details.id: ""
-                userRating: details.user_rating != undefined ? details.user_rating: 0
-                canRate: toolbox.isInstalled(details.id) && Cura.API.account.isLoggedIn
-
-                onRated:
-                {
-                    toolbox.ratePackage(details.id, rating)
-                    // HACK: This is a far from optimal solution, but without major refactoring, this is the best we can
-                    // do. Since a rework of this is scheduled, it shouldn't live that long...
-                    var index = toolbox.pluginsAvailableModel.find("id", details.id)
-                    if(index != -1)
-                    {
-                        if(details.user_rating == 0)  // User never rated before.
-                        {
-                            toolbox.pluginsAvailableModel.setProperty(index, "num_ratings", details.num_ratings + 1)
-                        }
-
-                        toolbox.pluginsAvailableModel.setProperty(index, "user_rating", rating)
-
-
-                        // Hack; This is because the current selection is an outdated copy, so we need to re-copy it.
-                        base.selection = toolbox.pluginsAvailableModel.getItem(index)
-                        return
-                    }
-                    index = toolbox.pluginsShowcaseModel.find("id", details.id)
-                    if(index != -1)
-                    {
-                        if(details.user_rating == 0) // User never rated before.
-                        {
-                            toolbox.pluginsShowcaseModel.setProperty(index, "user_rating", rating)
-                        }
-                        toolbox.pluginsShowcaseModel.setProperty(index, "num_ratings", details.num_ratings + 1)
-
-                        // Hack; This is because the current selection is an outdated copy, so we need to re-copy it.
-                        base.selection = toolbox.pluginsShowcaseModel.getItem(index)
-                    }
-                }
-            }
             Label
             {
                 text: details === null ? "" : (details.version || catalog.i18nc("@label", "Unknown"))

plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml

@@ -4,6 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
+import UM 1.3 as UM
 
 Rectangle
 {
@@ -14,6 +15,7 @@ Rectangle
     Label
     {
         text: catalog.i18nc("@info", "Fetching packages...")
+        color: UM.Theme.getColor("text")
         anchors
         {
             centerIn: parent

plugins/Toolbox/src/CloudSync/CloudPackageChecker.py

@@ -95,21 +95,35 @@ class CloudPackageChecker(QObject):
         user_subscribed_packages = {plugin["package_id"] for plugin in subscribed_packages_payload}
         user_installed_packages = self._package_manager.getAllInstalledPackageIDs()
 
-        if user_subscribed_packages == self._last_notified_packages:
-            # already notified user about these
-            return
-
         # We need to re-evaluate the dismissed packages
         # (i.e. some package might got updated to the correct SDK version in the meantime,
         # hence remove them from the Dismissed Incompatible list)
         self._package_manager.reEvaluateDismissedPackages(subscribed_packages_payload, self._sdk_version)
         user_dismissed_packages = self._package_manager.getDismissedPackages()
         if user_dismissed_packages:
-            user_installed_packages += user_dismissed_packages
+            user_installed_packages.update(user_dismissed_packages)
 
         # We check if there are packages installed in Web Marketplace but not in Cura marketplace
         package_discrepancy = list(user_subscribed_packages.difference(user_installed_packages))
+
+        if user_subscribed_packages != self._last_notified_packages:
+            # scenario:
+            # 1. user subscribes to a package
+            # 2. dismisses the license/unsubscribes
+            # 3. subscribes to the same package again
+            # in this scenario we want to notify the user again. To capture that there was a change during
+            # step 2, we clear the last_notified after step 2. This way, the user will be notified after
+            # step 3 even though the list of packages for step 1 and 3 are equal
+            self._last_notified_packages = set()
+
         if package_discrepancy:
+            account = self._application.getCuraAPI().account
+            account.setUpdatePackagesAction(lambda: self._onSyncButtonClicked(None, None))
+
+            if user_subscribed_packages == self._last_notified_packages:
+                # already notified user about these
+                return
+
             Logger.log("d", "Discrepancy found between Cloud subscribed packages and Cura installed packages")
             self._model.addDiscrepancies(package_discrepancy)
             self._model.initialize(self._package_manager, subscribed_packages_payload)
@@ -131,7 +145,7 @@ class CloudPackageChecker(QObject):
         sync_message.addAction("sync",
                                name = self._i18n_catalog.i18nc("@action:button", "Sync"),
                                icon = "",
-                               description = "Sync your Cloud subscribed packages to your local environment.",
+                               description = "Sync your plugins and print profiles to Ultimaker Cura.",
                                button_align = Message.ActionButtonAlignment.ALIGN_RIGHT)
         sync_message.actionTriggered.connect(self._onSyncButtonClicked)
         sync_message.show()
@@ -144,7 +158,8 @@ class CloudPackageChecker(QObject):
             self._message.hide()
             self._message = None
 
-    def _onSyncButtonClicked(self, sync_message: Message, sync_message_action: str) -> None:
+    def _onSyncButtonClicked(self, sync_message: Optional[Message], sync_message_action: Optional[str]) -> None:
-        sync_message.hide()
+        if sync_message is not None:
+            sync_message.hide()
         self._hideSyncMessage()  # Should be the same message, but also sets _message to None
         self.discrepancies.emit(self._model)

plugins/Toolbox/src/CloudSync/DownloadPresenter.py

@@ -120,6 +120,10 @@ class DownloadPresenter:
             received += item["received"]
             total += item["total"]
 
+        if total == 0:  # Total download size is 0, or unknown, or there are no progress items at all.
+            self._progress_message.setProgress(100.0)
+            return
+
         self._progress_message.setProgress(100.0 * (received / total))  # [0 .. 100] %
 
     def _onError(self, package_id: str) -> None:

plugins/Toolbox/src/PackagesModel.py

@@ -45,9 +45,6 @@ class PackagesModel(ListModel):
         self.addRoleName(Qt.UserRole + 20, "links")
         self.addRoleName(Qt.UserRole + 21, "website")
         self.addRoleName(Qt.UserRole + 22, "login_required")
-        self.addRoleName(Qt.UserRole + 23, "average_rating")
-        self.addRoleName(Qt.UserRole + 24, "num_ratings")
-        self.addRoleName(Qt.UserRole + 25, "user_rating")
 
         # List of filters for queries. The result is the union of the each list of results.
         self._filter = {}  # type: Dict[str, str]
@@ -114,9 +111,6 @@ class PackagesModel(ListModel):
                 "links":                links_dict,
                 "website":              package["website"] if "website" in package else None,
                 "login_required":       "login-required" in package.get("tags", []),
-                "average_rating":       float(package.get("rating", {}).get("average", 0)),
-                "num_ratings":          package.get("rating", {}).get("count", 0),
-                "user_rating":          package.get("rating", {}).get("user_rating", 0)
             })
 
         # Filter on all the key-word arguments.

plugins/Toolbox/src/Toolbox.py

@@ -151,13 +151,6 @@ class Toolbox(QObject, Extension):
         self._package_used_materials = []  # type: List[Tuple[GlobalStack, str, str]]
         self._package_used_qualities = []  # type: List[Tuple[GlobalStack, str, str]]
 
-    @pyqtSlot(str, int)
-    def ratePackage(self, package_id: str, rating: int) -> None:
-        url = "{base_url}/packages/{package_id}/ratings".format(base_url = CloudApiModel.api_url, package_id = package_id)
-        data = "{\"data\": {\"cura_version\": \"%s\", \"rating\": %i}}" % (Version(self._application.getVersion()), rating)
-
-        self._application.getHttpRequestManager().put(url, data = data.encode(), scope = self._json_scope)
-
     def getLicenseDialogPluginFileLocation(self) -> str:
         return self._license_dialog_plugin_file_location
 

plugins/UFPWriter/UFPWriter.py

@@ -1,23 +1,28 @@
-#Copyright (c) 2020 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
-#Cura is released under the terms of the LGPLv3 or higher.
+# Cura is released under the terms of the LGPLv3 or higher.
 
-from typing import cast
+from typing import cast, List, Dict
 
-from Charon.VirtualFile import VirtualFile #To open UFP files.
+from Charon.VirtualFile import VirtualFile  # To open UFP files.
-from Charon.OpenMode import OpenMode #To indicate that we want to write to UFP files.
+from Charon.OpenMode import OpenMode  # To indicate that we want to write to UFP files.
-from io import StringIO #For converting g-code to bytes.
+from io import StringIO  # For converting g-code to bytes.
 
 from UM.Logger import Logger
-from UM.Mesh.MeshWriter import MeshWriter #The writer we need to implement.
+from UM.Mesh.MeshWriter import MeshWriter  # The writer we need to implement.
 from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
-from UM.PluginRegistry import PluginRegistry #To get the g-code writer.
+from UM.PluginRegistry import PluginRegistry  # To get the g-code writer.
 from PyQt5.QtCore import QBuffer
 
+from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
+from UM.Scene.SceneNode import SceneNode
 from cura.CuraApplication import CuraApplication
 from cura.Snapshot import Snapshot
 from cura.Utils.Threading import call_on_qt_thread
 
 from UM.i18n import i18nCatalog
+
+METADATA_OBJECTS_PATH = "metadata/objects"
+
 catalog = i18nCatalog("cura")
 
 
@@ -53,12 +58,14 @@ class UFPWriter(MeshWriter):
         archive = VirtualFile()
         archive.openStream(stream, "application/x-ufp", OpenMode.WriteOnly)
 
-        #Store the g-code from the scene.
+        self._writeObjectList(archive)
+
+        # Store the g-code from the scene.
         archive.addContentType(extension = "gcode", mime_type = "text/x-gcode")
-        gcode_textio = StringIO() #We have to convert the g-code into bytes.
+        gcode_textio = StringIO()  # We have to convert the g-code into bytes.
         gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter"))
         success = gcode_writer.write(gcode_textio, None)
-        if not success: #Writing the g-code failed. Then I can also not write the gzipped g-code.
+        if not success:  # Writing the g-code failed. Then I can also not write the gzipped g-code.
             self.setInformation(gcode_writer.getInformation())
             return False
         gcode = archive.getStream("/3D/model.gcode")
@@ -67,7 +74,7 @@ class UFPWriter(MeshWriter):
 
         self._createSnapshot()
 
-        #Store the thumbnail.
+        # Store the thumbnail.
         if self._snapshot:
             archive.addContentType(extension = "png", mime_type = "image/png")
             thumbnail = archive.getStream("/Metadata/thumbnail.png")
@@ -78,7 +85,9 @@ class UFPWriter(MeshWriter):
             thumbnail_image.save(thumbnail_buffer, "PNG")
 
             thumbnail.write(thumbnail_buffer.data())
-            archive.addRelation(virtual_path = "/Metadata/thumbnail.png", relation_type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail", origin = "/3D/model.gcode")
+            archive.addRelation(virtual_path = "/Metadata/thumbnail.png",
+                                relation_type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail",
+                                origin = "/3D/model.gcode")
         else:
             Logger.log("d", "Thumbnail not created, cannot save it")
 
@@ -139,3 +148,32 @@ class UFPWriter(MeshWriter):
             Logger.error(error_msg)
             return False
         return True
+
+    @staticmethod
+    def _writeObjectList(archive):
+        """Write a json list of object names to the METADATA_OBJECTS_PATH metadata field
+
+        To retrieve, use: `archive.getMetadata(METADATA_OBJECTS_PATH)`
+        """
+
+        objects_model = CuraApplication.getInstance().getObjectsModel()
+        object_metas = []
+
+        for item in objects_model.items:
+            object_metas.extend(UFPWriter._getObjectMetadata(item["node"]))
+
+        data = {METADATA_OBJECTS_PATH: object_metas}
+        archive.setMetadata(data)
+
+    @staticmethod
+    def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]:
+        """Get object metadata to write for a Node.
+
+        :return: List of object metadata dictionaries.
+                 Might contain > 1 element in case of a group node.
+                 Might be empty in case of nonPrintingMesh
+        """
+
+        return [{"name": item.getName()}
+                for item in DepthFirstIterator(node)
+                if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")]

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -149,9 +149,8 @@ Item
                     {
                         id: managePrinterText
                         anchors.verticalCenter: managePrinterLink.verticalCenter
-                        color: UM.Theme.getColor("monitor_text_link")
+                        color: UM.Theme.getColor("text_link")
                         font: UM.Theme.getFont("default")
-                        linkColor: UM.Theme.getColor("monitor_text_link")
                         text: catalog.i18nc("@label link to Connect and Cloud interfaces", "Manage printer")
                         renderType: Text.NativeRendering
                     }
@@ -164,7 +163,7 @@ Item
                             leftMargin: 6 * screenScaleFactor
                             verticalCenter: managePrinterText.verticalCenter
                         }
-                        color: UM.Theme.getColor("monitor_text_link")
+                        color: UM.Theme.getColor("text_link")
                         source: UM.Theme.getIcon("external_link")
                         width: 12 * screenScaleFactor
                         height: 12 * screenScaleFactor

plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml

@@ -47,7 +47,7 @@ Item
         {
             id: externalLinkIcon
             anchors.verticalCenter: manageQueueLabel.verticalCenter
-            color: UM.Theme.getColor("monitor_text_link")
+            color: UM.Theme.getColor("text_link")
             source: UM.Theme.getIcon("external_link")
             width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
             height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
@@ -61,9 +61,8 @@ Item
                 leftMargin: 6 * screenScaleFactor // TODO: Theme!
                 verticalCenter: externalLinkIcon.verticalCenter
             }
-            color: UM.Theme.getColor("monitor_text_link")
+            color: UM.Theme.getColor("text_link")
             font: UM.Theme.getFont("medium") // 14pt, regular
-            linkColor: UM.Theme.getColor("monitor_text_link")
             text: catalog.i18nc("@label link to connect manager", "Manage in browser")
             renderType: Text.NativeRendering
         }

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -145,9 +145,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
         """Set all the interface elements and texts for this output device."""
 
         self.setPriority(2)  # Make sure we end up below the local networking and above 'save to file'.
-        self.setShortDescription(I18N_CATALOG.i18nc("@action:button", "Print via Cloud"))
+        self.setShortDescription(I18N_CATALOG.i18nc("@action:button", "Print via cloud"))
-        self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via Cloud"))
+        self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via cloud"))
-        self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via Cloud"))
+        self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via cloud"))
 
     def _update(self) -> None:
         """Called when the network data should be updated."""

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py

@@ -253,8 +253,8 @@ class CloudOutputDeviceManager:
 
         max_disp_devices = 3
         if len(new_devices) > max_disp_devices:
-            num_hidden = len(new_devices) - max_disp_devices + 1
+            num_hidden = len(new_devices) - max_disp_devices
-            device_name_list = ["<li>{} ({})</li>".format(device.name, device.printerTypeName) for device in new_devices[0:num_hidden]]
+            device_name_list = ["<li>{} ({})</li>".format(device.name, device.printerTypeName) for device in new_devices[0:max_disp_devices]]
             device_name_list.append(self.I18N_CATALOG.i18nc("info:hidden list items", "<li>... and {} others</li>", num_hidden))
             device_names = "".join(device_name_list)
         else:
@@ -262,7 +262,7 @@ class CloudOutputDeviceManager:
 
         message_text = self.I18N_CATALOG.i18nc(
             "info:status",
-            "Cloud printers added from your account:<ul>{}</ul>",
+            "Printers added from Digital Factory:<ul>{}</ul>",
             device_names
         )
         message.setText(message_text)
@@ -291,7 +291,6 @@ class CloudOutputDeviceManager:
             del self._remote_clusters[old_cluster_id]
             self._remote_clusters[new_cloud_output_device.key] = new_cloud_output_device
 
-
     def _devicesRemovedFromAccount(self, removed_device_ids: Set[str]) -> None:
         """
         Removes the CloudOutputDevice from the received device ids and marks the specific printers as "removed from
@@ -321,34 +320,35 @@ class CloudOutputDeviceManager:
         self._removed_printers_message = Message(
                 title = self.I18N_CATALOG.i18ncp(
                         "info:status",
-                        "Cloud connection is not available for a printer",
+                        "A cloud connection is not available for a printer",
-                        "Cloud connection is not available for some printers",
+                        "A cloud connection is not available for some printers",
                         len(self.reported_device_ids)
                 )
         )
-        device_names = "\n".join(["<li>{} ({})</li>".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids])
+        device_names = "".join(["<li>{} ({})</li>".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids])
         message_text = self.I18N_CATALOG.i18ncp(
                 "info:status",
-                "The following cloud printer is not linked to your account:\n",
+                "This printer is not linked to the Digital Factory:",
-                "The following cloud printers are not linked to your account:\n",
+                "These printers are not linked to the Digital Factory:",
                 len(self.reported_device_ids)
         )
+        message_text += "<br/><ul>{}</ul><br/>".format(device_names)
+        digital_factory_string = self.I18N_CATALOG.i18nc("info:name", "Ultimaker Digital Factory")
+
         message_text += self.I18N_CATALOG.i18nc(
                 "info:status",
-                "<ul>{}</ul>\nTo establish a connection, please visit the "
+                "To establish a connection, please visit the {website_link}".format(website_link = "<a href='https://digitalfactory.ultimaker.com/'>{}</a>.".format(digital_factory_string))
-                "<a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>.",
-                device_names
         )
         self._removed_printers_message.setText(message_text)
         self._removed_printers_message.addAction("keep_printer_configurations_action",
                                                  name = self.I18N_CATALOG.i18nc("@action:button", "Keep printer configurations"),
                                                  icon = "",
-                                                 description = "Keep the configuration of the cloud printer(s) synced with Cura which are not linked to your account.",
+                                                 description = "Keep cloud printers in Ultimaker Cura when not connected to your account.",
                                                  button_align = Message.ActionButtonAlignment.ALIGN_RIGHT)
         self._removed_printers_message.addAction("remove_printers_action",
                                                  name = self.I18N_CATALOG.i18nc("@action:button", "Remove printers"),
                                                  icon = "",
-                                                 description = "Remove the cloud printer(s) which are not linked to your account.",
+                                                 description = "Remove cloud printer(s) which aren't linked to your account.",
                                                  button_style = Message.ActionButtonStyle.SECONDARY,
                                                  button_align = Message.ActionButtonAlignment.ALIGN_LEFT)
         self._removed_printers_message.actionTriggered.connect(self._onRemovedPrintersMessageActionTriggered)
@@ -423,13 +423,17 @@ class CloudOutputDeviceManager:
         machine.setMetaDataEntry(self.META_HOST_GUID, device.clusterData.host_guid)
         machine.setMetaDataEntry("group_name", device.name)
         machine.setMetaDataEntry("group_size", device.clusterSize)
-        machine.setMetaDataEntry("removal_warning", self.I18N_CATALOG.i18nc(
+        digital_factory_string = self.I18N_CATALOG.i18nc("info:name", "Ultimaker Digital Factory")
-            "@label ({} is printer name)",
+        digital_factory_link = "<a href='https://digitalfactory.ultimaker.com/'>{}</a>".format(digital_factory_string)
-            "{} will be removed until the next account sync. <br> To remove {} permanently, "
+        removal_warning_string = self.I18N_CATALOG.i18nc(
-            "visit <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>. "
+            "@label ({printer_name} is replaced with the name of the printer",
-            "<br><br>Are you sure you want to remove {} temporarily?",
+            "{printer_name} will be removed until the next account sync. <br> To remove {printer_name} permanently, "
-            device.name, device.name, device.name
+            "visit {digital_factory_link}"
-        ))
+            "<br><br>Are you sure you want to remove {printer_name} temporarily?".format(printer_name = device.name,
+                                                                                         digital_factory_link = digital_factory_link)
+        )
+
+        machine.setMetaDataEntry("removal_warning", removal_warning_string)
         machine.addConfiguredConnectionType(device.connectionType.value)
 
     def _connectToOutputDevice(self, device: CloudOutputDevice, machine: GlobalStack) -> None:

plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py

@@ -30,7 +30,7 @@ class CloudFlowMessage(Message):
             option_state=False,
             image_source=QUrl.fromLocalFile(image_path),
             image_caption=I18N_CATALOG.i18nc("@info:status Ultimaker Cloud should not be translated.",
-                                             "Connect to Ultimaker Cloud"),
+                                             "Connect to Ultimaker Digital Factory"),
         )
         self._address = address
         self.addAction("", I18N_CATALOG.i18nc("@action", "Get started"), "", "")

plugins/USBPrinting/USBPrinterOutputDeviceManager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import threading
@@ -114,9 +114,15 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin):
         :param only_list_usb: If true, only usb ports are listed
         """
         base_list = []
-        for port in serial.tools.list_ports.comports():
+        try:
+            port_list = serial.tools.list_ports.comports()
+        except TypeError:  # Bug in PySerial causes a TypeError if port gets disconnected while processing.
+            port_list = []
+        for port in port_list:
             if not isinstance(port, tuple):
                 port = (port.device, port.description, port.hwid)
+            if not port[2]:  # HWID may be None if the device is not USB or the system doesn't report the type.
+                continue
             if only_list_usb and not port[2].startswith("USB"):
                 continue
 

plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py

@@ -14,6 +14,7 @@ def getMetaData() -> Dict[str, Any]:
     return {
         "version_upgrade": {
             # From                           To                              Upgrade function
+            ("preferences", 6000000):        ("preferences", 6000005,        upgrade.upgradePreferences),
             ("preferences", 6000004):        ("preferences", 6000005,        upgrade.upgradePreferences),
 
             ("definition_changes", 4000004): ("definition_changes", 4000005, upgrade.upgradeInstanceContainer),

plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py

@@ -2,15 +2,28 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import configparser
-from typing import Tuple, List, Dict
+from typing import Tuple, List, Dict, Set
 import io
+
+from UM.Util import parseBool
 from UM.VersionUpgrade import VersionUpgrade
 
 
 # Renamed definition files
 _RENAMED_DEFINITION_DICT = {
     "dagoma_discoeasy200": "dagoma_discoeasy200_bicolor",
-} # type: Dict[str, str]
+}  # type: Dict[str, str]
+
+_removed_settings = {
+    "spaghetti_infill_enabled",
+    "spaghetti_infill_stepped",
+    "spaghetti_max_infill_angle",
+    "spaghetti_max_height",
+    "spaghetti_inset",
+    "spaghetti_flow",
+    "spaghetti_infill_extra_volume",
+    "support_tree_enable"
+}  # type: Set[str]
 
 
 class VersionUpgrade462to47(VersionUpgrade):
@@ -27,6 +40,19 @@ class VersionUpgrade462to47(VersionUpgrade):
 
         # Update version number.
         parser["metadata"]["setting_version"] = "15"
+        
+        if "general" in parser and "visible_settings" in parser["general"]:
+            settings = set(parser["general"]["visible_settings"].split(";"))
+
+            # add support_structure to the visible settings list if necessary
+            if "support_tree_enable" in parser["general"]["visible_settings"]:
+                settings.add("support_structure")
+
+            # Remove deleted settings from the visible settings list.
+            settings.difference_update(_removed_settings)
+
+            # serialize
+            parser["general"]["visible_settings"] = ";".join(settings)
 
         result = io.StringIO()
         parser.write(result)
@@ -78,6 +104,15 @@ class VersionUpgrade462to47(VersionUpgrade):
                 ironing_inset = "=(" + ironing_inset + ")" + correction
                 parser["values"]["ironing_inset"] = ironing_inset
 
+            # Set support_structure if necessary
+            if "support_tree_enable" in parser["values"]:
+                if parseBool(parser["values"]["support_tree_enable"]):
+                    parser["values"]["support_structure"] = "tree"
+                    parser["values"]["support_enable"] = "True"
+
+            for removed in set(parser["values"].keys()).intersection(_removed_settings):
+                del parser["values"][removed]
+
         # Check renamed definitions
         if "definition" in parser["general"] and parser["general"]["definition"] in _RENAMED_DEFINITION_DICT:
             parser["general"]["definition"] = _RENAMED_DEFINITION_DICT[parser["general"]["definition"]]
@@ -135,6 +170,17 @@ class VersionUpgrade462to47(VersionUpgrade):
                     if "redo_layers" in script_parser["PauseAtHeight"]:
                         script_parser["PauseAtHeight"]["redo_layer"] = str(int(script_parser["PauseAtHeight"]["redo_layers"]) > 0)
                         del script_parser["PauseAtHeight"]["redo_layers"]  # Has been renamed to without the S.
+
+                # Migrate DisplayCompleteOnLCD to DisplayProgressOnLCD
+                if script_id == "DisplayRemainingTimeOnLCD":
+                    was_enabled = parseBool(script_parser[script_id]["TurnOn"]) if "TurnOn" in script_parser[script_id] else False
+                    script_parser.remove_section(script_id)
+
+                    script_id = "DisplayProgressOnLCD"
+                    script_parser.add_section(script_id)
+                    if was_enabled:
+                        script_parser.set(script_id, "time_remaining", "True")
+
                 script_io = io.StringIO()
                 script_parser.write(script_io)
                 script_str = script_io.getvalue()

resources/definitions/creality_base.def.json

@@ -243,7 +243,7 @@
 
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },
-        "support_infill_rate": { "value": "0 if support_tree_enable else 20" },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_use_towers": { "value": false },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },

resources/definitions/cubicon_style_neo_a22.def.json

@@ -0,0 +1,40 @@
+{
+    "version": 2,
+    "name": "Cubicon Style Neo-A22",
+    "inherits": "cubicon_common",
+    "metadata": {
+        "author": "Cubicon R&D Center",
+        "manufacturer": "Cubicon",
+        "visible": true,
+        "file_formats": "text/x-gcode",
+        "supports_usb_connection": false,
+        "machine_extruder_trains": {
+            "0": "cubicon_style_neo_a22_extruder_0"
+        },
+        "platform_offset": [
+            0,
+            0,
+            0
+        ]
+    },
+    "overrides": {
+        "machine_name": {
+            "default_value": "Cubicon Style Neo-A22"
+        },
+        "machine_start_gcode": {
+            "default_value": "M911 Style Neo-A22\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
+        },
+        "machine_width": {
+            "default_value": 220
+        },
+        "machine_depth": {
+            "default_value": 220
+        },
+        "machine_height": {
+            "default_value": 220
+        },
+        "material_bed_temp_wait":{
+            "default_value": false
+        }
+    }
+}

resources/definitions/dagoma_disco.def.json

@@ -57,6 +57,22 @@
         },
         "top_bottom_thickness": {
             "default_value": 1
-        }
+        },
+        "machine_max_feedrate_x": { "default_value": 500 },
+        "machine_max_feedrate_y": { "default_value": 500 },
+        "machine_max_feedrate_z": { "default_value": 4 },
+        "machine_max_feedrate_e": { "default_value": 170 },
+        "machine_max_acceleration_x": { "value": 3000 },
+        "machine_max_acceleration_y": { "value": 1000 },
+        "machine_max_acceleration_z": { "value": 20 },
+        "machine_max_acceleration_e": { "value": 10000 },
+        "machine_acceleration": { "value": 3000 },
+        "machine_max_jerk_xy": { "value": 20 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_steps_per_mm_x": { "default_value": 80 },
+        "machine_steps_per_mm_y": { "default_value": 80 },
+        "machine_steps_per_mm_z": { "default_value": 2560 },
+        "machine_steps_per_mm_e": { "default_value": 98 }
     }
 }

resources/definitions/diy220.def.json

@@ -0,0 +1,89 @@
+{
+    "version": 2,
+    "name": "Diytech 220",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Venkatkamesh",
+        "manufacturer": "Sri Vignan Technologies",
+        "weight": 3,
+        "file_formats": "text/x-gcode",
+        "platform": "ultimaker3_platform.obj",
+        "platform_texture": "svtbacktext.png",
+        "platform_offset": [0, 0, 0],
+        "has_materials": true,
+        "has_variants": true,
+        "preferred_variant_name": "0.4 mm",
+        "machine_extruder_trains":
+        {
+            "0": "diy220_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Diytech 220" },
+        "machine_start_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E50 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\""
+        },
+        "machine_end_gcode" : {
+            "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"  if machine_gcode_flavor == \"UltiGCode\" else \"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\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\""
+        },
+        "machine_width": {
+            "default_value": 220
+        },
+        "machine_depth": {
+            "default_value": 220
+        },
+        "machine_height": {
+            "default_value": 305
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [ -42, 12 ],
+                [ -42, -32 ],
+                [ 62, 12 ],
+                [ 62, -32 ]
+            ]
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "gantry_height": {
+            "value": "48"
+        },
+        "machine_use_extruder_offset_to_offset_coords": {
+            "default_value": true
+        },
+        "machine_gcode_flavor": {
+            "default_value": "Marlin"
+        },
+        "machine_disallowed_areas": {
+            "default_value": [
+              [[-115,  112.5], [ -82,  112.5], [ -84,  102.5], [-115,  102.5]],
+              [[ 115,  112.5], [ 115,  102.5], [ 110,  102.5], [ 108,  112.5]],
+              [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
+              [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
+        ]},
+        "machine_nozzle_tip_outer_diameter": {
+            "default_value": 1
+        },
+        "machine_nozzle_head_distance": {
+            "default_value": 3
+        },
+        "machine_max_feedrate_x": {
+            "default_value": 300
+        },
+        "machine_max_feedrate_y": {
+            "default_value": 300
+        },
+        "machine_max_feedrate_z": {
+            "default_value": 40
+        },
+        "machine_acceleration": {
+            "default_value": 3000
+        }
+    }
+}

resources/definitions/erzay3d.def.json

@@ -70,7 +70,7 @@
     "jerk_print": { "default_value": 10 },
 
     "support_angle": { "default_value": 65 },
-    "support_brim_enable": { "default_value": true },
+    "support_brim_enable": { "value": true },
 
     "adhesion_type": { "default_value": "skirt" },
     "brim_outside_only": { "default_value": false },

resources/definitions/flyingbear_base.def.json

@@ -102,7 +102,7 @@
 
 		"support_angle": 			{ "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
 		"support_pattern": 			{ "value": "'zigzag'" },
-		"support_infill_rate": 			{ "value": "0 if support_tree_enable else 20" },
+		"support_infill_rate": 			{ "value": "0 if support_enable and support_structure == 'tree' else 20" },
 		"support_z_distance": 			{ "value": "layer_height if layer_height >= 0.16 else layer_height*2" },
 		"support_xy_distance": 			{ "value": "wall_line_width_0 * 2" },
 		"support_xy_overrides_z": 		{ "value": "'xy_overrides_z'" },

resources/definitions/hms434.def.json

@@ -12,7 +12,7 @@
         "exclude_materials": [
  "chromatik_pla",
  "dsm_arnitel2045_175", "dsm_novamid1070_175",
- "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a",
+ "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_absx", "emotiontech_bvoh",
  "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White",
  "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu",
  "fiberlogy_hd_pla",
@@ -104,7 +104,7 @@
         "ironing_inset":             {"value": "ironing_line_spacing + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"},
         "speed_ironing":             {"value": "150"},
  
-        "infill_sparse_density": {"value": 30},
+        "infill_sparse_density": {"value": 100},
         "infill_pattern":        {"value": "'lines'"},
         "infill_before_walls":   {"value": true},
 

resources/definitions/maker_starter.def.json

@@ -81,7 +81,7 @@
             "default_value": "ZigZag"
         },
         "support_infill_rate": {
-            "value": "15 if support_enable else 0 if support_tree_enable else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "adhesion_type": {
             "default_value": "raft"

resources/definitions/renkforce_rf100.def.json

@@ -201,7 +201,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15 if support_enable else 0 if support_tree_enable else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "support_line_width": {
             "value": "0.6"

resources/definitions/renkforce_rf100_v2.def.json

@@ -201,7 +201,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15 if support_enable else 0 if support_tree_enable else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "support_line_width": {
             "value": "0.6"

resources/definitions/renkforce_rf100_xl.def.json

@@ -189,7 +189,7 @@
             "value": "False"
         },
         "support_infill_rate": {
-            "value": "15 if support_enable else 0 if support_tree_enable else 15"
+            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
         },
         "support_line_width": {
             "value": "0.6"

resources/definitions/rigid3d_base.def.json

@@ -248,7 +248,7 @@
 
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },
-        "support_infill_rate": { "value": "0 if support_tree_enable else 20" },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_use_towers": { "value": false },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },

resources/definitions/skriware_2.def.json

@@ -447,7 +447,7 @@
             "value": "5"
         },
         "skin_outline_count": {
-            "default_value": 0
+            "value": 0
         },
         "skirt_brim_speed": {
             "value": "10.0"

resources/definitions/tronxy_x.def.json

@@ -143,7 +143,7 @@
 
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },
-        "support_infill_rate": { "value": "0 if support_tree_enable else 20" },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_use_towers": { "value": false },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },

resources/definitions/winbo_dragonl4.def.json

@@ -124,7 +124,7 @@
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
-        "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" },
+        "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/definitions/winbo_mini2.def.json

@@ -124,7 +124,7 @@
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
-        "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" },
+        "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/definitions/winbo_superhelper105.def.json

@@ -113,7 +113,7 @@
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
-        "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" },
+        "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "0.5" },

resources/extruders/cubicon_style_neo_a22_extruder_0.def.json

@@ -0,0 +1,26 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "cubicon_style_neo_a22",
+        "position": "0"
+    },
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_offset_x": {
+            "default_value": -3.20
+        },
+        "machine_nozzle_offset_y": {
+            "default_value": -4.70
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
+    }
+}

resources/extruders/diy220_extruder_0.def.json

@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "diy220",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

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

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 12:48+0000\n"
 "PO-Revision-Date: 2020-02-20 17:30+0100\n"
 "Last-Translator: DenyCZ <www.github.com/DenyCZ>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"

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

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2020-04-07 11:21+0200\n"
 "Last-Translator: DenyCZ <www.github.com/DenyCZ>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
@@ -223,6 +223,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "Zda je zařízení schopno stabilizovat teplotu podložky."
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -3472,6 +3482,76 @@ 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 "Vytlačovací stroj se používá pro tisk podlah podpěry. To se používá při vícenásobném vytlačování."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "Úhel větve stromové podpory"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "Úhel větví. Použijte nižší úhel, aby byly více vertikální a stabilnější. K dosažení většího dosahu použijte vyšší úhel."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "Vzdálenost větví stromu"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "Jak daleko od sebe musí být větve, když se dotýkají modelu. Zmenšení této vzdálenosti způsobí, že se stromová podpora dotkne modelu ve více bodech, což způsobí lepší přesah, ale těžší odstranění podpory."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "Průměr větve podpěry stromu"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "Průměr větve stromu podpory Průměr nejtenčí větve stromu podpory. Silnější větve jsou odolnější. Větve směrem k základně budou silnější než tato."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "Průměr úhlu větve podpěry stromu"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "Stromová podpora - rozlišení kolize"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "Rozlišení pro výpočet kolizí, aby nedošlo k nárazu do modelu. Nastavením této nižší se vytvoří přesnější stromy, které selhávají méně často, ale dramaticky se zvyšuje doba slicování."
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3737,6 +3817,16 @@ 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 "Maximální šířka schodů schodišťového dna podpory spočívá na modelu. Nízká hodnota ztěžuje odstranění podpory, ale příliš vysoké hodnoty mohou vést k nestabilním podpůrným strukturám."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4182,6 +4272,16 @@ 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 "Podpořte všude pod podpůrnou sítí, aby v podpůrné síti nebyl přesah."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4943,8 +5043,8 @@ msgstr "Tisková sekvence"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
-msgstr "Zda se mají tisknout všechny modely po jedné vrstvě najednou, nebo počkat na dokončení jednoho modelu, než se přesunete na další. Jeden za časovým režimem je možný, pokud a) je povolen pouze jeden extruder ab) všechny modely jsou odděleny tak, že celá tisková hlava se může pohybovat mezi a všechny modely jsou menší než vzdálenost mezi tryskou a X / Osy Y. "
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -4968,13 +5068,13 @@ msgstr "Pomocí této mřížky můžete upravit výplň dalších sítí, s nim
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Pořadí sítě výplně"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Určuje, která výplň je uvnitř výplně jiné výplně. Výplňová síť s vyšším pořádkem upraví výplň síťových výplní s nižším řádem a normálními oky."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5111,66 +5211,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr "Nové vychytávky, které ještě nejsou venku."
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "Stromová podpora"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "Vygenerujte stromovou podporu s větvemi, které podporují váš tisk. To může snížit spotřebu materiálu a dobu tisku, ale výrazně prodlužuje dobu slicování."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "Úhel větve stromové podpory"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "Úhel větví. Použijte nižší úhel, aby byly více vertikální a stabilnější. K dosažení většího dosahu použijte vyšší úhel."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "Vzdálenost větví stromu"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "Jak daleko od sebe musí být větve, když se dotýkají modelu. Zmenšení této vzdálenosti způsobí, že se stromová podpora dotkne modelu ve více bodech, což způsobí lepší přesah, ale těžší odstranění podpory."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "Průměr větve podpěry stromu"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "Průměr větve stromu podpory Průměr nejtenčí větve stromu podpory. Silnější větve jsou odolnější. Větve směrem k základně budou silnější než tato."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "Průměr úhlu větve podpěry stromu"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "Stromová podpora - rozlišení kolize"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "Rozlišení pro výpočet kolizí, aby nedošlo k nárazu do modelu. Nastavením této nižší se vytvoří přesnější stromy, které selhávají méně často, ale dramaticky se zvyšuje doba slicování."
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5178,8 +5218,8 @@ msgstr "Tolerance slicování"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "Jak krájet vrstvy s diagonálními povrchy. Oblasti vrstvy mohou být generovány na základě toho, kde střed vrstvy protíná povrch (Střední). Alternativně každá vrstva může mít oblasti, které padají uvnitř objemu po celé výšce vrstvy (Exkluzivní), nebo vrstva má oblasti, které padají dovnitř kdekoli v rámci vrstvy (Inkluzivní). Exkluzivní zachovává co nejvíce podrobností, Inkluzivní dělá to nejlepší a Střední trvá zpracování nejméně času."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5451,76 +5491,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "Umístění souboru obrázku, jehož hodnoty jasu určují minimální hustotu na odpovídajícím místě v podpoře."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Špagetová výplň"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Výplň tiskněte tak často, aby se vlákno chaoticky stočilo uvnitř objektu. To zkracuje dobu tisku, ale chování je spíše nepředvídatelné."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Krokování při špagetové výplni"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "Zda se má tisknout špagetová výplň po krocích, nebo se vytlačí veškeré výplňové vlákno na konci tisku."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Maximální úhel špagetové výplně"
-
-#: 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 "Maximální úhel osy Z uvnitř tisku pro oblasti, které mají být poté vyplněny špagetovou výplní. Snížení této hodnoty způsobí, že se na každé vrstvě vyplní více šikmých částí modelu."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Maximální výška špagetové výplně"
-
-#: 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 "Maximální výška vnitřního prostoru, kterou lze kombinovat a naplnit shora."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Špagetová výplň"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Odsazení od stěn, odkud bude vytištěna výplň špaget."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Průtok při špagetové výplni"
-
-#: 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 "Upravuje hustotu výplně špaget. Mějte na paměti, že hustota výplně řídí pouze rozteč linií výplňového vzoru, nikoli velikost výtluku pro výplň špaget."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Objem navíc při špagetové výplni"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Korekční termín pro úpravu celkového objemu, který se vytlačuje pokaždé, když se plní špagety."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6390,6 +6360,86 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Transformační matice, která se použije na model při načítání ze souboru."
 
+#~ msgctxt "print_sequence description"
+#~ msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+#~ msgstr "Zda se mají tisknout všechny modely po jedné vrstvě najednou, nebo počkat na dokončení jednoho modelu, než se přesunete na další. Jeden za časovým režimem je možný, pokud a) je povolen pouze jeden extruder ab) všechny modely jsou odděleny tak, že celá tisková hlava se může pohybovat mezi a všechny modely jsou menší než vzdálenost mezi tryskou a X / Osy Y. "
+
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Pořadí sítě výplně"
+
+#~ 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 "Určuje, která výplň je uvnitř výplně jiné výplně. Výplňová síť s vyšším pořádkem upraví výplň síťových výplní s nižším řádem a normálními oky."
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "Stromová podpora"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "Vygenerujte stromovou podporu s větvemi, které podporují váš tisk. To může snížit spotřebu materiálu a dobu tisku, ale výrazně prodlužuje dobu slicování."
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "Jak krájet vrstvy s diagonálními povrchy. Oblasti vrstvy mohou být generovány na základě toho, kde střed vrstvy protíná povrch (Střední). Alternativně každá vrstva může mít oblasti, které padají uvnitř objemu po celé výšce vrstvy (Exkluzivní), nebo vrstva má oblasti, které padají dovnitř kdekoli v rámci vrstvy (Inkluzivní). Exkluzivní zachovává co nejvíce podrobností, Inkluzivní dělá to nejlepší a Střední trvá zpracování nejméně času."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Špagetová výplň"
+
+#~ 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 "Výplň tiskněte tak často, aby se vlákno chaoticky stočilo uvnitř objektu. To zkracuje dobu tisku, ale chování je spíše nepředvídatelné."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Krokování při špagetové výplni"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "Zda se má tisknout špagetová výplň po krocích, nebo se vytlačí veškeré výplňové vlákno na konci tisku."
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Maximální úhel špagetové výplně"
+
+#~ 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 "Maximální úhel osy Z uvnitř tisku pro oblasti, které mají být poté vyplněny špagetovou výplní. Snížení této hodnoty způsobí, že se na každé vrstvě vyplní více šikmých částí modelu."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Maximální výška špagetové výplně"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "Maximální výška vnitřního prostoru, kterou lze kombinovat a naplnit shora."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Špagetová výplň"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Odsazení od stěn, odkud bude vytištěna výplň špaget."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Průtok při špagetové výplni"
+
+#~ 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 "Upravuje hustotu výplně špaget. Mějte na paměti, že hustota výplně řídí pouze rozteč linií výplňového vzoru, nikoli velikost výtluku pro výplň špaget."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Objem navíc při špagetové výplni"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Korekční termín pro úpravu celkového objemu, který se vytlačuje pokaždé, když se plní špagety."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "GUID materiálu. Toto je nastaveno automaticky. "

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

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

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: German <info@lionbridge.com>, German <info@bothof.nl>\n"
@@ -224,6 +224,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "Zeigt an, ob das Gerät die Temperatur im Druckraum stabilisieren kann."
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -1257,8 +1267,7 @@ msgstr "Horizontalloch-Erweiterung"
 #: fdmprinter.def.json
 msgctxt "hole_xy_offset description"
 msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
-msgstr "Versatz, der auf die Löcher in jeder Schicht angewandt wird. Bei positiven Werten werden die Löcher vergrößert; bei negativen Werten werden die Löcher"
+msgstr "Versatz, der auf die Löcher in jeder Schicht angewandt wird. Bei positiven Werten werden die Löcher vergrößert; bei negativen Werten werden die Löcher verkleinert."
-" verkleinert."
 
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
@@ -2222,8 +2231,7 @@ msgstr "Ausspüldauer am Ende des Filaments"
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
 msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
-msgstr "Materialmenge (Filamentlänge), die erforderlich ist, um das letzte Material aus der Düse zu entfernen, wenn eine leere Spule durch eine neue Spule mit"
+msgstr "Materialmenge (Filamentlänge), die erforderlich ist, um das letzte Material aus der Düse zu entfernen, wenn eine leere Spule durch eine neue Spule mit dem selben Material ersetzt wird."
-" dem selben Material ersetzt wird."
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2243,8 +2251,7 @@ msgstr "Faktor für Bewegung ohne Ladung"
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
 msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
-msgstr "Ein Faktor, der angibt, wie stark das Filament zwischen dem Feeder und der Düsenkammer komprimiert wird; hilft zu bestimmen, wie weit das Material für"
+msgstr "Ein Faktor, der angibt, wie stark das Filament zwischen dem Feeder und der Düsenkammer komprimiert wird; hilft zu bestimmen, wie weit das Material für einen Filamentwechsel bewegt werden muss."
-" einen Filamentwechsel bewegt werden muss."
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3476,6 +3483,76 @@ 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 "Das für das Drucken der Stützstruktur der Böden verwendete Extruder-Element. Dieses wird für die Mehrfach-Extrusion benutzt."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "Astwinkel der Baumstützstruktur"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "Dies bezeichnet den Winkel der Äste. Verwenden Sie einen geringeren Winkel, um sie vertikaler und stabiler zu gestalten. Verwenden Sie einen stärkeren Winkel, um mehr Reichweite zu erhalten."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "Astabstand der Baumstützstruktur"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "Dies beschreibt, wie weit die Äste weg sein müssen, wenn sie das Modell berühren. Eine geringe Entfernung lässt die Baumstützstruktur das Modell an mehreren Punkten berühren, und führt zu einem besseren Überhang, allerdings lässt sich die Stützstruktur auch schwieriger entfernen."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "Astdurchmesser der Baumstützstruktur"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "Dies beschreibt den Durchmesser der dünnsten Äste der Baumstützstruktur. Dickere Äste sind stabiler. Äste zur Basis hin werden dicker als diese sein."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "Winkel Astdurchmesser der Baumstützstruktur"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "Dies beschreibt den Winkel der Astdurchmesser, da sie stufenweise zum Boden hin dicker werden. Ein Winkel von 0 lässt die Äste über die gesamte Länge hinweg eine gleiche Dicke haben. Ein geringer Winkel kann die Stabilität der Baumstützstruktur erhöhen."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "Kollisionsauflösung der Baumstützstruktur"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "Dies ist die Auflösung für die Berechnung von Kollisionen, um ein Anschlagen des Modells zu verhindern. Eine niedrigere Einstellung sorgt für akkuratere Bäume, die weniger häufig fehlschlagen, erhöht jedoch die Slicing-Zeit erheblich."
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3741,6 +3818,16 @@ 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 "Die maximale Breite der Stufen der treppenförmigen Unterlage für die Stützstruktur des Modells. Ein niedriger Wert kann das Entfernen der Stützstruktur erschweren, ein zu hoher Wert kann jedoch zu instabilen Stützstrukturen führen."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4186,6 +4273,16 @@ 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 "Sorgt für Unterstützung überall unterhalb des Stütznetzes, sodass kein Überhang im Stütznetz vorhanden ist."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4947,8 +5044,8 @@ msgstr "Druckreihenfolge"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
-msgstr "Es wird festgelegt, ob eine Schicht für alle Modelle gleichzeitig gedruckt werden soll oder ob zuerst ein Modell fertig gedruckt wird, bevor der Druck eines weiteren begonnen wird. Der „Nacheinandermodus“ ist möglich, wenn a) nur ein Extruder aktiviert ist und b) alle Modelle voneinander getrennt sind, sodass sich der gesamte Druckkopf zwischen allen Modellen bewegen kann und alle Modelle niedriger sind als der Abstand zwischen der Düse und den X/Y-Achsen. "
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -4972,13 +5069,13 @@ msgstr "Verwenden Sie dieses Mesh, um die Füllung anderer Meshes zu ändern, mi
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Reihenfolge für Mesh-Füllung"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Hier wird festgelegt, welche Mesh-Füllung in der Füllung einer anderen Mesh-Füllung ist. Eine Mesh-Füllung mit einer höheren Reihenfolge ändert die Füllung der Mesh-Füllungen mit niedrigerer Reihenfolge und normalen Meshes."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5115,66 +5212,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr "Merkmale, die noch nicht vollständig ausgearbeitet wurden."
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "Baumstützstruktur"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "Erstellen Sie eine baumähnliche Stützstruktur mit Ästen, die Ihren Druck stützen. Das reduziert möglicherweise den Materialverbrauch und die Druckdauer, erhöht jedoch die Slicing-Dauer erheblich."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "Astwinkel der Baumstützstruktur"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "Dies bezeichnet den Winkel der Äste. Verwenden Sie einen geringeren Winkel, um sie vertikaler und stabiler zu gestalten. Verwenden Sie einen stärkeren Winkel, um mehr Reichweite zu erhalten."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "Astabstand der Baumstützstruktur"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "Dies beschreibt, wie weit die Äste weg sein müssen, wenn sie das Modell berühren. Eine geringe Entfernung lässt die Baumstützstruktur das Modell an mehreren Punkten berühren, und führt zu einem besseren Überhang, allerdings lässt sich die Stützstruktur auch schwieriger entfernen."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "Astdurchmesser der Baumstützstruktur"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "Dies beschreibt den Durchmesser der dünnsten Äste der Baumstützstruktur. Dickere Äste sind stabiler. Äste zur Basis hin werden dicker als diese sein."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "Winkel Astdurchmesser der Baumstützstruktur"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "Dies beschreibt den Winkel der Astdurchmesser, da sie stufenweise zum Boden hin dicker werden. Ein Winkel von 0 lässt die Äste über die gesamte Länge hinweg eine gleiche Dicke haben. Ein geringer Winkel kann die Stabilität der Baumstützstruktur erhöhen."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "Kollisionsauflösung der Baumstützstruktur"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "Dies ist die Auflösung für die Berechnung von Kollisionen, um ein Anschlagen des Modells zu verhindern. Eine niedrigere Einstellung sorgt für akkuratere Bäume, die weniger häufig fehlschlagen, erhöht jedoch die Slicing-Zeit erheblich."
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5182,8 +5219,8 @@ msgstr "Slicing-Toleranz"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "Slicen von Schichten mit diagonalen Flächen. Die Bereiche einer Schicht können anhand der Position generiert werden, an der die Mitte einer Schicht die Oberfläche kreuzt (Mitte). Optional kann jede Schicht die Bereiche enthalten, die in das Volumen entlang der Höhe der Schicht (Exklusiv) fallen oder eine Schicht enthält die Bereiche, die irgendwo innerhalb der Schicht positioniert sind (Inklusiv). Exklusiv bewahrt die meisten Details, Inklusiv ermöglicht die beste Passform und Mitte erfordert die kürzeste Bearbeitungszeit."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5455,76 +5492,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "Die Dateiposition eines Bildes, von dem die Helligkeitswerte die minimale Dichte an der entsprechenden Position in der Stützstruktur bestimmen."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Spaghetti-Füllung"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Drucken Sie die Füllung hier und da, sodass sich das Filament innerhalb des Objekts „chaotisch“ ringelt. Das reduziert die Druckdauer, allerdings ist das Verhalten eher unabsehbar."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Spaghetti-Füllung Schrittfunktion"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "Definiert, ob die Spaghetti-Füllung in Schritten gedruckt oder alle Filamente für die Füllung am Ende des Druckes gedruckt werden."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Maximaler Spaghetti-Füllungswinkel"
-
-#: 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 "Der maximale Winkel bezüglich der Z-Achse im Druckinnenbereich für Bereiche, die anschließend mit Spaghetti-Füllung zu füllen sind. Die Reduzierung dieses Wertes für dazu, dass stärker gewinkelte Teile in Ihrem Modell in jeder Schicht gefüllt werden."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Maximale Höhe der Spaghetti-Füllung"
-
-#: 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 "Die maximale Höhe des Innenraums, die kombiniert und von oben gefüllt werden kann."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Spaghetti-Einfügung"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Der Versatz von den Wänden, von denen aus die Spaghetti-Füllung gedruckt wird."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Spaghetti-Durchfluss"
-
-#: 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 "Justiert die Dichte der Spathetti-Füllung. Beachten Sie, dass die Fülldichte nur die Linienabstände des Füllmusters steuert und nicht die Menge der Extrusion für die Spaghetti-Füllung."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Spaghetti-Füllung extra Volumen"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Ein Korrekturbegriff für die Anpassung des Gesamtvolumens, das jedes Mal bei der Spaghetti-Füllung extrudiert wird."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6394,6 +6361,86 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angewandt wird."
 
+#~ msgctxt "print_sequence description"
+#~ msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+#~ msgstr "Es wird festgelegt, ob eine Schicht für alle Modelle gleichzeitig gedruckt werden soll oder ob zuerst ein Modell fertig gedruckt wird, bevor der Druck eines weiteren begonnen wird. Der „Nacheinandermodus“ ist möglich, wenn a) nur ein Extruder aktiviert ist und b) alle Modelle voneinander getrennt sind, sodass sich der gesamte Druckkopf zwischen allen Modellen bewegen kann und alle Modelle niedriger sind als der Abstand zwischen der Düse und den X/Y-Achsen. "
+
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Reihenfolge für Mesh-Füllung"
+
+#~ 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 "Hier wird festgelegt, welche Mesh-Füllung in der Füllung einer anderen Mesh-Füllung ist. Eine Mesh-Füllung mit einer höheren Reihenfolge ändert die Füllung der Mesh-Füllungen mit niedrigerer Reihenfolge und normalen Meshes."
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "Baumstützstruktur"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "Erstellen Sie eine baumähnliche Stützstruktur mit Ästen, die Ihren Druck stützen. Das reduziert möglicherweise den Materialverbrauch und die Druckdauer, erhöht jedoch die Slicing-Dauer erheblich."
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "Slicen von Schichten mit diagonalen Flächen. Die Bereiche einer Schicht können anhand der Position generiert werden, an der die Mitte einer Schicht die Oberfläche kreuzt (Mitte). Optional kann jede Schicht die Bereiche enthalten, die in das Volumen entlang der Höhe der Schicht (Exklusiv) fallen oder eine Schicht enthält die Bereiche, die irgendwo innerhalb der Schicht positioniert sind (Inklusiv). Exklusiv bewahrt die meisten Details, Inklusiv ermöglicht die beste Passform und Mitte erfordert die kürzeste Bearbeitungszeit."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Spaghetti-Füllung"
+
+#~ 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 "Drucken Sie die Füllung hier und da, sodass sich das Filament innerhalb des Objekts „chaotisch“ ringelt. Das reduziert die Druckdauer, allerdings ist das Verhalten eher unabsehbar."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Spaghetti-Füllung Schrittfunktion"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "Definiert, ob die Spaghetti-Füllung in Schritten gedruckt oder alle Filamente für die Füllung am Ende des Druckes gedruckt werden."
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Maximaler Spaghetti-Füllungswinkel"
+
+#~ 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 "Der maximale Winkel bezüglich der Z-Achse im Druckinnenbereich für Bereiche, die anschließend mit Spaghetti-Füllung zu füllen sind. Die Reduzierung dieses Wertes für dazu, dass stärker gewinkelte Teile in Ihrem Modell in jeder Schicht gefüllt werden."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Maximale Höhe der Spaghetti-Füllung"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "Die maximale Höhe des Innenraums, die kombiniert und von oben gefüllt werden kann."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Spaghetti-Einfügung"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Der Versatz von den Wänden, von denen aus die Spaghetti-Füllung gedruckt wird."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Spaghetti-Durchfluss"
+
+#~ 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 "Justiert die Dichte der Spathetti-Füllung. Beachten Sie, dass die Fülldichte nur die Linienabstände des Füllmusters steuert und nicht die Menge der Extrusion für die Spaghetti-Füllung."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Spaghetti-Füllung extra Volumen"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Ein Korrekturbegriff für die Anpassung des Gesamtvolumens, das jedes Mal bei der Spaghetti-Füllung extrudiert wird."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "GUID des Materials. Dies wird automatisch eingestellt. "

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

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

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Spanish <info@lionbridge.com>, Spanish <info@bothof.nl>\n"
@@ -224,6 +224,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "Si la máquina puede estabilizar la temperatura del volumen de impresión."
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -1257,8 +1267,7 @@ msgstr "Expansión horizontal de orificios"
 #: fdmprinter.def.json
 msgctxt "hole_xy_offset description"
 msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
-msgstr "Cantidad de desplazamiento aplicado a todos los orificios en cada capa. Los valores positivos aumentan el tamaño de los orificios y los valores negativos"
+msgstr "Cantidad de desplazamiento aplicado a todos los orificios en cada capa. Los valores positivos aumentan el tamaño de los orificios y los valores negativos reducen el tamaño de los mismos."
-" reducen el tamaño de los mismos."
 
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
@@ -2222,8 +2231,7 @@ msgstr "Longitud de purga del extremo del filamento"
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
 msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
-msgstr "La cantidad de material que se va a utilizará para purgar el material que había antes en la tobera (en longitud del filamento) al sustituir una bobina"
+msgstr "La cantidad de material que se va a utilizará para purgar el material que había antes en la tobera (en longitud del filamento) al sustituir una bobina vacía por una bobina nueva del mismo material."
-" vacía por una bobina nueva del mismo material."
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2243,8 +2251,7 @@ msgstr "Factor de desplazamiento sin carga"
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
 msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
-msgstr "Un factor que indica cuánto se comprime el filamento entre el alimentador y la cámara de la boquilla. Se utiliza para determinar cuán lejos debe avanzar"
+msgstr "Un factor que indica cuánto se comprime el filamento entre el alimentador y la cámara de la boquilla. Se utiliza para determinar cuán lejos debe avanzar el material para cambiar el filamento."
-" el material para cambiar el filamento."
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3476,6 +3483,76 @@ 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 "El tren extrusor que se utiliza para imprimir los suelos del soporte. Se emplea en la extrusión múltiple."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "Ángulo de las ramas del soporte en árbol"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "El ángulo de las ramas. Utilice un ángulo inferior para que sean más verticales y estables. Utilice un ángulo superior para poder tener más alcance."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "Distancia de las ramas del soporte en árbol"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "Qué separación deben tener las ramas cuando tocan el modelo. Reducir esta distancia ocasionará que el soporte en árbol toque el modelo en más puntos, produciendo mejor cobertura pero dificultando la tarea de retirar el soporte."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "Diámetro de las ramas del soporte en árbol"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "El diámetro de las ramas más finas del soporte en árbol. Cuanto más gruesas sean las ramas, más robustas serán. Las ramas que estén cerca de la base serán más gruesas que esto."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "Ángulo de diámetro de las ramas del soporte en árbol"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "El ángulo del diámetro de las ramas es gradualmente más alto según se acercan a la base. Un ángulo de 0 ocasionará que las ramas tengan un grosor uniforme en toda su longitud. Un poco de ángulo puede aumentar la estabilidad del soporte en árbol."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "Resolución de colisión del soporte en árbol"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "Resolución para computar colisiones para evitar golpear el modelo. Establecer un ajuste bajo producirá árboles más precisos que producen fallos con menor frecuencia, pero aumenta significativamente el tiempo de fragmentación."
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3741,6 +3818,16 @@ 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 "Ancho máximo de los escalones de la parte inferior de la escalera del soporte que descansa sobre el modelo. Un valor más bajo hace que el soporte sea difícil de retirar pero valores demasiado altos pueden producir estructuras del soporte inestables."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4186,6 +4273,16 @@ 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 "Disponga un soporte en todas partes por debajo de la malla de soporte, para que no haya voladizo en la malla de soporte."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4947,8 +5044,8 @@ msgstr "Secuencia de impresión"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
-msgstr "Con esta opción se decide si imprimir todos los modelos al mismo tiempo capa por capa o esperar a terminar un modelo antes de pasar al siguiente. El modo de uno en uno solo es posible si todos los modelos están lo suficientemente separados para que el cabezal de impresión pase entre ellos y todos estén a menos de la distancia entre la boquilla y los ejes X/Y. "
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -4972,13 +5069,13 @@ msgstr "Utilice esta malla para modificar el relleno de otras mallas con las que
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Orden de las mallas de relleno"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Determina qué malla de relleno está dentro del relleno de otra malla de relleno. Una malla de relleno de orden superior modificará el relleno de las mallas de relleno con un orden inferior y mallas normales."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5115,66 +5212,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr "Características que aún no se han desarrollado por completo."
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "Soporte en árbol"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "Generar un soporte en forma de árbol con ramas que apoyan la impresión. Esto puede reducir el uso de material y el tiempo de impresión, pero aumenta considerablemente el tiempo de fragmentación."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "Ángulo de las ramas del soporte en árbol"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "El ángulo de las ramas. Utilice un ángulo inferior para que sean más verticales y estables. Utilice un ángulo superior para poder tener más alcance."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "Distancia de las ramas del soporte en árbol"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "Qué separación deben tener las ramas cuando tocan el modelo. Reducir esta distancia ocasionará que el soporte en árbol toque el modelo en más puntos, produciendo mejor cobertura pero dificultando la tarea de retirar el soporte."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "Diámetro de las ramas del soporte en árbol"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "El diámetro de las ramas más finas del soporte en árbol. Cuanto más gruesas sean las ramas, más robustas serán. Las ramas que estén cerca de la base serán más gruesas que esto."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "Ángulo de diámetro de las ramas del soporte en árbol"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "El ángulo del diámetro de las ramas es gradualmente más alto según se acercan a la base. Un ángulo de 0 ocasionará que las ramas tengan un grosor uniforme en toda su longitud. Un poco de ángulo puede aumentar la estabilidad del soporte en árbol."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "Resolución de colisión del soporte en árbol"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "Resolución para computar colisiones para evitar golpear el modelo. Establecer un ajuste bajo producirá árboles más precisos que producen fallos con menor frecuencia, pero aumenta significativamente el tiempo de fragmentación."
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5182,8 +5219,8 @@ msgstr "Tolerancia de segmentación"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "Cómo segmentar capas con superficies diagonales. Las áreas de una capa se pueden crear según el punto en el que el centro de esta intersecta con la superficie (Media). Las capas también pueden tener áreas comprendidas en el volumen a lo largo de la altura de la capa (Exclusiva) o una capa puede tener áreas comprendidas en cualquier lugar de la capa (Inclusiva). Las capas exclusivas tienen un mayor nivel de detalle, mientras que las inclusivas son las que mejor se ajustan y las medias las que tardan menos en procesarse."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5455,76 +5492,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "La ubicación del archivo de una imagen de la que los valores de brillo determinan la densidad mínima en la ubicación correspondiente del soporte."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Relleno spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Imprima el relleno cada cierto tiempo para que el filamento se enrosque caóticamente dentro del objeto. Esto reduce el tiempo de impresión, pero el comportamiento es más bien impredecible."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Relleno spaghetti en escalones"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "Puede elegir si imprimir el relleno spaghetti en escalones o extruir todos los filamentos del relleno al final de la impresión."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Ángulo máximo de relleno spaghetti"
-
-#: 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 "Ángulo máximo con respecto al eje Z de dentro de la impresora para áreas que se deben rellenar con relleno spaghetti más tarde. Reducir este valor produce que las piezas con más ángulos del modelo se rellenen en cada capa."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Altura máxima de relleno spaghetti"
-
-#: 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 "Altura máxima del espacio interior se puede combinar y rellenar desde arriba."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Entrante spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Desplazamiento de las paredes desde las que se va a imprimir el relleno spaghetti."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Flujo spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
-msgstr "Ajusta la densidad del relleno spaghetti. Tenga en cuenta que la densidad de relleno solo controla el espaciado entre líneas del patrón de relleno, no la cantidad de extrusión del relleno spaghetti."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Volumen adicional de relleno spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Término de corrección para ajustar el volumen total que se extruye cada vez que se usa el relleno spaghetti."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6394,6 +6361,86 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matriz de transformación que se aplicará al modelo cuando se cargue desde el archivo."
 
+#~ msgctxt "print_sequence description"
+#~ msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+#~ msgstr "Con esta opción se decide si imprimir todos los modelos al mismo tiempo capa por capa o esperar a terminar un modelo antes de pasar al siguiente. El modo de uno en uno solo es posible si todos los modelos están lo suficientemente separados para que el cabezal de impresión pase entre ellos y todos estén a menos de la distancia entre la boquilla y los ejes X/Y. "
+
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Orden de las mallas de relleno"
+
+#~ 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 qué malla de relleno está dentro del relleno de otra malla de relleno. Una malla de relleno de orden superior modificará el relleno de las mallas de relleno con un orden inferior y mallas normales."
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "Soporte en árbol"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "Generar un soporte en forma de árbol con ramas que apoyan la impresión. Esto puede reducir el uso de material y el tiempo de impresión, pero aumenta considerablemente el tiempo de fragmentación."
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "Cómo segmentar capas con superficies diagonales. Las áreas de una capa se pueden crear según el punto en el que el centro de esta intersecta con la superficie (Media). Las capas también pueden tener áreas comprendidas en el volumen a lo largo de la altura de la capa (Exclusiva) o una capa puede tener áreas comprendidas en cualquier lugar de la capa (Inclusiva). Las capas exclusivas tienen un mayor nivel de detalle, mientras que las inclusivas son las que mejor se ajustan y las medias las que tardan menos en procesarse."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Relleno spaghetti"
+
+#~ 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 "Imprima el relleno cada cierto tiempo para que el filamento se enrosque caóticamente dentro del objeto. Esto reduce el tiempo de impresión, pero el comportamiento es más bien impredecible."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Relleno spaghetti en escalones"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "Puede elegir si imprimir el relleno spaghetti en escalones o extruir todos los filamentos del relleno al final de la impresión."
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Ángulo máximo de relleno spaghetti"
+
+#~ 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 "Ángulo máximo con respecto al eje Z de dentro de la impresora para áreas que se deben rellenar con relleno spaghetti más tarde. Reducir este valor produce que las piezas con más ángulos del modelo se rellenen en cada capa."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Altura máxima de relleno spaghetti"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "Altura máxima del espacio interior se puede combinar y rellenar desde arriba."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Entrante spaghetti"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Desplazamiento de las paredes desde las que se va a imprimir el relleno spaghetti."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Flujo spaghetti"
+
+#~ msgctxt "spaghetti_flow description"
+#~ msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
+#~ msgstr "Ajusta la densidad del relleno spaghetti. Tenga en cuenta que la densidad de relleno solo controla el espaciado entre líneas del patrón de relleno, no la cantidad de extrusión del relleno spaghetti."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Volumen adicional de relleno spaghetti"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Término de corrección para ajustar el volumen total que se extruye cada vez que se usa el relleno spaghetti."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "GUID del material. Este valor se define de forma automática. "

resources/i18n/fdmextruder.def.json.pot

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

resources/i18n/fdmprinter.def.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -228,6 +228,19 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid ""
+"Write active tool after sending temp commands to inactive tool. Required for "
+"Dual Extruder printing with Smoothie or other firmware with modal tool "
+"commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -3973,6 +3986,96 @@ msgid ""
 "used in multi-extrusion."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid ""
+"Chooses between the techniques available to generate support. \"Normal\" "
+"support creates a support structure directly below the overhanging parts and "
+"drops those areas straight down. \"Tree\" support creates branches towards "
+"the overhanging areas that support the model on the tips of those branches, "
+"and allows the branches to crawl around the model to support it from the "
+"build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid ""
+"The angle of the branches. Use a lower angle to make them more vertical and "
+"more stable. Use a higher angle to be able to have more reach."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid ""
+"How far apart the branches need to be when they touch the model. Making this "
+"distance small will cause the tree support to touch the model at more "
+"points, causing better overhang but making support harder to remove."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid ""
+"The diameter of the thinnest branches of tree support. Thicker branches are "
+"more sturdy. Branches towards the base will be thicker than this."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid ""
+"The angle of the branches' diameter as they gradually become thicker towards "
+"the bottom. An angle of 0 will cause the branches to have uniform thickness "
+"over their length. A bit of an angle can increase stability of the tree "
+"support."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid ""
+"Resolution to compute collisions with to avoid hitting the model. Setting "
+"this lower will produce more accurate trees that fail less often, but "
+"increases slicing time dramatically."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -4286,6 +4389,20 @@ msgid ""
 "values can lead to unstable support structures."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid ""
+"The minimum slope of the area for stair-stepping to take effect. Low values "
+"should make support easier to remove on shallower slopes, but really low "
+"values may result in some very counter-intuitive results on other parts of "
+"the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4812,6 +4929,18 @@ msgid ""
 "in the support mesh."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid ""
+"There are support meshes present in the scene. This setting is controlled by "
+"Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -5711,7 +5840,7 @@ msgid ""
 "finish, before moving on to the next. One at a time mode is possible if a) "
 "only one extruder is enabled and b) all models are separated in such a way "
 "that the whole print head can move in between and all models are lower than "
-"the distance between the nozzle and the X/Y axes. "
+"the distance between the nozzle and the X/Y axes."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -5739,13 +5868,14 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
 msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order description"
 msgid ""
-"Determines which infill mesh is inside the infill of another infill mesh. An "
+"Determines the priority of this mesh when considering overlapping volumes. "
+"Areas where multiple meshes reside will be won by the lower rank mesh. An "
 "infill mesh with a higher order will modify the infill of infill meshes with "
 "lower order and normal meshes."
 msgstr ""
@@ -5917,82 +6047,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid ""
-"Generate a tree-like support with branches that support your print. This may "
-"reduce material usage and print time, but greatly increases slicing time."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid ""
-"The angle of the branches. Use a lower angle to make them more vertical and "
-"more stable. Use a higher angle to be able to have more reach."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid ""
-"How far apart the branches need to be when they touch the model. Making this "
-"distance small will cause the tree support to touch the model at more "
-"points, causing better overhang but making support harder to remove."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid ""
-"The diameter of the thinnest branches of tree support. Thicker branches are "
-"more sturdy. Branches towards the base will be thicker than this."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid ""
-"The angle of the branches' diameter as they gradually become thicker towards "
-"the bottom. An angle of 0 will cause the branches to have uniform thickness "
-"over their length. A bit of an angle can increase stability of the tree "
-"support."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid ""
-"Resolution to compute collisions with to avoid hitting the model. Setting "
-"this lower will produce more accurate trees that fail less often, but "
-"increases slicing time dramatically."
-msgstr ""
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -6001,13 +6055,13 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
 msgid ""
-"How to slice layers with diagonal surfaces. The areas of a layer can be "
+"Vertical tolerance in the sliced layers. The contours of a layer are "
-"generated based on where the middle of the layer intersects the surface "
+"normally generated by taking cross sections through the middle of each "
-"(Middle). Alternatively each layer can have the areas which fall inside of "
+"layer's thickness (Middle). Alternatively each layer can have the areas "
-"the volume throughout the height of the layer (Exclusive) or a layer has the "
+"which fall inside of the volume throughout the entire thickness of the layer "
-"areas which fall inside anywhere within the layer (Inclusive). Exclusive "
+"(Exclusive) or a layer has the areas which fall inside anywhere within the "
-"retains the most details, Inclusive makes for the best fit and Middle takes "
+"layer (Inclusive). Inclusive retains the most details, Exclusive makes for "
-"the least time to process."
+"the best fit and Middle stays closest to the original surface."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -6335,92 +6389,6 @@ msgid ""
 "minimal density at the corresponding location in the support."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid ""
-"Print the infill every so often, so that the filament will curl up "
-"chaotically inside the object. This reduces print time, but the behaviour is "
-"rather unpredictable."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid ""
-"Whether to print spaghetti infill in steps or extrude all the infill "
-"filament at the end of the print."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid ""
-"The maximum angle w.r.t. the Z axis of the inside of the print for areas "
-"which are to be filled with spaghetti infill afterwards. Lowering this value "
-"causes more angled parts in your model to be filled on each layer."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid ""
-"The maximum height of inside space which can be combined and filled from the "
-"top."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid ""
-"The offset from the walls from where the spaghetti infill will be printed."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid ""
-"Adjusts the density of the spaghetti infill. Note that the Infill Density "
-"only controls the line spacing of the filling pattern, not the amount of "
-"extrusion for spaghetti infill."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid ""
-"A correction term to adjust the total volume being extruded each time when "
-"filling spaghetti."
-msgstr ""
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"

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

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

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2017-09-27 12:27+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"
@@ -219,6 +219,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -3466,6 +3476,76 @@ 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 "Tuen lattioiden tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3731,6 +3811,16 @@ 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 "Mallin päällä olevan porrasmaisen tuen pohjan portaiden enimmäisleveys. Matala arvo tekee tuesta vaikeamman poistaa, mutta liian korkeat arvot voivat johtaa epävakaisiin tukirakenteisiin."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4176,6 +4266,16 @@ 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 "Muodosta tukea kaikkialle tukiverkon alla, niin ettei tukiverkossa ole ulokkeita."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4935,7 +5035,7 @@ msgstr "Tulostusjärjestys"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -4960,13 +5060,13 @@ msgstr "Tällä verkolla muokataan sen kanssa limittyvien toisten verkkojen täy
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Täyttöverkkojärjestys"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Määrittää, mikä täyttöverkko on toisen täyttöverkon täytön sisällä. Korkeamman järjestyksen täyttöverkko muokkaa pienemmän järjestyksen täyttöverkkojen ja normaalien verkkojen täyttöä."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5103,66 +5203,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr ""
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5170,7 +5210,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -5443,76 +5483,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Spagettitäyttö"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Tulostaa täytön silloin tällöin, niin että tulostuslanka kiertyy sattumanvaraisesti kappaleen sisälle. Tämä lyhentää tulostusaikaa, mutta toimintatapa on melko arvaamaton."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Spagettitäyttö vaiheittain"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "Spagettitäytön tulostus vaiheittain vai kaiken täyttötulostuslangan pursotus tulostuksen lopussa."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Spagettitäytön enimmäiskulma"
-
-#: 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 "Tulosteen sisustan suurin mahdollinen kulma Z-akseliin nähden alueilla, jotka täytetään myöhemmin spagettitäytöllä. Tämän arvon alentaminen johtaa siihen, että useampia mallin vinottaisia osia täytetään jokaisessa kerroksessa."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Spagettitäytön enimmäiskorkeus"
-
-#: 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 "Yhdistettävän ja yläpuolelta täytettävän sisätilan enimmäiskorkeus."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Spagettiliitos"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Siirtymä seinämistä, joista spagettitäyttö tulostetaan."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Spagettivirtaus"
-
-#: 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 "Säätää spagettitäytön tiheyttä. Huomaa, että täyttötiheys hallitsee vain täyttökuvion linjojen välien suuruutta, ei spagettitäytön pursotusmäärää."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Spagettitäytön ylimääräinen ainemäärä"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Korjausehto pursotettavan aineen kokonaismäärän säätöön jokaisen spagettitäytön aikana."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6382,6 +6352,70 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Mallissa käytettävä muunnosmatriisi, kun malli ladataan tiedostosta."
 
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Täyttöverkkojärjestys"
+
+#~ 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 "Määrittää, mikä täyttöverkko on toisen täyttöverkon täytön sisällä. Korkeamman järjestyksen täyttöverkko muokkaa pienemmän järjestyksen täyttöverkkojen ja normaalien verkkojen täyttöä."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Spagettitäyttö"
+
+#~ 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 "Tulostaa täytön silloin tällöin, niin että tulostuslanka kiertyy sattumanvaraisesti kappaleen sisälle. Tämä lyhentää tulostusaikaa, mutta toimintatapa on melko arvaamaton."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Spagettitäyttö vaiheittain"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "Spagettitäytön tulostus vaiheittain vai kaiken täyttötulostuslangan pursotus tulostuksen lopussa."
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Spagettitäytön enimmäiskulma"
+
+#~ 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 "Tulosteen sisustan suurin mahdollinen kulma Z-akseliin nähden alueilla, jotka täytetään myöhemmin spagettitäytöllä. Tämän arvon alentaminen johtaa siihen, että useampia mallin vinottaisia osia täytetään jokaisessa kerroksessa."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Spagettitäytön enimmäiskorkeus"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "Yhdistettävän ja yläpuolelta täytettävän sisätilan enimmäiskorkeus."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Spagettiliitos"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Siirtymä seinämistä, joista spagettitäyttö tulostetaan."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Spagettivirtaus"
+
+#~ 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 "Säätää spagettitäytön tiheyttä. Huomaa, että täyttötiheys hallitsee vain täyttökuvion linjojen välien suuruutta, ei spagettitäytön pursotusmäärää."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Spagettitäytön ylimääräinen ainemäärä"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Korjausehto pursotettavan aineen kokonaismäärän säätöön jokaisen spagettitäytön aikana."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "Materiaalin GUID. Tämä määritetään automaattisesti. "

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

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

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: French <info@lionbridge.com>, French <info@bothof.nl>\n"
@@ -224,6 +224,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "Si la machine est capable de stabiliser la température du volume d'impression."
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -1257,8 +1267,7 @@ msgstr "Expansion horizontale des trous"
 #: fdmprinter.def.json
 msgctxt "hole_xy_offset description"
 msgid "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes."
-msgstr "Le décalage appliqué à tous les trous dans chaque couche. Les valeurs positives augmentent la taille des trous ; les valeurs négatives réduisent la taille"
+msgstr "Le décalage appliqué à tous les trous dans chaque couche. Les valeurs positives augmentent la taille des trous ; les valeurs négatives réduisent la taille des trous."
-" des trous."
 
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
@@ -2222,8 +2231,7 @@ msgstr "Longueur de purge de l'extrémité du filament"
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
 msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
-msgstr "La quantité de matériau à utiliser pour purger le matériau précédent de la buse (en longueur de filament) lors du remplacement d'une bobine vide par une"
+msgstr "La quantité de matériau à utiliser pour purger le matériau précédent de la buse (en longueur de filament) lors du remplacement d'une bobine vide par une nouvelle bobine du même matériau."
-" nouvelle bobine du même matériau."
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2243,8 +2251,7 @@ msgstr "Facteur de déplacement sans chargement"
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
 msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
-msgstr "Un facteur indiquant la quantité de filament compressée entre le chargeur et la chambre de la buse ; utilisé pour déterminer jusqu'où faire avancer le"
+msgstr "Un facteur indiquant la quantité de filament compressée entre le chargeur et la chambre de la buse ; utilisé pour déterminer jusqu'où faire avancer le matériau pour changer de filament."
-" matériau pour changer de filament."
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3476,6 +3483,76 @@ 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 "Le train d'extrudeuse à utiliser pour l'impression des bas du support. Cela est utilisé en multi-extrusion."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "Angle des branches de support arborescent"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "Angle des branches. Utilisez un angle plus faible pour les rendre plus verticales et plus stables ; utilisez un angle plus élevé pour avoir plus de portée."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "Distance des branches de support arborescent"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "Distance à laquelle doivent se trouver les branches lorsqu'elles touchent le modèle. Si vous réduisez cette distance, le support arborescent touchera le modèle à plus d'endroits, ce qui causera un meilleur porte-à-faux mais rendra le support plus difficile à enlever."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "Diamètre des branches de support arborescent"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "Diamètre des branches les plus minces du support arborescent. Plus les branches sont épaisses, plus elles sont robustes ; les branches proches de la base seront plus épaisses que cette valeur."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "Angle de diamètre des branches de support arborescent"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "Angle du diamètre des branches au fur et à mesure qu'elles s'épaississent lorsqu'elles sont proches du fond. Avec un angle de 0°, les branches auront une épaisseur uniforme sur toute leur longueur. Donner un peu d'angle permet d'augmenter la stabilité du support arborescent."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "Résolution de collision du support arborescent"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "Résolution servant à calculer les collisions afin d'éviter de heurter le modèle. Plus ce paramètre est faible, plus les arborescences seront précises et stables, mais cela augmente considérablement le temps de découpage."
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3741,6 +3818,16 @@ 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 "La largeur maximale de la marche du support en forme d'escalier reposant sur le modèle. Une valeur faible rend le support plus difficile à enlever, mais des valeurs trop élevées peuvent entraîner des supports instables."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4186,6 +4273,16 @@ 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 "Inclure du support à tout emplacement sous le maillage de support, de sorte à ce qu'il n'y ait pas de porte-à-faux dans le maillage de support."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4947,8 +5044,8 @@ msgstr "Séquence d'impression"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
-msgstr "Imprime tous les modèles en même temps, couche par couche, ou attend la fin d'un modèle pour en commencer un autre. Le mode « Un modèle à la fois » est disponible seulement si a) un seul extrudeur est activé et si b) tous les modèles sont suffisamment éloignés pour que la tête puisse passer entre eux et qu'ils sont tous inférieurs à la distance entre la buse et les axes X/Y. "
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -4972,13 +5069,13 @@ msgstr "Utiliser cette maille pour modifier le remplissage d'autres mailles qu'e
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Ordre de maille de remplissage"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Détermine quelle maille de remplissage se trouve à l'intérieur du remplissage d'une autre maille de remplissage. Une maille de remplissage possédant un ordre plus élevé modifiera le remplissage des mailles de remplissage ayant un ordre plus bas et des mailles normales."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5115,66 +5212,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr "Des fonctionnalités qui n'ont pas encore été complètement développées."
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "Support arborescent"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "Générer un support arborescent avec des branches qui soutiennent votre impression. Cela peut réduire l'utilisation de matériau et le temps d'impression, mais augmente considérablement le temps de découpage."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "Angle des branches de support arborescent"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "Angle des branches. Utilisez un angle plus faible pour les rendre plus verticales et plus stables ; utilisez un angle plus élevé pour avoir plus de portée."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "Distance des branches de support arborescent"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "Distance à laquelle doivent se trouver les branches lorsqu'elles touchent le modèle. Si vous réduisez cette distance, le support arborescent touchera le modèle à plus d'endroits, ce qui causera un meilleur porte-à-faux mais rendra le support plus difficile à enlever."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "Diamètre des branches de support arborescent"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "Diamètre des branches les plus minces du support arborescent. Plus les branches sont épaisses, plus elles sont robustes ; les branches proches de la base seront plus épaisses que cette valeur."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "Angle de diamètre des branches de support arborescent"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "Angle du diamètre des branches au fur et à mesure qu'elles s'épaississent lorsqu'elles sont proches du fond. Avec un angle de 0°, les branches auront une épaisseur uniforme sur toute leur longueur. Donner un peu d'angle permet d'augmenter la stabilité du support arborescent."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "Résolution de collision du support arborescent"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "Résolution servant à calculer les collisions afin d'éviter de heurter le modèle. Plus ce paramètre est faible, plus les arborescences seront précises et stables, mais cela augmente considérablement le temps de découpage."
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5182,8 +5219,8 @@ msgstr "Tolérance à la découpe"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "Comment découper des couches avec des surfaces diagonales. Les zones d'une couche peuvent être générées en fonction de l'endroit où le milieu de la couche croise la surface (Milieu). Alternativement, chaque couche peut posséder des zones situées à l'intérieur du volume à travers toute la hauteur de la couche (Exclusif), ou une couche peut avoir des zones situées à l'intérieur à tout endroit dans la couche (Inclusif). L'option Exclusif permet de retenir le plus de détails, Inclusif permet d'obtenir une adaptation optimale et Milieu demande le moins de temps de traitement."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5455,76 +5492,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "Emplacement du fichier d'une image dont les valeurs de luminosité déterminent la densité minimale à l'emplacement correspondant dans le support."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Remplissage en spaghettis"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Imprime régulièrement le remplissage afin que les filaments s'enroulent de manière chaotique à l'intérieur de l'objet. Cela permet de réduire le temps d'impression, mais le comportement sera assez imprévisible."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Étapes de remplissage en spaghettis"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "Imprimer le remplissage en spaghettis étape par étape ou bien extruder tout le filament de remplissage à la fin de l'impression."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Angle maximal de remplissage en spaghettis"
-
-#: 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 "L'angle maximal pour l'axe Z de l'intérieur de l'impression pour les zones à remplir ensuite par remplissage en spaghettis. Le fait de réduire cette valeur entraînera le remplissage de plus de parties inclinées sur chaque couche dans votre modèle."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Hauteur maximale du remplissage en spaghettis"
-
-#: 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 "La hauteur maximale de l'espace intérieur qui peut être combiné et rempli depuis le haut."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Insert en spaghettis"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Le décalage à partir des parois depuis lesquelles le remplissage en spaghettis sera imprimé."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Flux en spaghettis"
-
-#: 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 "Ajuste la densité du remplissage en spaghettis. Veuillez noter que la densité de remplissage ne contrôle que l'espacement de ligne du motif de remplissage, et non le montant d'extrusion du remplissage en spaghettis."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Volume supplémentaire de remplissage en spaghettis"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Terme de correction permettant d'ajuster le volume total extrudé à chaque fois lors du remplissage en spaghettis."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6394,6 +6361,86 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matrice de transformation à appliquer au modèle lors de son chargement depuis le fichier."
 
+#~ msgctxt "print_sequence description"
+#~ msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+#~ msgstr "Imprime tous les modèles en même temps, couche par couche, ou attend la fin d'un modèle pour en commencer un autre. Le mode « Un modèle à la fois » est disponible seulement si a) un seul extrudeur est activé et si b) tous les modèles sont suffisamment éloignés pour que la tête puisse passer entre eux et qu'ils sont tous inférieurs à la distance entre la buse et les axes X/Y. "
+
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Ordre de maille de remplissage"
+
+#~ 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 "Détermine quelle maille de remplissage se trouve à l'intérieur du remplissage d'une autre maille de remplissage. Une maille de remplissage possédant un ordre plus élevé modifiera le remplissage des mailles de remplissage ayant un ordre plus bas et des mailles normales."
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "Support arborescent"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "Générer un support arborescent avec des branches qui soutiennent votre impression. Cela peut réduire l'utilisation de matériau et le temps d'impression, mais augmente considérablement le temps de découpage."
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "Comment découper des couches avec des surfaces diagonales. Les zones d'une couche peuvent être générées en fonction de l'endroit où le milieu de la couche croise la surface (Milieu). Alternativement, chaque couche peut posséder des zones situées à l'intérieur du volume à travers toute la hauteur de la couche (Exclusif), ou une couche peut avoir des zones situées à l'intérieur à tout endroit dans la couche (Inclusif). L'option Exclusif permet de retenir le plus de détails, Inclusif permet d'obtenir une adaptation optimale et Milieu demande le moins de temps de traitement."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Remplissage en spaghettis"
+
+#~ msgctxt "spaghetti_infill_enabled description"
+#~ msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
+#~ msgstr "Imprime régulièrement le remplissage afin que les filaments s'enroulent de manière chaotique à l'intérieur de l'objet. Cela permet de réduire le temps d'impression, mais le comportement sera assez imprévisible."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Étapes de remplissage en spaghettis"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "Imprimer le remplissage en spaghettis étape par étape ou bien extruder tout le filament de remplissage à la fin de l'impression."
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Angle maximal de remplissage en spaghettis"
+
+#~ 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 "L'angle maximal pour l'axe Z de l'intérieur de l'impression pour les zones à remplir ensuite par remplissage en spaghettis. Le fait de réduire cette valeur entraînera le remplissage de plus de parties inclinées sur chaque couche dans votre modèle."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Hauteur maximale du remplissage en spaghettis"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "La hauteur maximale de l'espace intérieur qui peut être combiné et rempli depuis le haut."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Insert en spaghettis"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Le décalage à partir des parois depuis lesquelles le remplissage en spaghettis sera imprimé."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Flux en spaghettis"
+
+#~ 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 "Ajuste la densité du remplissage en spaghettis. Veuillez noter que la densité de remplissage ne contrôle que l'espacement de ligne du motif de remplissage, et non le montant d'extrusion du remplissage en spaghettis."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Volume supplémentaire de remplissage en spaghettis"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Terme de correction permettant d'ajuster le volume total extrudé à chaque fois lors du remplissage en spaghettis."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "GUID du matériau. Cela est configuré automatiquement. "

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 12:48+0000\n"
 "PO-Revision-Date: 2020-03-24 09:27+0100\n"
 "Last-Translator: Nagy Attila <vokroot@gmail.com>\n"
 "Language-Team: AT-VLOG\n"

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2020-03-24 09:43+0100\n"
 "Last-Translator: Nagy Attila <vokroot@gmail.com>\n"
 "Language-Team: AT-VLOG\n"
@@ -225,6 +225,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "Azt határozza meg, hogy a gép képes-e szabályozni a nyomtatási tér hőmérsékletét."
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -3474,6 +3484,76 @@ 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 "Az az extruder, ami a támaszok fedelét nyomtatja.Ezt multi-extruderes gépeken használhatjuk."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "Támaszágak szöge"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "Az ágak szöge. Használjon alacsonyabb szöget, hogy függőlegesebb és stabilabbak legyenek. A jobb kinyúláshoz használjon nagyobb szöget."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "Támaszágak távolsága"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "Azt adja meg, hogy milyen messze kell lenniük az ágaknak, mikor a modellt érintik. Ha a távolság kicsi, a ta támasza több ponton is megérinti a modellt, ami jobb alátámasztást ad, de nehezebb eltávolítani majd a támaszt utólag."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "Támaszágak átmérője"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "A támasz legvékonyabb ágainak átmérője. A vastagabb ágak erősebbek. Az alap felé eső ágak vastagabbak lesznek, mint ez a méret."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "Támaszágak átmérő szög"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "Az ágak átmérőjének változási szöge. Az ágak felülről lefelé vastagodnak. Ha a szög 0, akkor az ágak átmérője egyenletes, teljes hosszukban.Egy kis szög érték növelheti a fa tartásának stabilitását."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "Ütközés felbontás"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "Felbontás az ütközések kiszámítására, annak érdekében, hogy elkerüljük a modellel való ütközést. Ha alacsonyabb a beállítás, az pontosabb fákat eredményez, amik kevésbé dőlnek el, de a szeletelési időt drámai módon megnöveli."
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3739,6 +3819,16 @@ 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 "A modellen támaszkodó támasz lépcső maximális szélessége. Az alacsony érték nehezíti az eltávolítást, de a túl magas érték instabillá teszi a támaszt."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4184,6 +4274,16 @@ 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 "Készítsen mindenütt támasztást a támaszháló alatt úgy, hogy ne lehessen alátámasztatlan kinyúlás a támaszhálóban."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4945,7 +5045,7 @@ msgstr "Nyomtatási sorrend"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -4970,13 +5070,13 @@ msgstr "Ezzel a hálóval módosíthatja az egyéb átfedéseknek megfelelő kit
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Kitöltés háló rend"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Meghatározza, hogy melyik kitöltési háló helyezkedjen el egy másik kitöltési hálón. A magasabb rendű kitöltési háló megváltoztatja az alacsonyabb rendű és normál hálókat."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5113,66 +5213,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "Fa támasz"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "Generáljon fához hasonló támasz ágakkal, amelyek megtámasztják a nyomtatványt.Ez csökkentheti az anyagfelhasználást és a nyomtatási időt, de jelentősen megnöveli a szeletelési időt."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "Támaszágak szöge"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "Az ágak szöge. Használjon alacsonyabb szöget, hogy függőlegesebb és stabilabbak legyenek. A jobb kinyúláshoz használjon nagyobb szöget."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "Támaszágak távolsága"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "Azt adja meg, hogy milyen messze kell lenniük az ágaknak, mikor a modellt érintik. Ha a távolság kicsi, a ta támasza több ponton is megérinti a modellt, ami jobb alátámasztást ad, de nehezebb eltávolítani majd a támaszt utólag."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "Támaszágak átmérője"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "A támasz legvékonyabb ágainak átmérője. A vastagabb ágak erősebbek. Az alap felé eső ágak vastagabbak lesznek, mint ez a méret."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "Támaszágak átmérő szög"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "Az ágak átmérőjének változási szöge. Az ágak felülről lefelé vastagodnak. Ha a szög 0, akkor az ágak átmérője egyenletes, teljes hosszukban.Egy kis szög érték növelheti a fa tartásának stabilitását."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "Ütközés felbontás"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "Felbontás az ütközések kiszámítására, annak érdekében, hogy elkerüljük a modellel való ütközést. Ha alacsonyabb a beállítás, az pontosabb fákat eredményez, amik kevésbé dőlnek el, de a szeletelési időt drámai módon megnöveli."
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5180,8 +5220,8 @@ msgstr "Szeletelési tűrés"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "A szeleteléskor az egyes szeletek a tárgy egy adott pontjában haladnak át, keresztben. Az adott réteg területei úgy alakulnak ki, hogy az adott réteg középpontjában metszi-e a szelet felületét. (Középső)Alternatív megoldásként az egyes rétegeknek lehetnek olyan területei, amelyek a térfogat beljesébe esnek a teljes rétegmagasság alatt (Kizáró).A rétegnek lehetnek olyan területei, amelyek a réteg bármely pontján belülre esnek (Befoglaló).A kizárólagos megtartja a legtöbb részletet, amíg a befoglalt a legjobban illeszkedik. A középső igényli a legkevesebb feldolgozási időt."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5453,76 +5493,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "Annak a képfájlnak, aminek a fényerősség értékei meghatározzák a minimális sűrűséget a nyomtatás kereszt támasz kitöltésének megfelelő helyén."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Spagetti kitöltés"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Ez a kitöltés nem minta alapján történik, hanem a nyomtatószálat kaotikusan, össze-vissza folyatja a kitöltésen belül. Ez csökkenti a nyomtatási időt, azonban a struktúra stabilitása, és viselkedése kiszámíthatatlan."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Lépésenkénti kitöltés"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "A spagetti kitöltést lépésenként végezze, vagy egyszerre, a nyomtatás végén extrudálja a töltőszálat. (beleömleszti, össze-vissza)"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Maximális kitöltési szög"
-
-#: 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 "A maximális w.r.t. szög a nyomtatás belsejében, és a Z tengelye azokon a területeken, amelyeket utána spagetti töltelékkel kell kitölteni. Ennek az értéknek a csökkentésével több olyan szögben lévő részeket hoz létre, amit minden rétegben meg kell tölteni."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Kitöltés maximum magasság"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid "The maximum height of inside space which can be combined and filled from the top."
-msgstr "A belső tér maximális magassága, amelyet felülről ki lehet tölteni."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Spagetti berakás"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Az eltolás a falaktól, ahonnan a spagetti kitöltés kinyomtatásra kerül."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Spagetti adagolás"
-
-#: 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 "Beállítja a spagetti kitöltés sűrűségét. Vegye figyelembe, hogy a töltési sűrűség csak a töltési minta sorközét szabályozza, nem pedig a spagetti kitöltés extrudálásának mértékét."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Extra kitöltési térfogat"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Ez egy korrekció, amivel a spagetti kitöltéskor az extrudált teljes mennyiség beállítható."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6390,6 +6360,82 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "A modellre alkalmazandó átalakítási mátrix, amikor azt fájlból tölti be."
 
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Kitöltés háló rend"
+
+#~ 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 "Meghatározza, hogy melyik kitöltési háló helyezkedjen el egy másik kitöltési hálón. A magasabb rendű kitöltési háló megváltoztatja az alacsonyabb rendű és normál hálókat."
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "Fa támasz"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "Generáljon fához hasonló támasz ágakkal, amelyek megtámasztják a nyomtatványt.Ez csökkentheti az anyagfelhasználást és a nyomtatási időt, de jelentősen megnöveli a szeletelési időt."
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "A szeleteléskor az egyes szeletek a tárgy egy adott pontjában haladnak át, keresztben. Az adott réteg területei úgy alakulnak ki, hogy az adott réteg középpontjában metszi-e a szelet felületét. (Középső)Alternatív megoldásként az egyes rétegeknek lehetnek olyan területei, amelyek a térfogat beljesébe esnek a teljes rétegmagasság alatt (Kizáró).A rétegnek lehetnek olyan területei, amelyek a réteg bármely pontján belülre esnek (Befoglaló).A kizárólagos megtartja a legtöbb részletet, amíg a befoglalt a legjobban illeszkedik. A középső igényli a legkevesebb feldolgozási időt."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Spagetti kitöltés"
+
+#~ 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 "Ez a kitöltés nem minta alapján történik, hanem a nyomtatószálat kaotikusan, össze-vissza folyatja a kitöltésen belül. Ez csökkenti a nyomtatási időt, azonban a struktúra stabilitása, és viselkedése kiszámíthatatlan."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Lépésenkénti kitöltés"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "A spagetti kitöltést lépésenként végezze, vagy egyszerre, a nyomtatás végén extrudálja a töltőszálat. (beleömleszti, össze-vissza)"
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Maximális kitöltési szög"
+
+#~ 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 "A maximális w.r.t. szög a nyomtatás belsejében, és a Z tengelye azokon a területeken, amelyeket utána spagetti töltelékkel kell kitölteni. Ennek az értéknek a csökkentésével több olyan szögben lévő részeket hoz létre, amit minden rétegben meg kell tölteni."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Kitöltés maximum magasság"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "A belső tér maximális magassága, amelyet felülről ki lehet tölteni."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Spagetti berakás"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Az eltolás a falaktól, ahonnan a spagetti kitöltés kinyomtatásra kerül."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Spagetti adagolás"
+
+#~ 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 "Beállítja a spagetti kitöltés sűrűségét. Vegye figyelembe, hogy a töltési sűrűség csak a töltési minta sorközét szabályozza, nem pedig a spagetti kitöltés extrudálásának mértékét."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Extra kitöltési térfogat"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Ez egy korrekció, amivel a spagetti kitöltéskor az extrudált teljes mennyiség beállítható."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "Az alapanyag GUID -je. Ez egy automatikus beállítás. "

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

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

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2019-07-29 15:51+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Italian <info@lionbridge.com>, Italian <info@bothof.nl>\n"
@@ -224,6 +224,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "Se la macchina è in grado di stabilizzare la temperatura del volume di stampa."
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -2221,8 +2231,7 @@ msgstr "Lunghezza di svuotamento di fine filamento"
 #: fdmprinter.def.json
 msgctxt "material_end_of_filament_purge_length description"
 msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material."
-msgstr "Quantità di materiale da utilizzare per svuotare il materiale precedente dall'ugello (in lunghezza del filamento) durante la sostituzione di una bobina"
+msgstr "Quantità di materiale da utilizzare per svuotare il materiale precedente dall'ugello (in lunghezza del filamento) durante la sostituzione di una bobina vuota con una nuova dello stesso materiale."
-" vuota con una nuova dello stesso materiale."
 
 #: fdmprinter.def.json
 msgctxt "material_maximum_park_duration label"
@@ -2242,8 +2251,7 @@ msgstr "Fattore di spostamento senza carico"
 #: fdmprinter.def.json
 msgctxt "material_no_load_move_factor description"
 msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch."
-msgstr "Fattore indicante la quantità di filamento che viene compressa tra l'alimentatore e la camera dell'ugello, usato per stabilire a quale distanza spostare"
+msgstr "Fattore indicante la quantità di filamento che viene compressa tra l'alimentatore e la camera dell'ugello, usato per stabilire a quale distanza spostare il materiale per un cambio di filamento."
-" il materiale per un cambio di filamento."
 
 #: fdmprinter.def.json
 msgctxt "material_flow label"
@@ -3475,6 +3483,76 @@ 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 "Treno estrusore utilizzato per la stampa delle parti inferiori del supporto. Utilizzato nell’estrusione multipla."
 
+#: fdmprinter.def.json
+msgctxt "support_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "Angolo ramo supporto ad albero"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "L’angolo dei rami. Utilizzare un angolo minore per renderli più verticali e più stabili. Utilizzare un angolo maggiore per avere una portata maggiore."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "Distanza ramo supporto ad albero"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "La distanza tra i rami necessaria quando toccano il modello. Una distanza ridotta causa il contatto del supporto ad albero con il modello in più punti, generando migliore sovrapposizione ma rendendo più difficoltosa la rimozione del supporto."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "Diametro ramo supporto ad albero"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "Il diametro dei rami più sottili del supporto. I rami più spessi sono più resistenti. I rami verso la base avranno spessore maggiore."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "Angolo diametro ramo supporto ad albero"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "L’angolo del diametro dei rami con il graduale ispessimento verso il fondo. Un angolo pari a 0 genera rami con spessore uniforme sull’intera lunghezza. Un angolo minimo può aumentare la stabilità del supporto ad albero."
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "Risoluzione collisione supporto ad albero"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "Risoluzione per calcolare le collisioni per evitare di colpire il modello. L’impostazione a un valore basso genera alberi più accurati che si rompono meno sovente, ma aumenta notevolmente il tempo di sezionamento."
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3740,6 +3818,16 @@ 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 "Larghezza massima dei gradini della parte inferiore del supporto a scala che appoggia sul modello. Un valore inferiore rende il supporto più difficile da rimuovere, ma valori troppo elevati possono rendere instabili le strutture di supporto."
 
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4185,6 +4273,16 @@ 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 "Rappresenta il supporto ovunque sotto la maglia di supporto, in modo che in questa non vi siano punti a sbalzo."
 
+#: fdmprinter.def.json
+msgctxt "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -4946,8 +5044,8 @@ msgstr "Sequenza di stampa"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
-msgstr "Indica se stampare tutti i modelli un layer alla volta o se attendere di terminare un modello prima di passare al successivo. La modalità \"uno per volta\" è possibile solo se a) è abilitato solo un estrusore b) tutti i modelli sono separati in modo tale che l'intera testina di stampa possa muoversi tra di essi e che tutti i modelli siano più bassi della distanza tra l'ugello e gli assi X/Y. "
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -4971,13 +5069,13 @@ msgstr "Utilizzare questa maglia per modificare il riempimento di altre maglie a
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "Ordine maglia di riempimento"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "Determina quale maglia di riempimento è all’interno del riempimento di un’altra maglia di riempimento. Una maglia di riempimento con un ordine superiore modifica il riempimento delle maglie con maglie di ordine inferiore e normali."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5114,66 +5212,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr "Funzionalità che non sono state ancora precisate completamente."
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "Supporto ad albero"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "Genera un supporto tipo albero con rami di sostegno della stampa. Questo può ridurre l’impiego di materiale e il tempo di stampa, ma aumenta notevolmente il tempo di sezionamento."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "Angolo ramo supporto ad albero"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "L’angolo dei rami. Utilizzare un angolo minore per renderli più verticali e più stabili. Utilizzare un angolo maggiore per avere una portata maggiore."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "Distanza ramo supporto ad albero"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "La distanza tra i rami necessaria quando toccano il modello. Una distanza ridotta causa il contatto del supporto ad albero con il modello in più punti, generando migliore sovrapposizione ma rendendo più difficoltosa la rimozione del supporto."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "Diametro ramo supporto ad albero"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "Il diametro dei rami più sottili del supporto. I rami più spessi sono più resistenti. I rami verso la base avranno spessore maggiore."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "Angolo diametro ramo supporto ad albero"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "L’angolo del diametro dei rami con il graduale ispessimento verso il fondo. Un angolo pari a 0 genera rami con spessore uniforme sull’intera lunghezza. Un angolo minimo può aumentare la stabilità del supporto ad albero."
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "Risoluzione collisione supporto ad albero"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "Risoluzione per calcolare le collisioni per evitare di colpire il modello. L’impostazione a un valore basso genera alberi più accurati che si rompono meno sovente, ma aumenta notevolmente il tempo di sezionamento."
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5181,8 +5219,8 @@ msgstr "Tolleranza di sezionamento"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "Modalità di sezionamento di strati con superfici diagonali. Le aree di uno strato possono essere generate in base al punto in cui la parte intermedia dello strato interseca la superficie (intermedia). In alternativa le aree di ciascuno strato possono ricadere all'interno del volume per tutta l'altezza dello strato (Esclusiva) ovvero possono cadere in qualsiasi punto all'interno dello strato (Inclusiva). La tolleranza esclusiva mantiene il maggior numero di dettagli, la tolleranza inclusiva è la più idonea, mentre la tolleranza intermedia richiede il minor tempo di processo."
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5454,76 +5492,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "La posizione del file di un'immagine i cui i valori di luminosità determinano la densità minima nella posizione corrispondente nel supporto."
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "Riempimento a spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "Stampa il riempimento di tanto in tanto, in modo che il filamento si avvolga in modo casuale all'interno dell'oggetto. Questo riduce il tempo di stampa, ma il comportamento rimane imprevedibile."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "Andatura del riempimento a spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "Stampa del riempimento a spaghetti in più fasi o estrusione di tutto il filamento del riempimento alla fine della stampa."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "Angolo di riempimento massimo a spaghetti"
-
-#: 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 "Angolo massimo attorno all'asse Z dell'interno stampa per le aree da riempire successivamente con riempimento a spaghetti. La riduzione di questo valore causa la formazione di un maggior numero di parti angolate nel modello da riempire su ogni strato."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "Altezza massima riempimento a spaghetti"
-
-#: 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 "Indica l'altezza massima dello spazio interno che può essere combinato e riempito a partire dall'alto."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr "Inserto spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid "The offset from the walls from where the spaghetti infill will be printed."
-msgstr "Distanza dalle pareti dalla quale il riempimento a spaghetti verrà stampato."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr "Flusso spaghetti"
-
-#: 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 "Regola la densità del riempimento a spaghetti. Notare che la densità del riempimento controlla solo la spaziatura lineare del percorso di riempimento, non la quantità di estrusione per il riempimento a spaghetti."
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "Volume extra riempimento a spaghetti"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "Elemento correttivo per regolare il volume totale da estrudere ogni volta durante il riempimento a spaghetti."
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6393,6 +6361,86 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "Matrice di rotazione da applicare al modello quando caricato dal file."
 
+#~ msgctxt "print_sequence description"
+#~ msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+#~ msgstr "Indica se stampare tutti i modelli un layer alla volta o se attendere di terminare un modello prima di passare al successivo. La modalità \"uno per volta\" è possibile solo se a) è abilitato solo un estrusore b) tutti i modelli sono separati in modo tale che l'intera testina di stampa possa muoversi tra di essi e che tutti i modelli siano più bassi della distanza tra l'ugello e gli assi X/Y. "
+
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "Ordine maglia di riempimento"
+
+#~ 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 quale maglia di riempimento è all’interno del riempimento di un’altra maglia di riempimento. Una maglia di riempimento con un ordine superiore modifica il riempimento delle maglie con maglie di ordine inferiore e normali."
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "Supporto ad albero"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "Genera un supporto tipo albero con rami di sostegno della stampa. Questo può ridurre l’impiego di materiale e il tempo di stampa, ma aumenta notevolmente il tempo di sezionamento."
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "Modalità di sezionamento di strati con superfici diagonali. Le aree di uno strato possono essere generate in base al punto in cui la parte intermedia dello strato interseca la superficie (intermedia). In alternativa le aree di ciascuno strato possono ricadere all'interno del volume per tutta l'altezza dello strato (Esclusiva) ovvero possono cadere in qualsiasi punto all'interno dello strato (Inclusiva). La tolleranza esclusiva mantiene il maggior numero di dettagli, la tolleranza inclusiva è la più idonea, mentre la tolleranza intermedia richiede il minor tempo di processo."
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "Riempimento a spaghetti"
+
+#~ 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 "Stampa il riempimento di tanto in tanto, in modo che il filamento si avvolga in modo casuale all'interno dell'oggetto. Questo riduce il tempo di stampa, ma il comportamento rimane imprevedibile."
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "Andatura del riempimento a spaghetti"
+
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "Stampa del riempimento a spaghetti in più fasi o estrusione di tutto il filamento del riempimento alla fine della stampa."
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "Angolo di riempimento massimo a spaghetti"
+
+#~ 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 "Angolo massimo attorno all'asse Z dell'interno stampa per le aree da riempire successivamente con riempimento a spaghetti. La riduzione di questo valore causa la formazione di un maggior numero di parti angolate nel modello da riempire su ogni strato."
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "Altezza massima riempimento a spaghetti"
+
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "Indica l'altezza massima dello spazio interno che può essere combinato e riempito a partire dall'alto."
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "Inserto spaghetti"
+
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "Distanza dalle pareti dalla quale il riempimento a spaghetti verrà stampato."
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "Flusso spaghetti"
+
+#~ 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 "Regola la densità del riempimento a spaghetti. Notare che la densità del riempimento controlla solo la spaziatura lineare del percorso di riempimento, non la quantità di estrusione per il riempimento a spaghetti."
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "Volume extra riempimento a spaghetti"
+
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "Elemento correttivo per regolare il volume totale da estrudere ogni volta durante il riempimento a spaghetti."
+
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "
 #~ msgstr "Il GUID del materiale. È impostato automaticamente. "

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

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

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

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 4.6\n"
+"Project-Id-Version: Cura 4.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2020-04-06 16:33+0000\n"
+"POT-Creation-Date: 2020-07-31 14:10+0000\n"
 "PO-Revision-Date: 2019-09-23 14:15+0200\n"
 "Last-Translator: Lionbridge <info@lionbridge.com>\n"
 "Language-Team: Japanese <info@lionbridge.com>, Japanese <info@bothof.nl>\n"
@@ -239,6 +239,16 @@ msgctxt "machine_heated_build_volume description"
 msgid "Whether the machine is able to stabilize the build volume temperature."
 msgstr "機器が造形温度を安定化処理できるかどうかです。"
 
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool label"
+msgid "Always Write Active Tool"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_always_write_active_tool description"
+msgid "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
 msgid "Is Center Origin"
@@ -3565,6 +3575,76 @@ 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_structure label"
+msgid "Support Structure"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure description"
+msgid "Chooses between the techniques available to generate support. \"Normal\" support creates a support structure directly below the overhanging parts and drops those areas straight down. \"Tree\" support creates branches towards the overhanging areas that support the model on the tips of those branches, and allows the branches to crawl around the model to support it from the build plate as much as possible."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option normal"
+msgid "Normal"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_structure option tree"
+msgid "Tree"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle label"
+msgid "Tree Support Branch Angle"
+msgstr "ツリーサポート枝角度"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_angle description"
+msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
+msgstr "枝の角度。枝を垂直で安定したものにするためには小さい角度を使用します。高さを得るためには大きい角度を使用します。"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance label"
+msgid "Tree Support Branch Distance"
+msgstr "ツリーサポート枝間隔"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_distance description"
+msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
+msgstr "枝がモデルに接触するところで確保する枝の間隔。この間隔を小さくするとツリーサポートがモデルに接触する点が増え、支える効果が高まりますが、サポートの取り外しが難しくなります。"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter label"
+msgid "Tree Support Branch Diameter"
+msgstr "ツリーサポート枝直径"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter description"
+msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
+msgstr "ツリーサポートの最も細い枝の直径。枝は太いほど丈夫です。基部に近いところでは、枝はこれよりも太くなります。"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle label"
+msgid "Tree Support Branch Diameter Angle"
+msgstr "ツリーサポート枝直径角度"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_branch_diameter_angle description"
+msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
+msgstr "基部に向かって徐々に太くなる枝の直径の角度。角度が0の場合、枝の太さは全長にわたって同じになります。少し角度を付けると、ツリーサポートの安定性が高まります。"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution label"
+msgid "Tree Support Collision Resolution"
+msgstr "ツリーサポート衝突精細度"
+
+#: fdmprinter.def.json
+msgctxt "support_tree_collision_resolution description"
+msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
+msgstr "モデルに干渉しないようにする衝突計算の精細度。小さい値を設定すると、失敗の少ない正確なツリーが生成されますが、スライス時間は大きく増加します。"
+
 #: fdmprinter.def.json
 msgctxt "support_type label"
 msgid "Support Placement"
@@ -3832,6 +3912,16 @@ 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_bottom_stair_step_min_slope label"
+msgid "Support Stair Step Minimum Slope Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_bottom_stair_step_min_slope description"
+msgid "The minimum slope of the area for stair-stepping to take effect. Low values should make support easier to remove on shallower slopes, but really low values may result in some very counter-intuitive results on other parts of the model."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_join_distance label"
 msgid "Support Join Distance"
@@ -4299,6 +4389,16 @@ 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 "support_meshes_present label"
+msgid "Scene Has Support Meshes"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_meshes_present description"
+msgid "There are support meshes present in the scene. This setting is controlled by Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "platform_adhesion label"
 msgid "Build Plate Adhesion"
@@ -5065,8 +5165,8 @@ msgstr "印刷頻度"
 
 #: fdmprinter.def.json
 msgctxt "print_sequence description"
-msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes."
-msgstr "すべてのモデルをレイヤーごとに印刷するか、1つのモデルがプリント完了するのを待ち次のモデルに移動するかどうか。a）エクストルーダーが1つだけ有効であり、b）プリントヘッド全体がモデル間を通ることができるようにすべてのモデルが離れていて、すべてのモデルがノズルとX/Y軸間の距離よりも小さい場合、1つずつ印刷する事ができます。 "
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "print_sequence option all_at_once"
@@ -5090,13 +5190,13 @@ msgstr "このメッシュを使用して、重なる他のメッシュのイン
 
 #: fdmprinter.def.json
 msgctxt "infill_mesh_order label"
-msgid "Infill Mesh Order"
+msgid "Mesh Processing Rank"
-msgstr "インフィルメッシュの順序"
+msgstr ""
 
 #: fdmprinter.def.json
 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."
+msgid "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes."
-msgstr "他のインフィルメッシュのインフィル内にあるインフィルメッシュを決定します。優先度の高いのインフィルメッシュは、低いメッシュと通常のメッシュのインフィルを変更します。"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "cutting_mesh label"
@@ -5238,66 +5338,6 @@ msgctxt "experimental description"
 msgid "Features that haven't completely been fleshed out yet."
 msgstr "これからもっと充実させていく機能です。"
 
-#: fdmprinter.def.json
-msgctxt "support_tree_enable label"
-msgid "Tree Support"
-msgstr "ツリーサポート"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_enable description"
-msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
-msgstr "プリントを支えるために枝のついた木のようなサポートを生成します。材料とプリント時間が減る可能性がありますが、スライス時間が大きく増加します。"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle label"
-msgid "Tree Support Branch Angle"
-msgstr "ツリーサポート枝角度"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_angle description"
-msgid "The angle of the branches. Use a lower angle to make them more vertical and more stable. Use a higher angle to be able to have more reach."
-msgstr "枝の角度。枝を垂直で安定したものにするためには小さい角度を使用します。高さを得るためには大きい角度を使用します。"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance label"
-msgid "Tree Support Branch Distance"
-msgstr "ツリーサポート枝間隔"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_distance description"
-msgid "How far apart the branches need to be when they touch the model. Making this distance small will cause the tree support to touch the model at more points, causing better overhang but making support harder to remove."
-msgstr "枝がモデルに接触するところで確保する枝の間隔。この間隔を小さくするとツリーサポートがモデルに接触する点が増え、支える効果が高まりますが、サポートの取り外しが難しくなります。"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter label"
-msgid "Tree Support Branch Diameter"
-msgstr "ツリーサポート枝直径"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter description"
-msgid "The diameter of the thinnest branches of tree support. Thicker branches are more sturdy. Branches towards the base will be thicker than this."
-msgstr "ツリーサポートの最も細い枝の直径。枝は太いほど丈夫です。基部に近いところでは、枝はこれよりも太くなります。"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle label"
-msgid "Tree Support Branch Diameter Angle"
-msgstr "ツリーサポート枝直径角度"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_branch_diameter_angle description"
-msgid "The angle of the branches' diameter as they gradually become thicker towards the bottom. An angle of 0 will cause the branches to have uniform thickness over their length. A bit of an angle can increase stability of the tree support."
-msgstr "基部に向かって徐々に太くなる枝の直径の角度。角度が0の場合、枝の太さは全長にわたって同じになります。少し角度を付けると、ツリーサポートの安定性が高まります。"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution label"
-msgid "Tree Support Collision Resolution"
-msgstr "ツリーサポート衝突精細度"
-
-#: fdmprinter.def.json
-msgctxt "support_tree_collision_resolution description"
-msgid "Resolution to compute collisions with to avoid hitting the model. Setting this lower will produce more accurate trees that fail less often, but increases slicing time dramatically."
-msgstr "モデルに干渉しないようにする衝突計算の精細度。小さい値を設定すると、失敗の少ない正確なツリーが生成されますが、スライス時間は大きく増加します。"
-
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance label"
 msgid "Slicing Tolerance"
@@ -5305,8 +5345,8 @@ msgstr "スライス公差"
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance description"
-msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+msgid "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface."
-msgstr "表面を斜めにスライスする方法を指定します。レイヤーの領域は、レイヤーの中央がサーフェス（中央）と交差する位置に基づいて生成できます。また、各層は、レイヤーの高さを通してボリュームの内側に収まる領域を持つ（排他）か、またはレイヤー内の任意の場所内に収まる領域を持っています（包括）。排他は最も細かく、包括は最もフィットし、中間は時間がかかります。"
+msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "slicing_tolerance option middle"
@@ -5588,83 +5628,6 @@ msgctxt "cross_support_density_image description"
 msgid "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support."
 msgstr "画像ファイルの位置。この画像の輝度値でサポートの対象箇所における最小密度が決まります。"
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr "スパゲッティインフィル"
-
-# msgstr "スパゲッティ・インフィル"
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid "Print the infill every so often, so that the filament will curl up chaotically inside the object. This reduces print time, but the behaviour is rather unpredictable."
-msgstr "時々インフィルを印刷してください、オブジェクト内でフィラメントがぐちゃぐちゃに巻き上がります。印刷時間は短縮できるが、フィラメントの動きは予想不可能となります。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped label"
-msgid "Spaghetti Infill Stepping"
-msgstr "スパゲッティインフィルの手順"
-
-# msgstr "スパゲッティのインフィルステッピング"
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_stepped description"
-msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
-msgstr "スパゲッティインフィルをプリントするか印刷の最後に全てのインフィルフィラメントを押し出すか。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr "スパゲッティインフィル最大角度"
-
-# msgstr "スパゲッティの最大のインフィルの角度"
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
-msgstr "最大角度 w.r.t.-印刷範囲内がスパゲッティ・インフィルで埋まるZ軸。この値を下げることでモデルの斜め部分にインフィルが各レイヤーに付着します。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr "スパゲッティインフィル最大高さ"
-
-# 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 "スパゲッティインフィルのオフセット"
-
-# 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 "スパゲッティインフィルフロー"
-
-# msgstr "スパゲッティのフロー"
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid "Adjusts the density of the spaghetti infill. Note that the Infill Density only controls the line spacing of the filling pattern, not the amount of extrusion for spaghetti infill."
-msgstr "スパゲッティ・インフィルの密度を調整します。インフィルの密度は、行間枠のパターンを決めるだけで、スパゲッティ・インフィルの押出量は制御しないことにご注意ください。"
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume label"
-msgid "Spaghetti Infill Extra Volume"
-msgstr "スパゲッティインフィル余剰調整"
-
-# msgstr "スパゲッティ・インフィルの余分量"
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_extra_volume description"
-msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
-msgstr "スパゲッティをプリントする際に毎回行なう吐出量の調整。"
-
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -6532,6 +6495,93 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。"
 
+#~ msgctxt "print_sequence description"
+#~ msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes. "
+#~ msgstr "すべてのモデルをレイヤーごとに印刷するか、1つのモデルがプリント完了するのを待ち次のモデルに移動するかどうか。a）エクストルーダーが1つだけ有効であり、b）プリントヘッド全体がモデル間を通ることができるようにすべてのモデルが離れていて、すべてのモデルがノズルとX/Y軸間の距離よりも小さい場合、1つずつ印刷する事ができます。 "
+
+#~ msgctxt "infill_mesh_order label"
+#~ msgid "Infill Mesh Order"
+#~ msgstr "インフィルメッシュの順序"
+
+#~ 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 "他のインフィルメッシュのインフィル内にあるインフィルメッシュを決定します。優先度の高いのインフィルメッシュは、低いメッシュと通常のメッシュのインフィルを変更します。"
+
+#~ msgctxt "support_tree_enable label"
+#~ msgid "Tree Support"
+#~ msgstr "ツリーサポート"
+
+#~ msgctxt "support_tree_enable description"
+#~ msgid "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time."
+#~ msgstr "プリントを支えるために枝のついた木のようなサポートを生成します。材料とプリント時間が減る可能性がありますが、スライス時間が大きく増加します。"
+
+#~ msgctxt "slicing_tolerance description"
+#~ msgid "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process."
+#~ msgstr "表面を斜めにスライスする方法を指定します。レイヤーの領域は、レイヤーの中央がサーフェス（中央）と交差する位置に基づいて生成できます。また、各層は、レイヤーの高さを通してボリュームの内側に収まる領域を持つ（排他）か、またはレイヤー内の任意の場所内に収まる領域を持っています（包括）。排他は最も細かく、包括は最もフィットし、中間は時間がかかります。"
+
+#~ msgctxt "spaghetti_infill_enabled label"
+#~ msgid "Spaghetti Infill"
+#~ msgstr "スパゲッティインフィル"
+
+# 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 "時々インフィルを印刷してください、オブジェクト内でフィラメントがぐちゃぐちゃに巻き上がります。印刷時間は短縮できるが、フィラメントの動きは予想不可能となります。"
+
+#~ msgctxt "spaghetti_infill_stepped label"
+#~ msgid "Spaghetti Infill Stepping"
+#~ msgstr "スパゲッティインフィルの手順"
+
+# msgstr "スパゲッティのインフィルステッピング"
+#~ msgctxt "spaghetti_infill_stepped description"
+#~ msgid "Whether to print spaghetti infill in steps or extrude all the infill filament at the end of the print."
+#~ msgstr "スパゲッティインフィルをプリントするか印刷の最後に全てのインフィルフィラメントを押し出すか。"
+
+#~ msgctxt "spaghetti_max_infill_angle label"
+#~ msgid "Spaghetti Maximum Infill Angle"
+#~ msgstr "スパゲッティインフィル最大角度"
+
+# msgstr "スパゲッティの最大のインフィルの角度"
+#~ msgctxt "spaghetti_max_infill_angle description"
+#~ msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer."
+#~ msgstr "最大角度 w.r.t.-印刷範囲内がスパゲッティ・インフィルで埋まるZ軸。この値を下げることでモデルの斜め部分にインフィルが各レイヤーに付着します。"
+
+#~ msgctxt "spaghetti_max_height label"
+#~ msgid "Spaghetti Infill Maximum Height"
+#~ msgstr "スパゲッティインフィル最大高さ"
+
+# msgstr "スパゲッティインフィルの最大高さ"
+#~ msgctxt "spaghetti_max_height description"
+#~ msgid "The maximum height of inside space which can be combined and filled from the top."
+#~ msgstr "内部空間の上から結合して埋め込むことができる最大の高さ。"
+
+#~ msgctxt "spaghetti_inset label"
+#~ msgid "Spaghetti Inset"
+#~ msgstr "スパゲッティインフィルのオフセット"
+
+# msgstr "スパゲティをセットする"
+#~ msgctxt "spaghetti_inset description"
+#~ msgid "The offset from the walls from where the spaghetti infill will be printed."
+#~ msgstr "スパゲッティ・インフィルがプリントされる壁からのオフセット。"
+
+#~ msgctxt "spaghetti_flow label"
+#~ msgid "Spaghetti Flow"
+#~ msgstr "スパゲッティインフィルフロー"
+
+# msgstr "スパゲッティのフロー"
+#~ 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 "スパゲッティ・インフィルの密度を調整します。インフィルの密度は、行間枠のパターンを決めるだけで、スパゲッティ・インフィルの押出量は制御しないことにご注意ください。"
+
+#~ msgctxt "spaghetti_infill_extra_volume label"
+#~ msgid "Spaghetti Infill Extra Volume"
+#~ msgstr "スパゲッティインフィル余剰調整"
+
+# msgstr "スパゲッティ・インフィルの余分量"
+#~ msgctxt "spaghetti_infill_extra_volume description"
+#~ msgid "A correction term to adjust the total volume being extruded each time when filling spaghetti."
+#~ msgstr "スパゲッティをプリントする際に毎回行なう吐出量の調整。"
+
 # msgstr "マテリアルGUID"
 #~ msgctxt "material_guid description"
 #~ msgid "GUID of the material. This is set automatically. "